Skip ACVP tests on small and internal interface.

Author: armfazh

sign/slhdsa/acvp_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"strings"
 	"testing"
 
 	"github.com/cloudflare/circl/internal/test"
@@ -123,6 +124,10 @@ func testKeygen(t *testing.T) {
 
 	for gi, group := range inputs.TestGroups {
 		t.Run(fmt.Sprintf("TgID_%v", group.TgID), func(t *testing.T) {
+			if strings.HasSuffix(group.ParameterSet, "s") {
+				SkipLongTest(t)
+			}
+
 			for ti := range group.Tests {
 				test.CheckOk(
 					group.Tests[ti].TcID == outputs.TestGroups[gi].Tests[ti].TcID,
@@ -152,6 +157,10 @@ func testSign(t *testing.T) {
 		test.CheckOk(group.TgID == outputs.TestGroups[gi].TgID, "mismatch of TgID", t)
 
 		t.Run(fmt.Sprintf("TgID_%v", group.TgID), func(t *testing.T) {
+			if strings.HasSuffix(group.ParameterSet, "s") {
+				SkipLongTest(t)
+			}
+
 			for ti := range group.Tests {
 				test.CheckOk(
 					group.Tests[ti].TcID == outputs.TestGroups[gi].Tests[ti].TcID,
@@ -179,6 +188,10 @@ func testVerify(t *testing.T) {
 		test.CheckOk(group.TgID == outputs.TestGroups[gi].TgID, "mismatch of TgID", t)
 
 		t.Run(fmt.Sprintf("TgID_%v", group.TgID), func(t *testing.T) {
+			if strings.HasSuffix(group.ParameterSet, "s") {
+				SkipLongTest(t)
+			}
+
 			for ti := range group.Tests {
 				test.CheckOk(
 					group.Tests[ti].TcID == outputs.TestGroups[gi].Tests[ti].TcID,
@@ -196,9 +209,11 @@ func testVerify(t *testing.T) {
 	}
 }
 
-func acvpKeygen(t *testing.T, paramSet string, in *keyGenInput, wantSk, wantPk []byte) {
+func acvpKeygen(
+	t *testing.T, paramSet string, in *keyGenInput, wantSk, wantPk []byte,
+) {
 	id, err := IDByName(paramSet)
-	test.CheckNoErr(t, err, "invalid param name")
+	test.CheckNoErr(t, err, "invalid ParameterSet")
 
 	var buffer bytes.Buffer
 	_, _ = buffer.Write(in.SkSeed)
@@ -232,6 +247,8 @@ func acvpSign(t *testing.T, p *sigGenParams, in *sigGenInput, wantSig []byte) {
 
 	var gotSig []byte
 	if p.SigInterface == "internal" {
+		SkipLongTest(t)
+
 		addRand := sk.publicKey.seed
 		if !p.IsDeterministic {
 			addRand = in.AddRand
@@ -293,6 +310,7 @@ func acvpVerify(t *testing.T, p *sigParams, in *verifyInput, want bool) {
 
 	var got bool
 	if p.SigInterface == "internal" {
+		SkipLongTest(t)
 		got = slhVerifyInternal(&pk, in.Msg, in.Sig)
 	} else if p.SigInterface == "external" {
 		var msg *Message

sign/slhdsa/all_test.go

@@ -2,10 +2,22 @@ package slhdsa
 
 import (
 	"crypto/rand"
+	"flag"
 	"testing"
 )
 
+// RunLongTest indicates whether long tests should be run.
+var RunLongTest = flag.Bool("long", false, "runs longer tests and benchmark")
+
+func SkipLongTest(t testing.TB) {
+	t.Helper()
+	if !*RunLongTest {
+		t.Skip("Skipped one long test, add -long flag to run longer tests")
+	}
+}
+
 func InnerTest(t *testing.T, sigIDs []ID) {
+	SkipLongTest(t)
 	for _, id := range sigIDs {
 		param := id.params()
 		t.Run(id.String(), func(t *testing.T) {
@@ -18,7 +30,8 @@ func InnerTest(t *testing.T, sigIDs []ID) {
 	}
 }
 
-func InnerBenchmark(b *testing.B, sigIDs []ID) {
+func BenchInner(b *testing.B, sigIDs []ID) {
+	SkipLongTest(b)
 	for _, id := range sigIDs {
 		param := id.params()
 		b.Run(param.name, func(b *testing.B) {

sign/slhdsa/slhdsa_test.go

@@ -3,7 +3,6 @@ package slhdsa_test
 import (
 	"crypto"
 	"crypto/rand"
-	"flag"
 	"io"
 	"testing"
 
@@ -31,36 +30,14 @@ var smallSign = [...]slhdsa.ID{
 	slhdsa.SHAKESmall256,
 }
 
-// Indicates whether long tests should be run
-var runLongTest = flag.Bool("long", false, "sign/slhdsa: runs longer tests and benchmark")
-
-const skipTestMsg = "Skipped one long test, add -long flag to run longer tests"
-
+func TestInnerFast(t *testing.T)  { slhdsa.InnerTest(t, fastSign[:]) }
+func TestInnerSmall(t *testing.T) { slhdsa.InnerTest(t, smallSign[:]) }
 func TestSlhdsaFast(t *testing.T) { testSlhdsa(t, fastSign[:]) }
 func TestSlhdsaSmall(t *testing.T) {
-	if !*runLongTest {
-		t.Skip(skipTestMsg)
-	}
-
+	slhdsa.SkipLongTest(t)
 	testSlhdsa(t, smallSign[:])
 }
 
-func TestInnerFast(t *testing.T) {
-	if !*runLongTest {
-		t.Skip(skipTestMsg)
-	}
-
-	slhdsa.InnerTest(t, fastSign[:])
-}
-
-func TestInnerSmall(t *testing.T) {
-	if !*runLongTest {
-		t.Skip(skipTestMsg)
-	}
-
-	slhdsa.InnerTest(t, smallSign[:])
-}
-
 func testSlhdsa(t *testing.T, sigIDs []slhdsa.ID) {
 	for _, id := range sigIDs {
 		t.Run(id.String(), func(t *testing.T) {
@@ -108,32 +85,14 @@ func testSign(t *testing.T, id slhdsa.ID) {
 	test.CheckOk(valid, "Verify failed", t)
 }
 
+func BenchmarkInnerFast(b *testing.B)  { slhdsa.BenchInner(b, fastSign[:]) }
+func BenchmarkInnerSmall(b *testing.B) { slhdsa.BenchInner(b, smallSign[:]) }
 func BenchmarkSlhdsaFast(b *testing.B) { benchmarkSlhdsa(b, fastSign[:]) }
-
 func BenchmarkSlhdsaSmall(b *testing.B) {
-	if !*runLongTest {
-		b.Skip(skipTestMsg)
-	}
-
+	slhdsa.SkipLongTest(b)
 	benchmarkSlhdsa(b, smallSign[:])
 }
 
-func BenchmarkInnerFast(b *testing.B) {
-	if !*runLongTest {
-		b.Skip(skipTestMsg)
-	}
-
-	slhdsa.InnerBenchmark(b, fastSign[:])
-}
-
-func BenchmarkInnerSmall(b *testing.B) {
-	if !*runLongTest {
-		b.Skip(skipTestMsg)
-	}
-
-	slhdsa.InnerBenchmark(b, smallSign[:])
-}
-
 func BenchmarkPreHash(b *testing.B) {
 	b.Run("WithHash", func(b *testing.B) {
 		ph, err := slhdsa.NewPreHashWithHash(crypto.SHA512)