aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-07-05 11:59:16 -0400
committerJack Lloyd <[email protected]>2016-07-05 11:59:16 -0400
commit2b3f4270371d376e1500b68f4955548b659d2011 (patch)
treec7283d0bf9ca9b60369ed9384ebbd59b3afa95bc
parentf56f33ae2de48320e0967756d9815542555b8a9d (diff)
parentfc8666b2cc7cda87b72e23b295617f70d8211818 (diff)
Merge GH #526 Some PKCS #11 fixes when used with BSI policy
-rw-r--r--src/lib/prov/pkcs11/info.txt1
-rw-r--r--src/tests/test_pkcs11_high_level.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/prov/pkcs11/info.txt b/src/lib/prov/pkcs11/info.txt
index 4d54446da..5826df049 100644
--- a/src/lib/prov/pkcs11/info.txt
+++ b/src/lib/prov/pkcs11/info.txt
@@ -6,7 +6,6 @@ load_on vendor
dyn_load
rng
pk_pad
-rfc6979
</requires>
<header:internal>
diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
index 3be2b7268..677041533 100644
--- a/src/tests/test_pkcs11_high_level.cpp
+++ b/src/tests/test_pkcs11_high_level.cpp
@@ -1042,10 +1042,13 @@ Test::Result test_ecdsa_sign_verify()
result.test_eq("ECDSA PKCS11 sign and verify: " + emsa, ecdsa_ok, true);
+// test against software implementation if available
+#if defined (BOTAN_HAS_EMSA_RAW)
Botan::PK_Verifier soft_verifier(keypair.first, emsa, Botan::IEEE_1363);
bool soft_ecdsa_ok = soft_verifier.verify_message(plaintext, signature);
result.test_eq("ECDSA PKCS11 verify (in software): " + emsa, soft_ecdsa_ok, true);
+#endif
};
sign_and_verify("Raw"); // SoftHSMv2 until now only supports "Raw"