Browse Source

Remove panic and check the round trip

pull/1782/head
Zaki Manian 7 years ago
parent
commit
05a5294e52
2 changed files with 10 additions and 2 deletions
  1. +3
    -2
      xchacha20poly1305/xchachapoly.go
  2. +7
    -0
      xchacha20poly1305/xchachapoly_test.go

+ 3
- 2
xchacha20poly1305/xchachapoly.go View File

@ -4,6 +4,7 @@ import (
"crypto/cipher" "crypto/cipher"
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt"
"golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/chacha20poly1305"
) )
@ -64,10 +65,10 @@ func (c *xchacha20poly1305) Seal(dst, nonce, plaintext, additionalData []byte) [
func (c *xchacha20poly1305) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) { func (c *xchacha20poly1305) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
if len(nonce) != NonceSize { if len(nonce) != NonceSize {
panic("xchacha20poly1305: bad nonce length passed to Open")
return nil, fmt.Errorf("xchacha20poly1305: bad nonce length passed to Open")
} }
if uint64(len(ciphertext)) > (1<<38)-48 { if uint64(len(ciphertext)) > (1<<38)-48 {
panic("xchacha20poly1305: ciphertext too large")
return nil, fmt.Errorf("xchacha20poly1305: ciphertext too large")
} }
var subKey [KeySize]byte var subKey [KeySize]byte
var hNonce [16]byte var hNonce [16]byte


+ 7
- 0
xchacha20poly1305/xchachapoly_test.go View File

@ -80,6 +80,13 @@ func TestVectors(t *testing.T) {
if !bytes.Equal(dst, v.ciphertext) { if !bytes.Equal(dst, v.ciphertext) {
t.Errorf("Test %d: ciphertext mismatch:\n \t got: %s\n \t want: %s", i, toHex(dst), toHex(v.ciphertext)) t.Errorf("Test %d: ciphertext mismatch:\n \t got: %s\n \t want: %s", i, toHex(dst), toHex(v.ciphertext))
} }
open, err := aead.Open(nil, nonce[:], dst, v.ad)
if err != nil {
t.Error(err)
}
if !bytes.Equal(open, v.plaintext) {
t.Errorf("Test %d: plaintext mismatch:\n \t got: %s\n \t want: %s", i, string(open), string(v.plaintext))
}
} }
} }


Loading…
Cancel
Save