mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 12:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

add logging to the updatable AEAD

Browse source
This commit is contained in:
Marten Seemann 2019-06-13 11:12:45 +08:00
parent 55b88be009
commit ca8b7ddeef
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/handshake/crypto_setup.go
View file

@ -192,7 +192,7 @@ func newCryptoSetup(
initialOpener: initialOpener,
handshakeStream: handshakeStream,
oneRTTStream: oneRTTStream,
aead: newUpdatableAEAD(),
aead: newUpdatableAEAD(logger),
readEncLevel: protocol.EncryptionInitial,
writeEncLevel: protocol.EncryptionInitial,
runner: runner,

9
internal/handshake/updatable_aead.go
View file

@ -6,6 +6,7 @@ import (
"encoding/binary"
"github.com/lucas-clemente/quic-go/internal/qerr"
"github.com/lucas-clemente/quic-go/internal/utils"
"github.com/lucas-clemente/quic-go/internal/protocol"
"github.com/marten-seemann/qtls"
@ -31,6 +32,8 @@ type updatableAEAD struct {
hpDecrypter cipher.Block
hpEncrypter cipher.Block
logger utils.Logger
// use a single slice to avoid allocations
nonceBuf []byte
hpMask []byte
@ -39,17 +42,19 @@ type updatableAEAD struct {
var _ ShortHeaderOpener = &updatableAEAD{}
var _ ShortHeaderSealer = &updatableAEAD{}
func newUpdatableAEAD() *updatableAEAD {
func newUpdatableAEAD(logger utils.Logger) *updatableAEAD {
return &updatableAEAD{
firstRcvdWithCurrentKey: protocol.InvalidPacketNumber,
firstSentWithCurrentKey: protocol.InvalidPacketNumber,
logger: logger,
}
}
func (a *updatableAEAD) rollKeys() {
a.keyPhase = a.keyPhase.Next()
a.logger.Debugf("Updating keys to the next key phase: %s", a.keyPhase)
a.firstRcvdWithCurrentKey = protocol.InvalidPacketNumber
a.firstSentWithCurrentKey = protocol.InvalidPacketNumber
a.keyPhase = a.keyPhase.Next()
a.prevRcvAEAD = a.rcvAEAD
a.rcvAEAD = a.nextRcvAEAD
a.sendAEAD = a.nextSendAEAD

5
internal/handshake/updatable_aead_test.go
View file

@ -7,6 +7,7 @@ import (
"crypto/rand"
"github.com/lucas-clemente/quic-go/internal/protocol"
"github.com/lucas-clemente/quic-go/internal/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
@ -33,8 +34,8 @@ var _ = Describe("Updatable AEAD", func() {
rand.Read(trafficSecret1)
rand.Read(trafficSecret2)
client = newUpdatableAEAD()
server = newUpdatableAEAD()
client = newUpdatableAEAD(utils.DefaultLogger)
server = newUpdatableAEAD(utils.DefaultLogger)
client.SetReadKey(&mockCipherSuite{}, trafficSecret2)
client.SetWriteKey(&mockCipherSuite{}, trafficSecret1)
server.SetReadKey(&mockCipherSuite{}, trafficSecret1)