From e9bb8b800c6c724125ccd862f4d20946317b31f5 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 26 Sep 2016 23:25:13 +0200
Subject: reverse: switch from GCM-SIV to AES-SIV

GCM-SIV is not yet finalized, and the reference implemenation is
painfully slow at about 2 MB/s. Switch to AES-SIV.
---
 internal/stupidgcm/stupidgcm_test.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'internal/stupidgcm')

diff --git a/internal/stupidgcm/stupidgcm_test.go b/internal/stupidgcm/stupidgcm_test.go
index 1dbfccb..3c11dfe 100644
--- a/internal/stupidgcm/stupidgcm_test.go
+++ b/internal/stupidgcm/stupidgcm_test.go
@@ -15,7 +15,8 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/rfjakob/gcmsiv"
+	// For benchmark comparison
+	"github.com/rfjakob/gocryptfs/internal/siv_aead"
 )
 
 // Get "n" random bytes from /dev/urandom or panic
@@ -162,16 +163,13 @@ func Benchmark4kEncGoGCM(b *testing.B) {
 	}
 }
 
-func Benchmark4kEncGCMSIV(b *testing.B) {
+func Benchmark4kEncAESSIV(b *testing.B) {
 	key := randBytes(32)
 	authData := randBytes(24)
 	iv := randBytes(16)
 	in := make([]byte, 4096)
 	b.SetBytes(int64(len(in)))
-	gGCM, err := gcmsiv.NewGCMSIV(key)
-	if err != nil {
-		b.Fatal(err)
-	}
+	gGCM := siv_aead.New(key)
 	for i := 0; i < b.N; i++ {
 		// Encrypt and append to nonce
 		gGCM.Seal(iv, iv, in, authData)
-- 
cgit v1.2.3