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

Fixed rekey selection of HMAC algs (was always using alg 0, SHA256)

This commit is contained in:
Russ Magee 2025-04-20 11:10:06 -07:00
parent a929fdc211
commit 7731466c8c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION := 0.9.13 VERSION := 0.9.14
.PHONY: lint vis clean common client server passwd\ .PHONY: lint vis clean common client server passwd\
subpkgs install uninstall reinstall scc subpkgs install uninstall reinstall scc

7
xsnet/chan.go
View File

@ -24,9 +24,10 @@ import (
"blitter.com/go/hopscotch" "blitter.com/go/hopscotch"
"blitter.com/go/xs/logger" "blitter.com/go/xs/logger"
"github.com/aead/chacha20/chacha" "github.com/aead/chacha20/chacha"
whirlpool "github.com/jzelinskie/whirlpool"
"golang.org/x/crypto/blowfish" "golang.org/x/crypto/blowfish"
"golang.org/x/crypto/twofish" "golang.org/x/crypto/twofish"
whirlpool "github.com/jzelinskie/whirlpool"
// hash algos must be manually imported thusly: // hash algos must be manually imported thusly:
// (Would be nice if the golang pkg docs were more clear // (Would be nice if the golang pkg docs were more clear
// on this...) // on this...)
@ -64,8 +65,8 @@ func getNewStreamAlgs(cb uint8, hb uint8) (config uint32) {
// the input rekeying data // the input rekeying data
c := (cb % CAlgNoneDisallowed) c := (cb % CAlgNoneDisallowed)
h := (hb % HmacNoneDisallowed) h := (hb % HmacNoneDisallowed)
config = uint32(h<<8) | uint32(c) config = uint32(h)<<8 | uint32(c)
logger.LogDebug(fmt.Sprintf("[Chose new algs [%d:%d]", h, c)) //logger.LogDebug(fmt.Sprintf("[Chose new algs [%d:%d config:%d]", h, c, config))
return return
} }