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

queue undecryptable packets for later decryption & possibly send PRST

Browse Source 
fixes #38, fixes #69, fixes #73
This commit is contained in:
Lucas Clemente
2016-05-12 15:59:55 +02:00
parent 0df44e46e5
commit c7126137d1
7 changed files with 87 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
handshake/crypto_setup.go
View File

@@ -29,6 +29,7 @@ type CryptoSetup struct {
forwardSecureAEAD crypto.AEAD
receivedForwardSecurePacket bool
receivedSecurePacket bool
aeadChanged chan struct{}
keyDerivation KeyDerivationFunction
keyExchange KeyExchangeFunction
@@ -43,7 +44,7 @@ type CryptoSetup struct {
var _ crypto.AEAD = &CryptoSetup{}
// NewCryptoSetup creates a new CryptoSetup instance
func NewCryptoSetup(connID protocol.ConnectionID, version protocol.VersionNumber, scfg *ServerConfig, cryptoStream utils.Stream, connectionParametersManager *ConnectionParametersManager) *CryptoSetup {
func NewCryptoSetup(connID protocol.ConnectionID, version protocol.VersionNumber, scfg *ServerConfig, cryptoStream utils.Stream, connectionParametersManager *ConnectionParametersManager, aeadChanged chan struct{}) *CryptoSetup {
nonce := make([]byte, 32)
if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
panic(err)
@@ -57,6 +58,7 @@ func NewCryptoSetup(connID protocol.ConnectionID, version protocol.VersionNumber
keyExchange: crypto.NewCurve25519KEX,
cryptoStream: cryptoStream,
connectionParametersManager: connectionParametersManager,
aeadChanged: aeadChanged,
}
}
@@ -138,7 +140,7 @@ func (h *CryptoSetup) Open(packetNumber protocol.PacketNumber, associatedData []
return (&crypto.NullAEAD{}).Open(packetNumber, associatedData, ciphertext)
}
// Seal a messageTag
// Seal a message
func (h *CryptoSetup) Seal(packetNumber protocol.PacketNumber, associatedData []byte, plaintext []byte) []byte {
h.mutex.RLock()
defer h.mutex.RUnlock()
@@ -241,5 +243,7 @@ func (h *CryptoSetup) handleCHLO(sni string, data []byte, cryptoData map[Tag][]b
var reply bytes.Buffer
WriteHandshakeMessage(&reply, TagSHLO, replyMap)
h.aeadChanged <- struct{}{}
return reply.Bytes(), nil
}