commit c5dc2781b197157de5dd94cadb7e54dcbff4c59c
author Adam Langley <alangley@gmail.com> Thu Apr 22 10:00:22 2021 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Apr 22 18:07:52 2021 +0000
tree 654bc4ac64b46e5bdad3c5962b27012fdfaa2927
parent 2e54edf323373a6447b0dcfd4b3b2b7c5bc86847

avcp: SHA-1 for ECDSA _verification_ is still supported by NIST.

Change-Id: I26a643737e99ddf75af24143829df4551040f7db
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/47144
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>

util/fipstools/acvp/acvptool/test/expected/ECDSA.bz2

diff --git a/util/fipstools/acvp/acvptool/test/expected/ECDSA.bz2 b/util/fipstools/acvp/acvptool/test/expected/ECDSA.bz2
index 317789b..efed106 100644
--- a/util/fipstools/acvp/acvptool/test/expected/ECDSA.bz2
+++ b/util/fipstools/acvp/acvptool/test/expected/ECDSA.bz2
Binary files differ

util/fipstools/acvp/acvptool/test/vectors/ECDSA.bz2

diff --git a/util/fipstools/acvp/acvptool/test/vectors/ECDSA.bz2 b/util/fipstools/acvp/acvptool/test/vectors/ECDSA.bz2
index 1b5c228..49fc049 100644
--- a/util/fipstools/acvp/acvptool/test/vectors/ECDSA.bz2
+++ b/util/fipstools/acvp/acvptool/test/vectors/ECDSA.bz2
Binary files differ

util/fipstools/acvp/modulewrapper/modulewrapper.cc

diff --git a/util/fipstools/acvp/modulewrapper/modulewrapper.cc b/util/fipstools/acvp/modulewrapper/modulewrapper.cc
index 44aa202..25da8a1 100644
--- a/util/fipstools/acvp/modulewrapper/modulewrapper.cc
+++ b/util/fipstools/acvp/modulewrapper/modulewrapper.cc
@@ -502,6 +502,7 @@
             "P-521"
           ],
           "hashAlg": [
+            "SHA-1",
             "SHA2-224",
             "SHA2-256",
             "SHA2-384",
@@ -1481,7 +1482,9 @@
 }
 
 static const EVP_MD *HashFromName(Span<const uint8_t> name) {
-  if (StringEq(name, "SHA2-224")) {
+  if (StringEq(name, "SHA-1")) {
+    return EVP_sha1();
+  } else if (StringEq(name, "SHA2-224")) {
     return EVP_sha224();
   } else if (StringEq(name, "SHA2-256")) {
     return EVP_sha256();