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

Merge branch 'master' into kcp-udp

This commit is contained in:
Russ Magee 2019-09-14 22:56:19 -07:00
parent 6483c8cc33 ba52356e6c
commit 3b73c6d731
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hkexnet/consts.go
View File

@ -11,6 +11,7 @@ package hkexnet
// //
// Specified (in string form) as the extensions parameter // Specified (in string form) as the extensions parameter
// to hkexnet.Dial() // to hkexnet.Dial()
// Alg is sent in a uint8 so there are up to 256 possible
const ( const (
KEX_HERRADURA256 = iota // this MUST be first for default if omitted in ctor KEX_HERRADURA256 = iota // this MUST be first for default if omitted in ctor
KEX_HERRADURA512 KEX_HERRADURA512

4
hkexnet/hkexnet.go
View File

@ -213,7 +213,7 @@ func _new(kexAlg KEXAlg, conn *net.Conn) (hc *Conn, e error) {
log.Printf("[KEx alg %d accepted]\n", kexAlg) log.Printf("[KEx alg %d accepted]\n", kexAlg)
default: default:
// UNREACHABLE: _getkexalgnum() guarantees a valid KEX value // UNREACHABLE: _getkexalgnum() guarantees a valid KEX value
hc.kex = KEX_HERRADURA256 hc.kex = KEX_HERRADURA512
log.Printf("[KEx alg %d ?? defaults to %d]\n", kexAlg, hc.kex) log.Printf("[KEx alg %d ?? defaults to %d]\n", kexAlg, hc.kex)
} }
return return
@ -273,7 +273,7 @@ func (hc *Conn) applyConnExtensions(extensions ...string) {
} }
func getkexalgnum(extensions ...string) (k KEXAlg) { func getkexalgnum(extensions ...string) (k KEXAlg) {
k = KEX_HERRADURA256 // default k = KEX_HERRADURA512 // default
for _, s := range extensions { for _, s := range extensions {
switch s { switch s {
case "KEX_HERRADURA256": case "KEX_HERRADURA256":