Fix awful XOF length typo

diff --git a/go/cm/cmd/cmenctool/main.go b/go/cm/cmd/cmenctool/main.go
index 0f0022c74810f6d6c6cd3c858011d282732734d7e6f542f9367283bc21d5f0d7..ed64e5381f95a5572c122f58b5b3cf3f712680d6a0146fed2c6950460176b0dc 100644 (file)
--- a/go/cm/cmd/cmenctool/main.go
+++ b/go/cm/cmd/cmenctool/main.go
@@ -417,7 +417,7 @@ func main() {
                                                pkHash.Write(ourX25519.PublicKey().Bytes())
                                                ikm := bytes.Join([][]byte{
                                                        keyMcEliece, keyX25519,
-                                                       sha3.SumSHAKE256(kem.Encap, X25519KeyLen),
+                                                       sha3.SumSHAKE256(kem.Encap, 64),
                                                        pkHash.Sum(nil),
                                                }, []byte{})
                                                var prk []byte
@@ -671,8 +671,8 @@ func main() {
                                {
                                        ikm := bytes.Join([][]byte{
                                                keyMcEliece[:], keyX25519,
-                                               sha3.SumSHAKE256(kem.Encap, 32),
-                                               sha3.SumSHAKE256(pub.V, 32),
+                                               sha3.SumSHAKE256(kem.Encap, 64),
+                                               sha3.SumSHAKE256(pub.V, 64),
                                        }, []byte{})
                                        var prk []byte
                                        prk, err = hkdf.Extract(cmhash.NewSHAKE256, ikm, nil)

diff --git a/go/cm/hash/shake.go b/go/cm/hash/shake.go
index 7c2e1b89d1960c9d44eaafcca2d567be2fbd57da3af1c9033e295ce246803418..696823600d31539a1d487ee4e9f9f796cc2e1235abb314c9fd109ad5a0728fce 100644 (file)
--- a/go/cm/hash/shake.go
+++ b/go/cm/hash/shake.go
@@ -66,7 +66,7 @@ func NewSHAKE128() hash.Hash {
 }
 
 func NewSHAKE256() hash.Hash {
-       return SHAKE{xof: sha3.NewSHAKE256(), l: 32}
+       return SHAKE{xof: sha3.NewSHAKE256(), l: 64}
 }
 
 func NewCSHAKE128(s []byte) hash.Hash {
@@ -74,7 +74,7 @@ func NewCSHAKE128(s []byte) hash.Hash {
 }
 
 func NewCSHAKE256(s []byte) hash.Hash {
-       return SHAKE{xof: sha3.NewCSHAKE256(nil, s), l: 32}
+       return SHAKE{xof: sha3.NewCSHAKE256(nil, s), l: 64}
 }
 
 func NewSHAKE128MerkleHasher(chunkLen, workers int) hash.Hash {