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

rename the sealer to longHeaderSealer for consistency

Browse Source
This commit is contained in:
Marten Seemann
2019-11-04 11:31:20 +07:00
parent 59cf1e88a7
commit cc9fa055a6
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/handshake/aead.go
View File

@@ -8,7 +8,13 @@ import (
"github.com/marten-seemann/qtls" "github.com/marten-seemann/qtls"
) )
type sealer struct { func createAEAD(suite *qtls.CipherSuiteTLS13, trafficSecret []byte) cipher.AEAD {
key := qtls.HkdfExpandLabel(suite.Hash, trafficSecret, []byte{}, "quic key", suite.KeyLen)
iv := qtls.HkdfExpandLabel(suite.Hash, trafficSecret, []byte{}, "quic iv", suite.IVLen())
return suite.AEAD(key, iv)
}
type longHeaderSealer struct {
aead cipher.AEAD aead cipher.AEAD
headerProtector headerProtector headerProtector headerProtector
@@ -16,28 +22,28 @@ type sealer struct {
nonceBuf []byte nonceBuf []byte
} }
var _ LongHeaderSealer = &sealer{} var _ LongHeaderSealer = &longHeaderSealer{}
func newLongHeaderSealer(aead cipher.AEAD, headerProtector headerProtector) LongHeaderSealer { func newLongHeaderSealer(aead cipher.AEAD, headerProtector headerProtector) LongHeaderSealer {
return &sealer{ return &longHeaderSealer{
aead: aead, aead: aead,
headerProtector: headerProtector, headerProtector: headerProtector,
nonceBuf: make([]byte, aead.NonceSize()), nonceBuf: make([]byte, aead.NonceSize()),
} }
} }
func (s *sealer) Seal(dst, src []byte, pn protocol.PacketNumber, ad []byte) []byte { func (s *longHeaderSealer) Seal(dst, src []byte, pn protocol.PacketNumber, ad []byte) []byte {
binary.BigEndian.PutUint64(s.nonceBuf[len(s.nonceBuf)-8:], uint64(pn)) binary.BigEndian.PutUint64(s.nonceBuf[len(s.nonceBuf)-8:], uint64(pn))
// The AEAD we're using here will be the qtls.aeadAESGCM13. // The AEAD we're using here will be the qtls.aeadAESGCM13.
// It uses the nonce provided here and XOR it with the IV. // It uses the nonce provided here and XOR it with the IV.
return s.aead.Seal(dst, s.nonceBuf, src, ad) return s.aead.Seal(dst, s.nonceBuf, src, ad)
} }
func (s *sealer) EncryptHeader(sample []byte, firstByte *byte, pnBytes []byte) { func (s *longHeaderSealer) EncryptHeader(sample []byte, firstByte *byte, pnBytes []byte) {
s.headerProtector.EncryptHeader(sample, firstByte, pnBytes) s.headerProtector.EncryptHeader(sample, firstByte, pnBytes)
} }
func (s *sealer) Overhead() int { func (s *longHeaderSealer) Overhead() int {
return s.aead.Overhead() return s.aead.Overhead()
} }
@@ -73,9 +79,3 @@ func (o *longHeaderOpener) Open(dst, src []byte, pn protocol.PacketNumber, ad []
func (o *longHeaderOpener) DecryptHeader(sample []byte, firstByte *byte, pnBytes []byte) { func (o *longHeaderOpener) DecryptHeader(sample []byte, firstByte *byte, pnBytes []byte) {
o.headerProtector.DecryptHeader(sample, firstByte, pnBytes) o.headerProtector.DecryptHeader(sample, firstByte, pnBytes)
} }
func createAEAD(suite *qtls.CipherSuiteTLS13, trafficSecret []byte) cipher.AEAD {
key := qtls.HkdfExpandLabel(suite.Hash, trafficSecret, []byte{}, "quic key", suite.KeyLen)
iv := qtls.HkdfExpandLabel(suite.Hash, trafficSecret, []byte{}, "quic iv", suite.IVLen())
return suite.AEAD(key, iv)
}