internal/chacha20: refactor for readability and consistency
Separated the complex buffering logic from key stream generation more clearly, added plenty of comments and generally refactored the Go implementation for readability. Made the interface with the generic/assembly cores smaller and more consistent, according to golang.org/wiki/TargetSpecific. We will recover the lost performance on unaligned calls by caching 3/4 of the first round across XORKeyStream invocations, which we now have complexity budget for. name old speed new speed delta ChaCha20/64-4 435MB/s ± 2% 429MB/s ± 2% -1.47% (p=0.013 n=10+9) ChaCha20/256-4 496MB/s ± 1% 493MB/s ± 2% ~ (p=0.280 n=10+10) ChaCha20/10x25-4 283MB/s ± 1% 274MB/s ± 2% -3.13% (p=0.000 n=10+10) ChaCha20/4096-4 494MB/s ± 1% 493MB/s ± 5% ~ (p=0.631 n=10+10) ChaCha20/100x40-4 421MB/s ± 3% 408MB/s ± 1% -3.14% (p=0.003 n=9+9) ChaCha20/65536-4 515MB/s ± 1% 519MB/s ± 3% ~ (p=0.161 n=7+10) ChaCha20/1000x65-4 501MB/s ± 2% 501MB/s ± 3% ~ (p=0.497 n=9+10) Also applied a fix for a lingering bug in the ppc64le assembly written by Lynn Boger <laboger@linux.vnet.ibm.com>. Updates golang/go#24485 Change-Id: I10cf24a7f10359b1b4ae63c9bb1946735b98ac9b Reviewed-on: https://go-review.googlesource.com/c/crypto/+/185439 Reviewed-by: Michael Munday <mike.munday@ibm.com>
This commit is contained in:
@@ -7,11 +7,16 @@ package chacha20
|
||||
import (
|
||||
"encoding/binary"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func _() {
|
||||
// Assert that bufSize is a multiple of blockSize.
|
||||
var b [1]byte
|
||||
_ = b[bufSize%blockSize]
|
||||
}
|
||||
|
||||
func TestCore(t *testing.T) {
|
||||
// This is just a smoke test that checks the example from
|
||||
// https://tools.ietf.org/html/rfc7539#section-2.3.2. The
|
||||
@@ -121,6 +126,8 @@ func TestStep(t *testing.T) {
|
||||
}
|
||||
// finish the encryption
|
||||
s.XORKeyStream(output[i:], input[i:])
|
||||
// ensure we tolerate a call with an empty input
|
||||
s.XORKeyStream(output[len(output):], input[len(input):])
|
||||
|
||||
got := hex.EncodeToString(output)
|
||||
if got != c.output {
|
||||
@@ -170,24 +177,44 @@ func TestAdvance(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkChaCha20(b *testing.B) {
|
||||
sizes := []int{32, 63, 64, 256, 1024, 1350, 65536}
|
||||
for _, size := range sizes {
|
||||
s := size
|
||||
b.Run(fmt.Sprint(s), func(b *testing.B) {
|
||||
k := [32]byte{}
|
||||
c := [16]byte{}
|
||||
src := make([]byte, s)
|
||||
dst := make([]byte, s)
|
||||
b.SetBytes(int64(s))
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
XORKeyStream(dst, src, &c, &k)
|
||||
}
|
||||
})
|
||||
func benchmarkChaCha20(b *testing.B, step, count int) {
|
||||
tot := step * count
|
||||
src := make([]byte, tot)
|
||||
dst := make([]byte, tot)
|
||||
b.SetBytes(int64(tot))
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
c := New([8]uint32{}, [3]uint32{})
|
||||
for i := 0; i < tot; i += step {
|
||||
c.XORKeyStream(dst[i:], src[i:i+step])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkChaCha20(b *testing.B) {
|
||||
b.Run("64", func(b *testing.B) {
|
||||
benchmarkChaCha20(b, 64, 1)
|
||||
})
|
||||
b.Run("256", func(b *testing.B) {
|
||||
benchmarkChaCha20(b, 256, 1)
|
||||
})
|
||||
b.Run("10x25", func(b *testing.B) {
|
||||
benchmarkChaCha20(b, 10, 25)
|
||||
})
|
||||
b.Run("4096", func(b *testing.B) {
|
||||
benchmarkChaCha20(b, 256, 1)
|
||||
})
|
||||
b.Run("100x40", func(b *testing.B) {
|
||||
benchmarkChaCha20(b, 100, 40)
|
||||
})
|
||||
b.Run("65536", func(b *testing.B) {
|
||||
benchmarkChaCha20(b, 65536, 1)
|
||||
})
|
||||
b.Run("1000x65", func(b *testing.B) {
|
||||
benchmarkChaCha20(b, 1000, 65)
|
||||
})
|
||||
}
|
||||
|
||||
func TestHChaCha20(t *testing.T) {
|
||||
// See draft-paragon-paseto-rfc-00 §7.2.1.
|
||||
key := []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
|
||||
|
||||
Reference in New Issue
Block a user