mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 12:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

change AEAD interface to return bytes.Reader instead of io.Reader

Browse source
This commit is contained in:
Lucas Clemente 2016-04-08 10:22:52 +02:00
parent 27c422a92b
commit 7296d4e55e
4 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crypto/AEAD.go
View file

@ -1,8 +1,11 @@
package crypto package crypto
import "io" import (
"bytes"
"io"
)
// An AEAD implements QUIC's authenticated encryption and associated data // An AEAD implements QUIC's authenticated encryption and associated data
type AEAD interface { type AEAD interface {
Open(associatedData []byte, ciphertext io.Reader) (io.Reader, error) Open(associatedData []byte, ciphertext io.Reader) (*bytes.Reader, error)
} }

2
crypto/NullAEAD.go
View file

@ -14,7 +14,7 @@ type NullAEAD struct{}
var _ AEAD = &NullAEAD{} var _ AEAD = &NullAEAD{}
// Open and verify the ciphertext // Open and verify the ciphertext
func (*NullAEAD) Open(associatedData []byte, r io.Reader) (io.Reader, error) { func (*NullAEAD) Open(associatedData []byte, r io.Reader) (*bytes.Reader, error) {
ciphertext, err := ioutil.ReadAll(r) ciphertext, err := ioutil.ReadAll(r)
if err != nil { if err != nil {
return nil, err return nil, err

10
crypto/NullAEAD_test.go
View file

@ -22,4 +22,14 @@ var _ = Describe("Crypto/NullAEAD", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(res).To(Equal([]byte("They are endowed with reason and conscience and should act towards one another in a spirit of brotherhood."))) Expect(res).To(Equal([]byte("They are endowed with reason and conscience and should act towards one another in a spirit of brotherhood.")))
}) })
It("fails", func() {
aad := []byte("All human beings are born free and equal in dignity and rights..")
plainText := []byte("They are endowed with reason and conscience and should act towards one another in a spirit of brotherhood.")
hash := []byte{0x98, 0x9b, 0x33, 0x3f, 0xe8, 0xde, 0x32, 0x5c, 0xa6, 0x7f, 0x9c, 0xf7}
cipherText := append(hash, plainText...)
aead := &crypto.NullAEAD{}
_, err := aead.Open(aad, bytes.NewReader(cipherText))
Expect(err).To(HaveOccurred())
})
}) })

3
crypto/fnv.go
View file

@ -4,6 +4,8 @@ package crypto
// created by Glenn Fowler, Landon Curt Noll, and Phong Vo. // created by Glenn Fowler, Landon Curt Noll, and Phong Vo.
// See https://en.wikipedia.org/wiki/Fowler-Noll-Vo_hash_function. // See https://en.wikipedia.org/wiki/Fowler-Noll-Vo_hash_function.
// Write() algorithm taken and modified from github.com/romain-jacotin/quic
import "hash" import "hash"
// Hash128 is the common interface implemented by all 128-bit hash functions. // Hash128 is the common interface implemented by all 128-bit hash functions.
@ -38,7 +40,6 @@ func (s *sum128a) Sum128() (uint64, uint64) {
func (s *sum128a) Write(data []byte) (int, error) { func (s *sum128a) Write(data []byte) (int, error) {
var t0, t1, t2, t3 uint64 var t0, t1, t2, t3 uint64
// Taken and slightly modified from github.com/romain-jacotin/quic
const fnv128PrimeLow = 0x0000013B const fnv128PrimeLow = 0x0000013B
const fnv128PrimeShift = 24 const fnv128PrimeShift = 24