Filippo Valsorda
e0829623af
const KeySize = 32
const NonceSize = 12
func HChaCha20(key, nonce []byte) ([]byte, error)
type Cipher struct {}
func NewUnauthenticatedCipher(key, nonce []byte) (*Cipher, error)
func (s *Cipher) XORKeyStream(dst, src []byte)
Small performance hit in chacha20poly1305, probably due to the loss
of the Advance API, which we might consider adding later. No new
allocations, thanks to the mid-stack inliner.
name old time/op new time/op delta
Chacha20Poly1305/Open-64-8 1.60µs ± 0% 1.68µs ± 1% +4.94% (p=0.000 n=9+10)
Chacha20Poly1305/Seal-64-8 1.56µs ± 0% 1.64µs ± 1% +5.21% (p=0.000 n=8+10)
Chacha20Poly1305/Open-64-X-8 2.10µs ± 1% 2.22µs ± 1% +5.81% (p=0.000 n=10+10)
Chacha20Poly1305/Seal-64-X-8 2.07µs ± 1% 2.17µs ± 0% +4.88% (p=0.000 n=10+10)
Chacha20Poly1305/Open-1350-8 15.4µs ± 0% 15.7µs ± 1% +1.65% (p=0.000 n=10+10)
Chacha20Poly1305/Seal-1350-8 15.6µs ± 2% 15.9µs ± 1% +1.58% (p=0.028 n=10+9)
Chacha20Poly1305/Open-1350-X-8 16.0µs ± 1% 16.3µs ± 2% +2.00% (p=0.000 n=10+10)
Chacha20Poly1305/Seal-1350-X-8 15.9µs ± 0% 16.3µs ± 1% +1.91% (p=0.000 n=10+8)
Chacha20Poly1305/Open-8192-8 85.6µs ± 0% 86.6µs ± 1% +1.21% (p=0.000 n=10+10)
Chacha20Poly1305/Seal-8192-8 85.7µs ± 0% 86.3µs ± 0% +0.68% (p=0.001 n=9+9)
Chacha20Poly1305/Open-8192-X-8 86.4µs ± 1% 87.1µs ± 1% +0.76% (p=0.035 n=10+9)
Chacha20Poly1305/Seal-8192-X-8 86.0µs ± 0% 87.0µs ± 1% +1.14% (p=0.000 n=9+9)
Updates golang/go#24485
Change-Id: I2ec2ef487a03f013049915d9063751c75a78408b
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/185980
Reviewed-by: Michael Munday <mike.munday@ibm.com>
87 lines
2.5 KiB
Go
87 lines
2.5 KiB
Go
// Copyright 2018 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package chacha20poly1305
|
|
|
|
import (
|
|
"crypto/cipher"
|
|
"errors"
|
|
|
|
"golang.org/x/crypto/chacha20"
|
|
)
|
|
|
|
type xchacha20poly1305 struct {
|
|
key [KeySize]byte
|
|
}
|
|
|
|
// NewX returns a XChaCha20-Poly1305 AEAD that uses the given 256-bit key.
|
|
//
|
|
// XChaCha20-Poly1305 is a ChaCha20-Poly1305 variant that takes a longer nonce,
|
|
// suitable to be generated randomly without risk of collisions. It should be
|
|
// preferred when nonce uniqueness cannot be trivially ensured, or whenever
|
|
// nonces are randomly generated.
|
|
func NewX(key []byte) (cipher.AEAD, error) {
|
|
if len(key) != KeySize {
|
|
return nil, errors.New("chacha20poly1305: bad key length")
|
|
}
|
|
ret := new(xchacha20poly1305)
|
|
copy(ret.key[:], key)
|
|
return ret, nil
|
|
}
|
|
|
|
func (*xchacha20poly1305) NonceSize() int {
|
|
return NonceSizeX
|
|
}
|
|
|
|
func (*xchacha20poly1305) Overhead() int {
|
|
return 16
|
|
}
|
|
|
|
func (x *xchacha20poly1305) Seal(dst, nonce, plaintext, additionalData []byte) []byte {
|
|
if len(nonce) != NonceSizeX {
|
|
panic("chacha20poly1305: bad nonce length passed to Seal")
|
|
}
|
|
|
|
// XChaCha20-Poly1305 technically supports a 64-bit counter, so there is no
|
|
// size limit. However, since we reuse the ChaCha20-Poly1305 implementation,
|
|
// the second half of the counter is not available. This is unlikely to be
|
|
// an issue because the cipher.AEAD API requires the entire message to be in
|
|
// memory, and the counter overflows at 256 GB.
|
|
if uint64(len(plaintext)) > (1<<38)-64 {
|
|
panic("chacha20poly1305: plaintext too large")
|
|
}
|
|
|
|
c := new(chacha20poly1305)
|
|
hKey, _ := chacha20.HChaCha20(x.key[:], nonce[0:16])
|
|
copy(c.key[:], hKey)
|
|
|
|
// The first 4 bytes of the final nonce are unused counter space.
|
|
cNonce := make([]byte, NonceSize)
|
|
copy(cNonce[4:12], nonce[16:24])
|
|
|
|
return c.seal(dst, cNonce[:], plaintext, additionalData)
|
|
}
|
|
|
|
func (x *xchacha20poly1305) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
|
|
if len(nonce) != NonceSizeX {
|
|
panic("chacha20poly1305: bad nonce length passed to Open")
|
|
}
|
|
if len(ciphertext) < 16 {
|
|
return nil, errOpen
|
|
}
|
|
if uint64(len(ciphertext)) > (1<<38)-48 {
|
|
panic("chacha20poly1305: ciphertext too large")
|
|
}
|
|
|
|
c := new(chacha20poly1305)
|
|
hKey, _ := chacha20.HChaCha20(x.key[:], nonce[0:16])
|
|
copy(c.key[:], hKey)
|
|
|
|
// The first 4 bytes of the final nonce are unused counter space.
|
|
cNonce := make([]byte, NonceSize)
|
|
copy(cNonce[4:12], nonce[16:24])
|
|
|
|
return c.open(dst, cNonce[:], ciphertext, additionalData)
|
|
}
|