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

introduce PacketNumber type & protocol package

Browse Source
This commit is contained in:
Lucas Clemente
2016-04-14 10:29:21 +02:00
parent c6b3ce72eb
commit 3d767401d0
7 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/AEAD.go
View File

@@ -3,10 +3,12 @@ package crypto
import (
"bytes"
"io"
"github.com/lucas-clemente/quic-go/protocol"
)
// An AEAD implements QUIC's authenticated encryption and associated data
type AEAD interface {
Open(packetNumber uint64, associatedData []byte, ciphertext io.Reader) (*bytes.Reader, error)
Seal(packetNumber uint64, b *bytes.Buffer, associatedData []byte, plaintext []byte)
Open(packetNumber protocol.PacketNumber, associatedData []byte, ciphertext io.Reader) (*bytes.Reader, error)
Seal(packetNumber protocol.PacketNumber, b *bytes.Buffer, associatedData []byte, plaintext []byte)
}

5
crypto/NullAEAD.go
View File

@@ -7,6 +7,7 @@ import (
"io"
"io/ioutil"
"github.com/lucas-clemente/quic-go/protocol"
"github.com/lucas-clemente/quic-go/utils"
)
@@ -16,7 +17,7 @@ type NullAEAD struct{}
var _ AEAD = &NullAEAD{}
// Open and verify the ciphertext
func (*NullAEAD) Open(packetNumber uint64, associatedData []byte, r io.Reader) (*bytes.Reader, error) {
func (*NullAEAD) Open(packetNumber protocol.PacketNumber, associatedData []byte, r io.Reader) (*bytes.Reader, error) {
ciphertext, err := ioutil.ReadAll(r)
if err != nil {
return nil, err
@@ -40,7 +41,7 @@ func (*NullAEAD) Open(packetNumber uint64, associatedData []byte, r io.Reader) (
}
// Seal writes hash and ciphertext to the buffer
func (*NullAEAD) Seal(packetNumber uint64, b *bytes.Buffer, associatedData []byte, plaintext []byte) {
func (*NullAEAD) Seal(packetNumber protocol.PacketNumber, b *bytes.Buffer, associatedData []byte, plaintext []byte) {
hash := New128a()
hash.Write(associatedData)
hash.Write(plaintext)

10
crypto/aes_gcm_aead.go
View File

@@ -8,6 +8,8 @@ import (
"errors"
"io"
"io/ioutil"
"github.com/lucas-clemente/quic-go/protocol"
)
type aeadAESGCM struct {
@@ -46,7 +48,7 @@ func NewAEADAESGCM(otherKey []byte, myKey []byte, otherIV []byte, myIV []byte) (
}, nil
}
func (aead *aeadAESGCM) Open(packetNumber uint64, associatedData []byte, r io.Reader) (*bytes.Reader, error) {
func (aead *aeadAESGCM) Open(packetNumber protocol.PacketNumber, associatedData []byte, r io.Reader) (*bytes.Reader, error) {
ciphertext, err := ioutil.ReadAll(r)
if err != nil {
return nil, err
@@ -58,14 +60,14 @@ func (aead *aeadAESGCM) Open(packetNumber uint64, associatedData []byte, r io.Re
return bytes.NewReader(plaintext), nil
}
func (aead *aeadAESGCM) Seal(packetNumber uint64, b *bytes.Buffer, associatedData []byte, plaintext []byte) {
func (aead *aeadAESGCM) Seal(packetNumber protocol.PacketNumber, b *bytes.Buffer, associatedData []byte, plaintext []byte) {
ciphertext := aead.encrypter.Seal(nil, makeNonce(aead.myIV, packetNumber), plaintext, associatedData)
b.Write(ciphertext)
}
func makeNonce(iv []byte, packetNumber uint64) []byte {
func makeNonce(iv []byte, packetNumber protocol.PacketNumber) []byte {
res := make([]byte, 12)
copy(res[0:4], iv)
binary.LittleEndian.PutUint64(res[4:12], packetNumber)
binary.LittleEndian.PutUint64(res[4:12], uint64(packetNumber))
return res
}