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

Merge pull request #1696 from lucas-clemente/use-iv-in-aead

Browse Source 
use the IV when sealing and opening
This commit is contained in:
Marten Seemann
2018-12-31 00:28:07 +07:00
committed by GitHub
parent eaad3b2bdf 538b84b78d
commit ed27d0d989
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/handshake/aead.go
View File

@@ -35,7 +35,14 @@ func newSealer(aead cipher.AEAD, iv []byte, pnEncrypter cipher.Block, is1RTT boo
func (s *sealer) Seal(dst, src []byte, pn protocol.PacketNumber, ad []byte) []byte {
binary.BigEndian.PutUint64(s.nonceBuf[len(s.nonceBuf)-8:], uint64(pn))
return s.aead.Seal(dst, s.nonceBuf, src, ad)
for i := 0; i < len(s.nonceBuf); i++ {
s.nonceBuf[i] ^= s.iv[i]
}
sealed := s.aead.Seal(dst, s.nonceBuf, src, ad)
for i := 0; i < len(s.nonceBuf); i++ {
s.nonceBuf[i] = 0
}
return sealed
}
func (s *sealer) EncryptHeader(sample []byte, firstByte *byte, pnBytes []byte) {
@@ -85,7 +92,14 @@ func newOpener(aead cipher.AEAD, iv []byte, pnDecrypter cipher.Block, is1RTT boo
func (o *opener) Open(dst, src []byte, pn protocol.PacketNumber, ad []byte) ([]byte, error) {
binary.BigEndian.PutUint64(o.nonceBuf[len(o.nonceBuf)-8:], uint64(pn))
return o.aead.Open(dst, o.nonceBuf, src, ad)
for i := 0; i < len(o.nonceBuf); i++ {
o.nonceBuf[i] ^= o.iv[i]
}
opened, err := o.aead.Open(dst, o.nonceBuf, src, ad)
for i := 0; i < len(o.nonceBuf); i++ {
o.nonceBuf[i] = 0
}
return opened, err
}
func (o *opener) DecryptHeader(sample []byte, firstByte *byte, pnBytes []byte) {