Remove hashing of MAC key part of KDF derived key

This commit is contained in:
Gustav Simonsson 2015-05-01 08:12:42 +02:00
parent d1f39f841b
commit 0b6a702f24

View file

@ -243,9 +243,6 @@ func Encrypt(rand io.Reader, pub *PublicKey, m, s1, s2 []byte) (ct []byte, err e
} }
Ke := K[:params.KeyLen] Ke := K[:params.KeyLen]
Km := K[params.KeyLen:] Km := K[params.KeyLen:]
hash.Write(Km)
Km = hash.Sum(nil)
hash.Reset()
em, err := symEncrypt(rand, params, Ke, m) em, err := symEncrypt(rand, params, Ke, m)
if err != nil { if err != nil {
@ -323,9 +320,6 @@ func (prv *PrivateKey) Decrypt(rand io.Reader, c, s1, s2 []byte) (m []byte, err
Ke := K[:params.KeyLen] Ke := K[:params.KeyLen]
Km := K[params.KeyLen:] Km := K[params.KeyLen:]
hash.Write(Km)
Km = hash.Sum(nil)
hash.Reset()
d := messageTag(params.Hash, Km, c[mStart:mEnd], s2) d := messageTag(params.Hash, Km, c[mStart:mEnd], s2)
if subtle.ConstantTimeCompare(c[mEnd:], d) != 1 { if subtle.ConstantTimeCompare(c[mEnd:], d) != 1 {