acvptool: unbreak tests. Recent changes left the ACVP tests not passing. (I guess we don't run them on the CQ.) Change-Id: I8a23391b4ce20e86b30a5ae0e8c0a313c0afb36d Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/72767 Auto-Submit: Adam Langley <agl@google.com> Commit-Queue: Bob Beck <bbe@google.com> Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/util/fipstools/acvp/acvptool/test/expected/EDDSA.bz2 b/util/fipstools/acvp/acvptool/test/expected/EDDSA.bz2 index 81b3a69..bf5be30 100644 --- a/util/fipstools/acvp/acvptool/test/expected/EDDSA.bz2 +++ b/util/fipstools/acvp/acvptool/test/expected/EDDSA.bz2 Binary files differ
diff --git a/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 b/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 index ff295b4..ee2aaa2 100644 --- a/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 +++ b/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 Binary files differ
diff --git a/util/fipstools/acvp/acvptool/test/expected/SHAKE-128.bz2 b/util/fipstools/acvp/acvptool/test/expected/SHAKE-128.bz2 index 7b70df5..2eb06d2 100644 --- a/util/fipstools/acvp/acvptool/test/expected/SHAKE-128.bz2 +++ b/util/fipstools/acvp/acvptool/test/expected/SHAKE-128.bz2 Binary files differ
diff --git a/util/fipstools/acvp/acvptool/test/expected/SHAKE-256.bz2 b/util/fipstools/acvp/acvptool/test/expected/SHAKE-256.bz2 index bc82517..1d27d71 100644 --- a/util/fipstools/acvp/acvptool/test/expected/SHAKE-256.bz2 +++ b/util/fipstools/acvp/acvptool/test/expected/SHAKE-256.bz2 Binary files differ
diff --git a/util/fipstools/acvp/acvptool/testmodulewrapper/testmodulewrapper.go b/util/fipstools/acvp/acvptool/testmodulewrapper/testmodulewrapper.go index 9125282..d67a953 100644 --- a/util/fipstools/acvp/acvptool/testmodulewrapper/testmodulewrapper.go +++ b/util/fipstools/acvp/acvptool/testmodulewrapper/testmodulewrapper.go
@@ -228,13 +228,13 @@ "mode": "keyVer", "revision": "1.0", "curve": ["ED-25519"] - }, { + }, { "algorithm": "EDDSA", "mode": "sigVer", "revision": "1.0", "pure": true, "preHash": true, - "curve": ["ED-25519"]} + "curve": ["ED-25519"] }, { "algorithm": "SHAKE-128", "inBit": false,