From cc9fa055a6f408ccd2e03519ca09103f254afad5 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 4 Nov 2019 11:31:20 +0700 Subject: [PATCH] rename the sealer to longHeaderSealer for consistency --- internal/handshake/aead.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/handshake/aead.go b/internal/handshake/aead.go index e0ef70417..57a4a8111 100644 --- a/internal/handshake/aead.go +++ b/internal/handshake/aead.go @@ -8,7 +8,13 @@ import ( "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 headerProtector headerProtector @@ -16,28 +22,28 @@ type sealer struct { nonceBuf []byte } -var _ LongHeaderSealer = &sealer{} +var _ LongHeaderSealer = &longHeaderSealer{} func newLongHeaderSealer(aead cipher.AEAD, headerProtector headerProtector) LongHeaderSealer { - return &sealer{ + return &longHeaderSealer{ aead: aead, headerProtector: headerProtector, 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)) // The AEAD we're using here will be the qtls.aeadAESGCM13. // It uses the nonce provided here and XOR it with the IV. 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) } -func (s *sealer) Overhead() int { +func (s *longHeaderSealer) Overhead() int { 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) { 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) -}