From 961b8ca438361b01f2f232d8735c236ef94b4d03 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Thu, 2 Sep 2021 10:04:38 +0200
Subject: stupidgcm: deduplicate tests 2/2

Deduplicate the cipher setup that was identical
for all tests for each cipher.
---
 internal/stupidgcm/stupidgcm_test.go | 65 ++----------------------------------
 1 file changed, 2 insertions(+), 63 deletions(-)

(limited to 'internal/stupidgcm/stupidgcm_test.go')

diff --git a/internal/stupidgcm/stupidgcm_test.go b/internal/stupidgcm/stupidgcm_test.go
index 968034e..5323afa 100644
--- a/internal/stupidgcm/stupidgcm_test.go
+++ b/internal/stupidgcm/stupidgcm_test.go
@@ -8,24 +8,10 @@ package stupidgcm
 import (
 	"crypto/aes"
 	"crypto/cipher"
-	"crypto/rand"
-	"log"
 	"testing"
 )
 
-// Get "n" random bytes from /dev/urandom or panic
-func randBytes(n int) []byte {
-	b := make([]byte, n)
-	_, err := rand.Read(b)
-	if err != nil {
-		log.Panic("Failed to read random bytes: " + err.Error())
-	}
-	return b
-}
-
-// TestEncryptDecrypt encrypts and decrypts using both stupidgcm and Go's built-in
-// GCM implementation and verifies that the results are identical.
-func TestEncryptDecrypt(t *testing.T) {
+func TestStupidGCM(t *testing.T) {
 	key := randBytes(32)
 	sGCM := New(key, false)
 
@@ -38,52 +24,5 @@ func TestEncryptDecrypt(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	testEncryptDecrypt(t, sGCM, gGCM)
-}
-
-// Seal re-uses the "dst" buffer it is large enough.
-// Check that this works correctly by testing different "dst" capacities from
-// 5000 to 16 and "in" lengths from 1 to 5000.
-func TestInplaceSeal(t *testing.T) {
-	key := randBytes(32)
-	sGCM := New(key, false)
-
-	gAES, err := aes.NewCipher(key)
-	if err != nil {
-		t.Fatal(err)
-	}
-	gGCM, err := cipher.NewGCMWithNonceSize(gAES, 16)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testInplaceSeal(t, sGCM, gGCM)
-}
-
-// Open re-uses the "dst" buffer it is large enough.
-// Check that this works correctly by testing different "dst" capacities from
-// 5000 to 16 and "in" lengths from 1 to 5000.
-func TestInplaceOpen(t *testing.T) {
-	key := randBytes(32)
-	sGCM := New(key, false)
-
-	gAES, err := aes.NewCipher(key)
-	if err != nil {
-		t.Fatal(err)
-	}
-	gGCM, err := cipher.NewGCMWithNonceSize(gAES, 16)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testInplaceOpen(t, sGCM, gGCM)
-}
-
-// TestCorruption verifies that changes in the ciphertext result in a decryption
-// error
-func TestCorruption(t *testing.T) {
-	key := randBytes(32)
-	sGCM := New(key, false)
-
-	testCorruption(t, sGCM)
+	testCiphers(t, sGCM, gGCM)
 }
-- 
cgit v1.2.3