gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

simplify key derivation

Browse Source
This commit is contained in:
Lucas Clemente
2016-08-06 17:54:11 +02:00
parent 0696cd51bf
commit 125842d80d
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/key_derivation.go
View File

@@ -43,23 +43,14 @@ func deriveKeys(version protocol.VersionNumber, forwardSecure bool, sharedSecret
r := hkdf.New(sha256.New, sharedSecret, nonces, info.Bytes()) r := hkdf.New(sha256.New, sharedSecret, nonces, info.Bytes())
otherKey := make([]byte, keyLen) s := make([]byte, 2*keyLen+2*4)
myKey := make([]byte, keyLen) if _, err := io.ReadFull(r, s); err != nil {
otherIV := make([]byte, 4)
myIV := make([]byte, 4)
if _, err := io.ReadFull(r, otherKey); err != nil {
return nil, nil, nil, nil, err
}
if _, err := io.ReadFull(r, myKey); err != nil {
return nil, nil, nil, nil, err
}
if _, err := io.ReadFull(r, otherIV); err != nil {
return nil, nil, nil, nil, err
}
if _, err := io.ReadFull(r, myIV); err != nil {
return nil, nil, nil, nil, err return nil, nil, nil, nil, err
} }
otherKey := s[:keyLen]
myKey := s[keyLen : 2*keyLen]
otherIV := s[2*keyLen : 2*keyLen+4]
myIV := s[2*keyLen+4:]
if !forwardSecure && version >= protocol.Version33 { if !forwardSecure && version >= protocol.Version33 {
if err := diversify(myKey, myIV, divNonce); err != nil { if err := diversify(myKey, myIV, divNonce); err != nil {