d9510d0c0b
I noticed that growslice() shows up in the cpuprofile. Avoiding slice append for the private jey copy gives a 0.6% speedup: gocryptfs/internal/speed$ benchstat old new name old time/op new time/op delta StupidXchacha-4 5.68µs ± 0% 5.65µs ± 0% -0.63% (p=0.008 n=5+5) name old speed new speed delta StupidXchacha-4 721MB/s ± 0% 725MB/s ± 0% +0.63% (p=0.008 n=5+5)
53 lines
1.4 KiB
Go
53 lines
1.4 KiB
Go
// +build !without_openssl
|
|
|
|
package stupidgcm
|
|
|
|
import (
|
|
"crypto/cipher"
|
|
"log"
|
|
|
|
"golang.org/x/crypto/chacha20poly1305"
|
|
)
|
|
|
|
/*
|
|
#include <openssl/evp.h>
|
|
*/
|
|
import "C"
|
|
|
|
type stupidChacha20poly1305 struct {
|
|
stupidAEADCommon
|
|
}
|
|
|
|
// Verify that we satisfy the cipher.AEAD interface
|
|
var _ cipher.AEAD = &stupidChacha20poly1305{}
|
|
|
|
// _EVP_chacha20_poly1305 caches C.EVP_chacha20_poly1305() to avoid the Cgo call
|
|
// overhead for each instantiation of NewChacha20poly1305.
|
|
var _EVP_chacha20_poly1305 *C.EVP_CIPHER
|
|
|
|
func init() {
|
|
_EVP_chacha20_poly1305 = C.EVP_chacha20_poly1305()
|
|
}
|
|
|
|
// NewChacha20poly1305 returns a new instance of the OpenSSL ChaCha20-Poly1305 AEAD
|
|
// cipher ( https://www.openssl.org/docs/man1.1.1/man3/EVP_chacha20_poly1305.html ).
|
|
//
|
|
// gocryptfs only uses ChaCha20-Poly1305 as a building block for OpenSSL
|
|
// XChaCha20-Poly1305. This function is hot because it gets called once for each
|
|
// block by XChaCha20-Poly1305.
|
|
func NewChacha20poly1305(key []byte) *stupidChacha20poly1305 {
|
|
if len(key) != chacha20poly1305.KeySize {
|
|
log.Panicf("Only %d-byte keys are supported, you passed %d bytes", chacha20poly1305.KeySize, len(key))
|
|
}
|
|
// private copy
|
|
key2 := make([]byte, chacha20poly1305.KeySize)
|
|
copy(key2, key)
|
|
return &stupidChacha20poly1305{
|
|
stupidAEADCommon{
|
|
key: key2,
|
|
openSSLEVPCipher: _EVP_chacha20_poly1305,
|
|
nonceSize: chacha20poly1305.NonceSize,
|
|
},
|
|
}
|
|
}
|