Merge NIAP and FIPS test suites.
When we do future FIPS or NIAP runs, we'll do everything. So no need for
a -niap option any longer.
Change-Id: I2c8b71951acca0734c1a15cfb6f61ec5ecee5884
Reviewed-on: https://boringssl-review.googlesource.com/26124
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/fipstools/run_cavp.go b/fipstools/run_cavp.go
index 587ba07..438bb78 100644
--- a/fipstools/run_cavp.go
+++ b/fipstools/run_cavp.go
@@ -21,7 +21,6 @@
oraclePath = flag.String("oracle-bin", "", "Path to the oracle binary")
suiteDir = flag.String("suite-dir", "", "Base directory containing the CAVP test suite")
noFAX = flag.Bool("no-fax", false, "Skip comparing against FAX files")
- niap = flag.Bool("niap", false, "Perform NIAP tests rather than FIPS tests")
android = flag.Bool("android", false, "Run tests via ADB")
)
@@ -334,7 +333,7 @@
},
}
-var fipsTestSuites = []*testSuite{
+var testSuites = []*testSuite{
&aesGCMTests,
&aesTests,
&ctrDRBGTests,
@@ -350,9 +349,6 @@
&shaTests,
&shaMonteTests,
&tdesTests,
-}
-
-var niapTestSuites = []*testSuite{
&kasTests,
&tlsKDFTests,
}
@@ -421,11 +417,6 @@
go worker(&wg, work)
}
- testSuites := fipsTestSuites
- if *niap {
- testSuites = niapTestSuites
- }
-
for _, suite := range testSuites {
for i := range suite.tests {
work <- testInstance{suite, i}
