fipsoracle: Add cavp_tdes_test (KAT mode only).
Change-Id: I560051d554760feab8b432de429ccbef7bc19c0a
Reviewed-on: https://boringssl-review.googlesource.com/15684
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/fipsoracle/run_cavp.go b/fipsoracle/run_cavp.go
index 9ff81e7..6ef4dab 100644
--- a/fipsoracle/run_cavp.go
+++ b/fipsoracle/run_cavp.go
@@ -167,6 +167,31 @@
[]test{{"CTR_DRBG", nil, false}},
}
+var tdesTests = testSuite{
+ "TDES",
+ "cavp_tdes_test",
+ []test{
+ // {"TCBCMMT2", []string{"mmt"}, false},
+ // {"TCBCMMT3", []string{"mmt"}, false},
+ // {"TCBCMonte2", []string{"mct"}, false},
+ // {"TCBCMonte3", []string{"mct"}, false},
+ {"TCBCinvperm", []string{"kat", "des-ede3-cbc"}, false},
+ {"TCBCpermop", []string{"kat", "des-ede3-cbc"}, false},
+ {"TCBCsubtab", []string{"kat", "des-ede3-cbc"}, false},
+ {"TCBCvarkey", []string{"kat", "des-ede3-cbc"}, false},
+ {"TCBCvartext", []string{"kat", "des-ede3-cbc"}, false},
+ // {"TECBMMT2", []string{"mmt"}, false},
+ // {"TECBMMT3", []string{"mmt"}, false},
+ // {"TECBMonte2", []string{"mct"}, false},
+ // {"TECBMonte3", []string{"mct"}, false},
+ {"TECBinvperm", []string{"kat", "des-ede3"}, false},
+ {"TECBpermop", []string{"kat", "des-ede3"}, false},
+ {"TECBsubtab", []string{"kat", "des-ede3"}, false},
+ {"TECBvarkey", []string{"kat", "des-ede3"}, false},
+ {"TECBvartext", []string{"kat", "des-ede3"}, false},
+ },
+}
+
var allTestSuites = []*testSuite{
&aesGCMTests,
&aesTests,
@@ -178,6 +203,7 @@
&hmacTests,
&shaTests,
&shaMonteTests,
+ &tdesTests,
}
func main() {
@@ -224,7 +250,7 @@
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
- return fmt.Errorf("cannot run command for %q %q: %s", suite.getDirectory(), test.inFile, err)
+ return fmt.Errorf("cannot run command for %q %q (%s): %s", suite.getDirectory(), test.inFile, strings.Join(append([]string{binary}, args...), " "), err)
}
return nil
