aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-10-25 09:29:21 -0400
committerJack Lloyd <[email protected]>2016-10-25 09:29:21 -0400
commit9943fae196a5cb1773a32e127db4e69e34a302c0 (patch)
treea6ac4d89bbedef6dbd64b590a6df85ee0df04bbc
parentb3f802d78f380850eb0ab967ab6bde663bdc0943 (diff)
parentb7b121efc8009e04876af4773920d87fb07fb21e (diff)
Merge GH #683 Avoid SHA-1 use in ElGamal+ECKCDSA self tests
-rw-r--r--src/lib/pubkey/eckcdsa/eckcdsa.cpp2
-rw-r--r--src/lib/pubkey/elgamal/elgamal.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/pubkey/eckcdsa/eckcdsa.cpp b/src/lib/pubkey/eckcdsa/eckcdsa.cpp
index 5375d047a..9427e90ff 100644
--- a/src/lib/pubkey/eckcdsa/eckcdsa.cpp
+++ b/src/lib/pubkey/eckcdsa/eckcdsa.cpp
@@ -27,7 +27,7 @@ bool ECKCDSA_PrivateKey::check_key(RandomNumberGenerator& rng,
return true;
}
- return KeyPair::signature_consistency_check(rng, *this, "EMSA1(SHA-1)");
+ return KeyPair::signature_consistency_check(rng, *this, "EMSA1(SHA-256)");
}
namespace {
diff --git a/src/lib/pubkey/elgamal/elgamal.cpp b/src/lib/pubkey/elgamal/elgamal.cpp
index 046c2c3f6..982030beb 100644
--- a/src/lib/pubkey/elgamal/elgamal.cpp
+++ b/src/lib/pubkey/elgamal/elgamal.cpp
@@ -65,7 +65,7 @@ bool ElGamal_PrivateKey::check_key(RandomNumberGenerator& rng,
if(!strong)
return true;
- return KeyPair::encryption_consistency_check(rng, *this, "EME1(SHA-1)");
+ return KeyPair::encryption_consistency_check(rng, *this, "EME1(SHA-256)");
}
namespace {