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

move to a faster chacha20poly1305 implementation

Browse Source 
refs #125
This commit is contained in:
Lucas Clemente
2016-05-20 00:43:08 +02:00
parent f86875f746
commit 224524c8d3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/chacha20poly1305_aead.go
View File

@@ -5,7 +5,7 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"github.com/lucas-clemente/crypto/chacha" "github.com/lucas-clemente/chacha20poly1305"
"github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/protocol"
) )
@@ -22,11 +22,11 @@ func NewAEADChacha20Poly1305(otherKey []byte, myKey []byte, otherIV []byte, myIV
if len(myKey) != 32 || len(otherKey) != 32 || len(myIV) != 4 || len(otherIV) != 4 { if len(myKey) != 32 || len(otherKey) != 32 || len(myIV) != 4 || len(otherIV) != 4 {
return nil, errors.New("chacha20poly1305: expected 32-byte keys and 4-byte IVs") return nil, errors.New("chacha20poly1305: expected 32-byte keys and 4-byte IVs")
} }
encrypter, err := chacha.NewAEADTagSize(myKey, 12) encrypter, err := chacha20poly1305.New(myKey, 12)
if err != nil { if err != nil {
return nil, err return nil, err
} }
decrypter, err := chacha.NewAEADTagSize(otherKey, 12) decrypter, err := chacha20poly1305.New(otherKey, 12)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -39,7 +39,7 @@ func NewAEADChacha20Poly1305(otherKey []byte, myKey []byte, otherIV []byte, myIV
} }
func (aead *aeadChacha20Poly1305) Open(packetNumber protocol.PacketNumber, associatedData []byte, ciphertext []byte) ([]byte, error) { func (aead *aeadChacha20Poly1305) Open(packetNumber protocol.PacketNumber, associatedData []byte, ciphertext []byte) ([]byte, error) {
plaintext, err := aead.decrypter.Open(make([]byte, len(ciphertext)), makeNonce(aead.otherIV, packetNumber), ciphertext, associatedData) plaintext, err := aead.decrypter.Open(nil, makeNonce(aead.otherIV, packetNumber), ciphertext, associatedData)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -47,7 +47,7 @@ func (aead *aeadChacha20Poly1305) Open(packetNumber protocol.PacketNumber, assoc
} }
func (aead *aeadChacha20Poly1305) Seal(packetNumber protocol.PacketNumber, associatedData []byte, plaintext []byte) []byte { func (aead *aeadChacha20Poly1305) Seal(packetNumber protocol.PacketNumber, associatedData []byte, plaintext []byte) []byte {
return aead.encrypter.Seal(make([]byte, len(plaintext)+12), makeNonce(aead.myIV, packetNumber), plaintext, associatedData) return aead.encrypter.Seal(nil, makeNonce(aead.myIV, packetNumber), plaintext, associatedData)
} }
func makeNonce(iv []byte, packetNumber protocol.PacketNumber) []byte { func makeNonce(iv []byte, packetNumber protocol.PacketNumber) []byte {