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

explicitly pass encryption level in the aeadChanges channel

Browse Source
This commit is contained in:
Marten Seemann
2017-02-25 13:57:23 +07:00
parent 20b2069d78
commit 6cb19e42a5
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
handshake/crypto_setup_client.go
View File

@@ -46,7 +46,7 @@ type cryptoSetupClient struct {
receivedSecurePacket bool
secureAEAD crypto.AEAD
forwardSecureAEAD crypto.AEAD
aeadChanged chan struct{}
aeadChanged chan protocol.EncryptionLevel
connectionParameters ConnectionParametersManager
}
@@ -67,7 +67,7 @@ func NewCryptoSetupClient(
cryptoStream io.ReadWriter,
tlsConfig *tls.Config,
connectionParameters ConnectionParametersManager,
aeadChanged chan struct{},
aeadChanged chan protocol.EncryptionLevel,
negotiatedVersions []protocol.VersionNumber,
) (CryptoSetup, error) {
return &cryptoSetupClient{
@@ -245,7 +245,7 @@ func (h *cryptoSetupClient) handleSHLOMessage(cryptoData map[Tag][]byte) error {
return qerr.InvalidCryptoMessageParameter
}
h.aeadChanged <- struct{}{}
h.aeadChanged <- protocol.EncryptionForwardSecure
return nil
}
@@ -460,7 +460,7 @@ func (h *cryptoSetupClient) maybeUpgradeCrypto() error {
return err
}
h.aeadChanged <- struct{}{}
h.aeadChanged <- protocol.EncryptionSecure
}
return nil

2
handshake/crypto_setup_client_test.go
View File

@@ -127,7 +127,7 @@ var _ = Describe("Crypto setup", func() {
stream = &mockStream{}
certManager = &mockCertManager{}
version := protocol.Version36
csInt, err := NewCryptoSetupClient("hostname", 0, version, stream, nil, NewConnectionParamatersManager(protocol.PerspectiveClient, version), make(chan struct{}, 1), nil)
csInt, err := NewCryptoSetupClient("hostname", 0, version, stream, nil, NewConnectionParamatersManager(protocol.PerspectiveClient, version), make(chan protocol.EncryptionLevel, 2), nil)
Expect(err).ToNot(HaveOccurred())
cs = csInt.(*cryptoSetupClient)
cs.certManager = certManager

6
handshake/crypto_setup_server.go
View File

@@ -31,7 +31,7 @@ type cryptoSetupServer struct {
forwardSecureAEAD crypto.AEAD
receivedForwardSecurePacket bool
receivedSecurePacket bool
aeadChanged chan struct{}
aeadChanged chan protocol.EncryptionLevel
keyDerivation KeyDerivationFunction
keyExchange KeyExchangeFunction
@@ -53,7 +53,7 @@ func NewCryptoSetup(
scfg *ServerConfig,
cryptoStream io.ReadWriter,
connectionParametersManager ConnectionParametersManager,
aeadChanged chan struct{},
aeadChanged chan protocol.EncryptionLevel,
) (CryptoSetup, error) {
return &cryptoSetupServer{
connID: connID,
@@ -357,7 +357,7 @@ func (h *cryptoSetupServer) handleCHLO(sni string, data []byte, cryptoData map[T
WriteHandshakeMessage(&reply, TagSHLO, replyMap)
utils.Debugf("Sending SHLO:\n%s", printHandshakeMessage(replyMap))
h.aeadChanged <- struct{}{}
h.aeadChanged <- protocol.EncryptionForwardSecure
return reply.Bytes(), nil
}

4
handshake/crypto_setup_server_test.go
View File

@@ -141,7 +141,7 @@ var _ = Describe("Crypto setup", func() {
cs *cryptoSetupServer
stream *mockStream
cpm ConnectionParametersManager
aeadChanged chan struct{}
aeadChanged chan protocol.EncryptionLevel
nonce32 []byte
versionTag []byte
sourceAddr []byte
@@ -157,7 +157,7 @@ var _ = Describe("Crypto setup", func() {
Expect(err).NotTo(HaveOccurred())
expectedInitialNonceLen = 32
expectedFSNonceLen = 64
aeadChanged = make(chan struct{}, 1)
aeadChanged = make(chan protocol.EncryptionLevel, 2)
stream = &mockStream{}
kex = &mockKEX{}
signer = &mockSigner{}

8
session.go
View File

@@ -77,7 +77,7 @@ type session struct {
closed uint32 // atomic bool
undecryptablePackets []*receivedPacket
aeadChanged chan struct{}
aeadChanged chan protocol.EncryptionLevel
nextAckScheduledTime time.Time
@@ -178,7 +178,7 @@ func (s *session) setup() {
s.closeChan = make(chan *qerr.QuicError, 1)
s.sendingScheduled = make(chan struct{}, 1)
s.undecryptablePackets = make([]*receivedPacket, 0, protocol.MaxUndecryptablePackets)
s.aeadChanged = make(chan struct{}, 1)
s.aeadChanged = make(chan protocol.EncryptionLevel, 2)
s.runClosed = make(chan struct{}, 1)
s.timer = time.NewTimer(0)
@@ -235,9 +235,9 @@ runLoop:
// This is a bit unclean, but works properly, since the packet always
// begins with the public header and we never copy it.
putPacketBuffer(p.publicHeader.Raw)
case <-s.aeadChanged:
case l := <-s.aeadChanged:
s.tryDecryptingQueuedPackets()
s.cryptoChangeCallback(s, s.cryptoSetup.HandshakeComplete())
s.cryptoChangeCallback(s, l == protocol.EncryptionForwardSecure)
}
if err != nil {

5
session_test.go
View File

@@ -1146,8 +1146,7 @@ var _ = Describe("Session", func() {
callbackSession = s
}
sess.cryptoChangeCallback = cb
sess.cryptoSetup = &mockCryptoSetup{handshakeComplete: false}
sess.aeadChanged <- struct{}{}
sess.aeadChanged <- protocol.EncryptionSecure
go sess.run()
Eventually(func() bool { return callbackCalled }).Should(BeTrue())
Expect(callbackCalledWith).To(BeFalse())
@@ -1164,7 +1163,7 @@ var _ = Describe("Session", func() {
}
sess.cryptoChangeCallback = cb
sess.cryptoSetup = &mockCryptoSetup{handshakeComplete: true}
sess.aeadChanged <- struct{}{}
sess.aeadChanged <- protocol.EncryptionForwardSecure
go sess.run()
Eventually(func() bool { return callbackCalledWith }).Should(BeTrue())
Expect(callbackSession).To(Equal(sess))