homelab/sigtool
2
0
Fork 0
Code Issues Pull requests Projects Releases 3 Packages Wiki Activity Actions

Fixed bug in makeNonceV2(): use the full salt and use block# as prefix

Browse source 
Updated go.mod to use go-1.17
This commit is contained in:
Sudhi Herle 2021-08-28 20:19:24 -07:00
parent 85ed0d06dd
commit 81a6522ee7
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
go.mod
View file

@ -1,6 +1,6 @@
module github.com/opencoff/sigtool module github.com/opencoff/sigtool
go 1.13 go 1.17
require ( require (
github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a
@ -10,3 +10,5 @@ require (
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
gopkg.in/yaml.v2 v2.2.7 gopkg.in/yaml.v2 v2.2.7
) )
require golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect

5
sign/encrypt.go
View file

@ -696,10 +696,11 @@ func fullwrite(buf []byte, wr io.Writer) error {
} }
// make aead nonce from salt, chunk-size and block# // make aead nonce from salt, chunk-size and block#
// First 8 bytes are chunk-size and nonce (in 'ad')
func makeNonceV2(dest []byte, salt []byte, ad []byte) []byte { func makeNonceV2(dest []byte, salt []byte, ad []byte) []byte {
n := len(ad) n := len(ad)
copy(dest, salt[:n]) copy(dest, ad)
copy(dest[n:], ad) copy(dest[n:], salt)
return dest return dest
} }