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.4 KiB
Go
87 lines
2.4 KiB
Go
// Copyright 2016 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.
|
|
|
|
// +build go1.7,amd64,!gccgo,!appengine
|
|
|
|
package chacha20poly1305
|
|
|
|
import (
|
|
"encoding/binary"
|
|
|
|
"golang.org/x/crypto/internal/subtle"
|
|
"golang.org/x/sys/cpu"
|
|
)
|
|
|
|
//go:noescape
|
|
func chacha20Poly1305Open(dst []byte, key []uint32, src, ad []byte) bool
|
|
|
|
//go:noescape
|
|
func chacha20Poly1305Seal(dst []byte, key []uint32, src, ad []byte)
|
|
|
|
var (
|
|
useAVX2 = cpu.X86.HasAVX2 && cpu.X86.HasBMI2
|
|
)
|
|
|
|
// setupState writes a ChaCha20 input matrix to state. See
|
|
// https://tools.ietf.org/html/rfc7539#section-2.3.
|
|
func setupState(state *[16]uint32, key *[32]byte, nonce []byte) {
|
|
state[0] = 0x61707865
|
|
state[1] = 0x3320646e
|
|
state[2] = 0x79622d32
|
|
state[3] = 0x6b206574
|
|
|
|
state[4] = binary.LittleEndian.Uint32(key[0:4])
|
|
state[5] = binary.LittleEndian.Uint32(key[4:8])
|
|
state[6] = binary.LittleEndian.Uint32(key[8:12])
|
|
state[7] = binary.LittleEndian.Uint32(key[12:16])
|
|
state[8] = binary.LittleEndian.Uint32(key[16:20])
|
|
state[9] = binary.LittleEndian.Uint32(key[20:24])
|
|
state[10] = binary.LittleEndian.Uint32(key[24:28])
|
|
state[11] = binary.LittleEndian.Uint32(key[28:32])
|
|
|
|
state[12] = 0
|
|
state[13] = binary.LittleEndian.Uint32(nonce[0:4])
|
|
state[14] = binary.LittleEndian.Uint32(nonce[4:8])
|
|
state[15] = binary.LittleEndian.Uint32(nonce[8:12])
|
|
}
|
|
|
|
func (c *chacha20poly1305) seal(dst, nonce, plaintext, additionalData []byte) []byte {
|
|
if !cpu.X86.HasSSSE3 {
|
|
return c.sealGeneric(dst, nonce, plaintext, additionalData)
|
|
}
|
|
|
|
var state [16]uint32
|
|
setupState(&state, &c.key, nonce)
|
|
|
|
ret, out := sliceForAppend(dst, len(plaintext)+16)
|
|
if subtle.InexactOverlap(out, plaintext) {
|
|
panic("chacha20poly1305: invalid buffer overlap")
|
|
}
|
|
chacha20Poly1305Seal(out[:], state[:], plaintext, additionalData)
|
|
return ret
|
|
}
|
|
|
|
func (c *chacha20poly1305) open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
|
|
if !cpu.X86.HasSSSE3 {
|
|
return c.openGeneric(dst, nonce, ciphertext, additionalData)
|
|
}
|
|
|
|
var state [16]uint32
|
|
setupState(&state, &c.key, nonce)
|
|
|
|
ciphertext = ciphertext[:len(ciphertext)-16]
|
|
ret, out := sliceForAppend(dst, len(ciphertext))
|
|
if subtle.InexactOverlap(out, ciphertext) {
|
|
panic("chacha20poly1305: invalid buffer overlap")
|
|
}
|
|
if !chacha20Poly1305Open(out, state[:], ciphertext, additionalData) {
|
|
for i := range out {
|
|
out[i] = 0
|
|
}
|
|
return nil, errOpen
|
|
}
|
|
|
|
return ret, nil
|
|
}
|