diff options
| author | Robert Sloan <varomodt@google.com> | 2018-03-26 11:39:51 -0700 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2018-03-26 11:41:04 -0700 |
| commit | ab8b888152733533e60c1ebbe8438594a3a2e3d7 (patch) | |
| tree | bb70888d6d3aa4c8ad98d75acfe5ae688ae2fef3 /src/fipstools | |
| parent | 9083ef933c7f44d6ee3cd1b7ca91135fdada8e31 (diff) | |
| download | boringssl-ab8b888152733533e60c1ebbe8438594a3a2e3d7.tar.gz | |
external/boringssl: Sync to d89d65ba12e28e543df4fd9dfbc687bb8be1dba7.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/45210dd4e21ace9d28cb76b3f83303fcdd2efcce..d89d65ba12e28e543df4fd9dfbc687bb8be1dba7
Test: BoringSSL CTS Presubmits.
Change-Id: I2dc13b549eac1f345553da07b7fb66824fc77204
Diffstat (limited to 'src/fipstools')
| -rw-r--r-- | src/fipstools/run_cavp.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/fipstools/run_cavp.go b/src/fipstools/run_cavp.go index 587ba070..438bb785 100644 --- a/src/fipstools/run_cavp.go +++ b/src/fipstools/run_cavp.go @@ -21,7 +21,6 @@ var ( 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 tlsKDFTests = testSuite{ }, } -var fipsTestSuites = []*testSuite{ +var testSuites = []*testSuite{ &aesGCMTests, &aesTests, &ctrDRBGTests, @@ -350,9 +349,6 @@ var fipsTestSuites = []*testSuite{ &shaTests, &shaMonteTests, &tdesTests, -} - -var niapTestSuites = []*testSuite{ &kasTests, &tlsKDFTests, } @@ -421,11 +417,6 @@ func main() { go worker(&wg, work) } - testSuites := fipsTestSuites - if *niap { - testSuites = niapTestSuites - } - for _, suite := range testSuites { for i := range suite.tests { work <- testInstance{suite, i} |