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

protect the AEAD calculating the integrity tag by a mutex

Browse Source
This commit is contained in:
Marten Seemann
2020-01-17 14:01:12 +07:00
parent 8b52e62b86
commit 3e469db631
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/handshake/retry.go
View File

@@ -5,6 +5,7 @@ import (
"crypto/aes" "crypto/aes"
"crypto/cipher" "crypto/cipher"
"fmt" "fmt"
"sync"
"github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/protocol"
) )
@@ -25,18 +26,23 @@ func init() {
retryAEAD = aead retryAEAD = aead
} }
var retryBuf bytes.Buffer
var retryMutex sync.Mutex
var retryNonce [12]byte
// GetRetryIntegrityTag calculates the integrity tag on a Retry packet // GetRetryIntegrityTag calculates the integrity tag on a Retry packet
func GetRetryIntegrityTag(retry []byte, origDestConnID protocol.ConnectionID) *[16]byte { func GetRetryIntegrityTag(retry []byte, origDestConnID protocol.ConnectionID) *[16]byte {
buf := bytes.NewBuffer(make([]byte, 0, 1+origDestConnID.Len()+len(retry))) retryMutex.Lock()
buf.WriteByte(uint8(origDestConnID.Len())) retryBuf.WriteByte(uint8(origDestConnID.Len()))
buf.Write(origDestConnID.Bytes()) retryBuf.Write(origDestConnID.Bytes())
buf.Write(retry) retryBuf.Write(retry)
sealed := retryAEAD.Seal(nil, make([]byte, 12), []byte{}, buf.Bytes()) var tag [16]byte
sealed := retryAEAD.Seal(tag[:0], retryNonce[:], nil, retryBuf.Bytes())
if len(sealed) != 16 { if len(sealed) != 16 {
panic(fmt.Sprintf("unexpected Retry integrity tag length: %d", len(sealed))) panic(fmt.Sprintf("unexpected Retry integrity tag length: %d", len(sealed)))
} }
var tag [16]byte retryBuf.Reset()
copy(tag[:], sealed) retryMutex.Unlock()
return &tag return &tag
} }