From a2eaa5e3d1d9dfd8cf840076c215d253f82abf4b Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 4 Sep 2021 19:18:42 +0200
Subject: speed: add BenchmarkStupidChacha

gocryptfs/internal/speed$ go test -bench .
goos: linux
goarch: amd64
pkg: github.com/rfjakob/gocryptfs/v2/internal/speed
cpu: Intel(R) Core(TM) i5-3470 CPU @ 3.20GHz
BenchmarkStupidGCM-4              	  249396	      4722 ns/op	 867.50 MB/s
BenchmarkStupidGCMDecrypt-4       	  257872	      4616 ns/op	 887.35 MB/s
BenchmarkGoGCM-4                  	  290952	      4097 ns/op	 999.83 MB/s
BenchmarkGoGCMDecrypt-4           	  294106	      4060 ns/op	1008.84 MB/s
BenchmarkAESSIV-4                 	   46520	     25532 ns/op	 160.42 MB/s
BenchmarkAESSIVDecrypt-4          	   46974	     25478 ns/op	 160.76 MB/s
BenchmarkXchacha-4                	  244108	      4881 ns/op	 839.14 MB/s
BenchmarkXchachaDecrypt-4         	  249658	      4786 ns/op	 855.86 MB/s
BenchmarkStupidXchacha-4          	  205339	      5768 ns/op	 710.11 MB/s
BenchmarkStupidXchachaDecrypt-4   	  204577	      5836 ns/op	 701.84 MB/s
BenchmarkStupidChacha-4           	  227510	      5224 ns/op	 784.06 MB/s
BenchmarkStupidChachaDecrypt-4    	  222787	      5359 ns/op	 764.34 MB/s
PASS
ok  	github.com/rfjakob/gocryptfs/v2/internal/speed	15.328s
---
 internal/speed/speed_test.go      | 8 ++++++++
 internal/stupidgcm/chacha.go      | 2 +-
 internal/stupidgcm/chacha_test.go | 2 +-
 internal/stupidgcm/xchacha.go     | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'internal')

diff --git a/internal/speed/speed_test.go b/internal/speed/speed_test.go
index 4d09148..e9bbc0d 100644
--- a/internal/speed/speed_test.go
+++ b/internal/speed/speed_test.go
@@ -74,3 +74,11 @@ func BenchmarkStupidXchacha(b *testing.B) {
 func BenchmarkStupidXchachaDecrypt(b *testing.B) {
 	bDecrypt(b, stupidgcm.NewXchacha20poly1305(randBytes(32)))
 }
+
+func BenchmarkStupidChacha(b *testing.B) {
+	bEncrypt(b, stupidgcm.NewChacha20poly1305(randBytes(32)))
+}
+
+func BenchmarkStupidChachaDecrypt(b *testing.B) {
+	bDecrypt(b, stupidgcm.NewChacha20poly1305(randBytes(32)))
+}
diff --git a/internal/stupidgcm/chacha.go b/internal/stupidgcm/chacha.go
index 37f7e1f..2e6e6e6 100644
--- a/internal/stupidgcm/chacha.go
+++ b/internal/stupidgcm/chacha.go
@@ -21,7 +21,7 @@ type stupidChacha20poly1305 struct {
 // Verify that we satisfy the cipher.AEAD interface
 var _ cipher.AEAD = &stupidChacha20poly1305{}
 
-func newChacha20poly1305(key []byte) *stupidChacha20poly1305 {
+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))
 	}
diff --git a/internal/stupidgcm/chacha_test.go b/internal/stupidgcm/chacha_test.go
index 513b68f..5f803aa 100644
--- a/internal/stupidgcm/chacha_test.go
+++ b/internal/stupidgcm/chacha_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestStupidChacha20poly1305(t *testing.T) {
 	key := randBytes(32)
-	c := newChacha20poly1305(key)
+	c := NewChacha20poly1305(key)
 	ref, err := chacha20poly1305.New(key)
 	if err != nil {
 		t.Fatal(err)
diff --git a/internal/stupidgcm/xchacha.go b/internal/stupidgcm/xchacha.go
index 3bf3b5b..055b7f7 100644
--- a/internal/stupidgcm/xchacha.go
+++ b/internal/stupidgcm/xchacha.go
@@ -67,7 +67,7 @@ func (x *stupidXchacha20poly1305) Seal(dst, nonce, plaintext, additionalData []b
 	}
 
 	hKey, _ := chacha20.HChaCha20(x.key[:], nonce[0:16])
-	c := newChacha20poly1305(hKey)
+	c := NewChacha20poly1305(hKey)
 	defer c.Wipe()
 
 	// The first 4 bytes of the final nonce are unused counter space.
@@ -92,7 +92,7 @@ func (x *stupidXchacha20poly1305) Open(dst, nonce, ciphertext, additionalData []
 	}
 
 	hKey, _ := chacha20.HChaCha20(x.key[:], nonce[0:16])
-	c := newChacha20poly1305(hKey)
+	c := NewChacha20poly1305(hKey)
 	defer c.Wipe()
 
 	// The first 4 bytes of the final nonce are unused counter space.
-- 
cgit v1.2.3