aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-01-18 17:12:30 +0000
committerlloyd <[email protected]>2014-01-18 17:12:30 +0000
commit4917f26a2b154e841cd27c1bcecdd41d2bdeb6ce (patch)
tree0456ae4efcd748ececc83a35a6353373778e1291 /src/tests
parent560b7671685317035e724b4c75030dc5cf86f461 (diff)
Remove PBES1 entirely
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/data/ecc/ecc_private_with_rfc5915_ext.pem11
-rw-r--r--src/tests/unit_ecdsa.cpp4
2 files changed, 6 insertions, 9 deletions
diff --git a/src/tests/data/ecc/ecc_private_with_rfc5915_ext.pem b/src/tests/data/ecc/ecc_private_with_rfc5915_ext.pem
index a8699fce7..75ef9d0f3 100644
--- a/src/tests/data/ecc/ecc_private_with_rfc5915_ext.pem
+++ b/src/tests/data/ecc/ecc_private_with_rfc5915_ext.pem
@@ -1,6 +1,5 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIGwMBsGCSqGSIb3DQEFAzAOBAhLqOHiUDFjTwICCAAEgZD1k1BiBROTLBRoFQG5
-gNEipqwBXlKKv+cen7laWHdABXBPGSXBTZGiwsfVPitW+mT3kLHjPZOwJ+55Chka
-QkBardzHxD2LwX8BXxDqiv61R/NsGh376+KXxTbZApobC3p40T24wMvX0O04HXaZ
-6qPBsRo1byuhn0jM6Qr0O/HnYHH4/fiIN6Iq2HF6/QaUnak=
------END ENCRYPTED PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfKBDxcP88OEfI4v6
+k8JFIQquWzap0+HHXE7N6DzuvamhRANCAAR7M3jrGYZXDSqbcSAmd0wO+V8Wx49D
+jqUVeAbI24rCMk3+mUTTFwwQn0p9nTdf56a1VNl4P9XUM5cbJnqwh5Yl
+-----END PRIVATE KEY-----
diff --git a/src/tests/unit_ecdsa.cpp b/src/tests/unit_ecdsa.cpp
index 436d9dca6..2953073d2 100644
--- a/src/tests/unit_ecdsa.cpp
+++ b/src/tests/unit_ecdsa.cpp
@@ -440,14 +440,12 @@ size_t test_read_pkcs8(RandomNumberGenerator& rng)
size_t test_ecc_key_with_rfc5915_extensions(RandomNumberGenerator& rng)
{
- const std::string pw = "G3bz1L1gmB5ULietOZdoLPu63D7uwTLMEk";
-
size_t fails = 0;
try
{
std::unique_ptr<PKCS8_PrivateKey> pkcs8(
- PKCS8::load_key(ECC_TEST_DATA_DIR "/ecc_private_with_rfc5915_ext.pem", rng, pw));
+ PKCS8::load_key(ECC_TEST_DATA_DIR "/ecc_private_with_rfc5915_ext.pem", rng));
if(!dynamic_cast<ECDSA_PrivateKey*>(pkcs8.get()))
{