aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-07-16 17:31:24 -0400
committerJack Lloyd <[email protected]>2017-07-16 17:31:24 -0400
commiteb924f4dfe7d527c2df6fe927fd84f6b5c0573bd (patch)
treea151db636bd3bac8a65be45824db9001d288ee81 /src
parent82264129430006b1eab83904fbd677a932c767a0 (diff)
parent4f2680a5c9a8b47c36e0f65bd5117a1837474279 (diff)
Merge GH #1110 Fix documentation of PKCS11 module
Diffstat (limited to 'src')
-rw-r--r--src/tests/test_pkcs11_high_level.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
index 0a170fda9..ca15082bb 100644
--- a/src/tests/test_pkcs11_high_level.cpp
+++ b/src/tests/test_pkcs11_high_level.cpp
@@ -798,10 +798,10 @@ Test::Result test_rsa_encrypt_decrypt()
auto encrypt_and_decrypt = [&keypair, &result](const std::vector<uint8_t>& plaintext, const std::string& padding)
{
- Botan::PK_Encryptor_EME encryptor(keypair.first, Test::rng(), padding, "pkcs11");
+ Botan::PK_Encryptor_EME encryptor(keypair.first, Test::rng(), padding);
auto encrypted = encryptor.encrypt(plaintext, Test::rng());
- Botan::PK_Decryptor_EME decryptor(keypair.second, Test::rng(), padding, "pkcs11");
+ Botan::PK_Decryptor_EME decryptor(keypair.second, Test::rng(), padding);
auto decrypted = decryptor.decrypt(encrypted);
// some token / middlewares do not remove the padding bytes
@@ -838,7 +838,7 @@ Test::Result test_rsa_sign_verify()
auto sign_and_verify = [&keypair, &plaintext, &result](std::string const& emsa, bool multipart)
{
- Botan::PK_Signer signer(keypair.second, Test::rng(), emsa, Botan::IEEE_1363, "pkcs11");
+ Botan::PK_Signer signer(keypair.second, Test::rng(), emsa, Botan::IEEE_1363);
std::vector<uint8_t> signature;
if(multipart)
{
@@ -850,7 +850,7 @@ Test::Result test_rsa_sign_verify()
signature = signer.sign_message(plaintext, Test::rng());
}
- Botan::PK_Verifier verifier(keypair.first, emsa, Botan::IEEE_1363, "pkcs11");
+ Botan::PK_Verifier verifier(keypair.first, emsa, Botan::IEEE_1363);
bool rsa_ok = false;
if(multipart)
{
@@ -1099,10 +1099,10 @@ Test::Result test_ecdsa_sign_verify()
auto sign_and_verify = [ &keypair, &plaintext, &result ](const std::string& emsa)
{
- Botan::PK_Signer signer(keypair.second, Test::rng(), emsa, Botan::IEEE_1363, "pkcs11");
+ Botan::PK_Signer signer(keypair.second, Test::rng(), emsa, Botan::IEEE_1363);
auto signature = signer.sign_message(plaintext, Test::rng());
- Botan::PK_Verifier token_verifier(keypair.first, emsa, Botan::IEEE_1363, "pkcs11");
+ Botan::PK_Verifier token_verifier(keypair.first, emsa, Botan::IEEE_1363);
bool ecdsa_ok = token_verifier.verify_message(plaintext, signature);
result.test_eq("ECDSA PKCS11 sign and verify: " + emsa, ecdsa_ok, true);
@@ -1332,8 +1332,8 @@ Test::Result test_ecdh_derive()
PKCS11_ECDH_KeyPair keypair2 = generate_ecdh_keypair(test_session, "Botan test ECDH key2");
// SoftHSMv2 only supports CKD_NULL KDF at the moment
- Botan::PK_Key_Agreement ka(keypair.second, Test::rng(), "Raw", "pkcs11");
- Botan::PK_Key_Agreement kb(keypair2.second, Test::rng(), "Raw", "pkcs11");
+ Botan::PK_Key_Agreement ka(keypair.second, Test::rng(), "Raw");
+ Botan::PK_Key_Agreement kb(keypair2.second, Test::rng(), "Raw");
Botan::SymmetricKey alice_key = ka.derive_key(32, unlock(EC2OSP(keypair2.first.public_point(),
PointGFp::UNCOMPRESSED)));