aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-05-18 11:58:31 -0400
committerJack Lloyd <[email protected]>2017-05-18 11:58:31 -0400
commitadfaca119b15cec66dd74eb9c17c1242be846557 (patch)
treef41032b8c11d1c9b8fc45f6da51355e2dc775c83
parent4f4250d0a8029f9954898e1b1b1908ee1ce2de30 (diff)
Maintainer mode fixes
-rw-r--r--src/lib/ffi/ffi.cpp8
-rw-r--r--src/lib/pubkey/pk_algs.cpp5
2 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp
index 94e83122e..9442634c4 100644
--- a/src/lib/ffi/ffi.cpp
+++ b/src/lib/ffi/ffi.cpp
@@ -1449,15 +1449,15 @@ int botan_pubkey_load(botan_pubkey_t* key,
}
int botan_privkey_load_rsa(botan_privkey_t* key,
- botan_mp_t p, botan_mp_t q, botan_mp_t e)
+ botan_mp_t rsa_p, botan_mp_t rsa_q, botan_mp_t rsa_e)
{
#if defined(BOTAN_HAS_RSA)
*key = nullptr;
try
{
- *key = new botan_privkey_struct(new Botan::RSA_PrivateKey(safe_get(p),
- safe_get(q),
- safe_get(e)));
+ *key = new botan_privkey_struct(new Botan::RSA_PrivateKey(safe_get(rsa_p),
+ safe_get(rsa_q),
+ safe_get(rsa_e)));
return 0;
}
catch(std::exception& e)
diff --git a/src/lib/pubkey/pk_algs.cpp b/src/lib/pubkey/pk_algs.cpp
index 19d7361b4..52e2e3be9 100644
--- a/src/lib/pubkey/pk_algs.cpp
+++ b/src/lib/pubkey/pk_algs.cpp
@@ -324,6 +324,8 @@ create_private_key(const std::string& alg_name,
}
#endif
+ BOTAN_UNUSED(alg_name, rng, provider);
+
return std::unique_ptr<Private_Key>();
}
@@ -343,6 +345,9 @@ probe_provider_private_key(const std::string& alg_name,
providers.push_back(prov); // available
}
}
+
+ BOTAN_UNUSED(alg_name);
+
return providers;
}
}