RusstopiaLabs
/
xs
mirror of https://gogs.blitter.com/RLabs/xs
1
0
Fork 0
Code Issues Releases Wiki Activity

Update default-if-unspecified kex to HERRADURA1024

This commit is contained in:
Russ Magee 2025-01-24 20:34:40 -08:00
parent a929fdc211
commit 7e4d68e607
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xsnet/net.go
View File

@ -261,16 +261,6 @@ func (hc *Conn) SetOpts(opts uint32) {
// //
// Note this is internal: use Dial() or Accept() // Note this is internal: use Dial() or Accept()
func _new(kexAlg KEXAlg, conn *net.Conn) (hc *Conn, e error) { func _new(kexAlg KEXAlg, conn *net.Conn) (hc *Conn, e error) {
// Set up stuff common to all KEx/KEM types
hc = &Conn{kex: kexAlg,
m: &sync.Mutex{},
c: conn,
closeStat: new(CSOType),
WinCh: make(chan WinSize, 1),
dBuf: new(bytes.Buffer)}
tempMap := make(map[uint16]*TunEndpoint)
hc.tuns = &tempMap
// Set up KEx/KEM-specifics // Set up KEx/KEM-specifics
switch kexAlg { switch kexAlg {
case KEX_HERRADURA256: case KEX_HERRADURA256:
@ -298,14 +288,25 @@ func _new(kexAlg KEXAlg, conn *net.Conn) (hc *Conn, e error) {
case KEX_FRODOKEM_976AES: case KEX_FRODOKEM_976AES:
fallthrough fallthrough
case KEX_FRODOKEM_976SHAKE: case KEX_FRODOKEM_976SHAKE:
//log.Printf("[KEx alg %d is valid]\n", kexAlg) log.Printf("[KEx alg %d specified]\n", kexAlg)
default: default:
// UNREACHABLE: _getkexalgnum() guarantees a valid KEX value // UNREACHABLE(?): _getkexalgnum() SHOULD guarantee a valid KEX value
hc.kex = KEX_HERRADURA512 log.Printf("[KEx alg %d ?? - REPORT A BUG IF YOU SEE THIS]", kexAlg)
log.Printf("[KEx alg %d ?? defaults to %d]\n", kexAlg, hc.kex) kexAlg = KEX_HERRADURA1024
log.Printf(" defaulting to %d]\n", kexAlg)
} }
//hc.logCipherText = true // !!! DEBUGGING ONLY !!! NEVER DEPLOY this uncommented !!! //hc.logCipherText = true // !!! DEBUGGING ONLY !!! NEVER DEPLOY this uncommented !!!
hc = &Conn{kex: kexAlg,
m: &sync.Mutex{},
c: conn,
closeStat: new(CSOType),
WinCh: make(chan WinSize, 1),
dBuf: new(bytes.Buffer)}
tempMap := make(map[uint16]*TunEndpoint)
hc.tuns = &tempMap
return return
} }
@ -378,7 +379,6 @@ func (hc *Conn) applyConnExtensions(extensions ...string) {
} }
func getkexalgnum(extensions ...string) (k KEXAlg) { func getkexalgnum(extensions ...string) (k KEXAlg) {
k = KEX_HERRADURA512 // default
for _, s := range extensions { for _, s := range extensions {
switch s { switch s {
case "KEX_HERRADURA256": case "KEX_HERRADURA256":
@ -420,6 +420,9 @@ func getkexalgnum(extensions ...string) (k KEXAlg) {
case "KEX_FRODOKEM_976SHAKE": case "KEX_FRODOKEM_976SHAKE":
k = KEX_FRODOKEM_976SHAKE k = KEX_FRODOKEM_976SHAKE
break //out of for break //out of for
default:
k = KEX_HERRADURA1024 // default
//fmt.Printf("[INFO: defaulting to %s\n", k.String())
} }
} }
return return