aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-01-03 17:45:18 +0000
committerlloyd <[email protected]>2012-01-03 17:45:18 +0000
commit53188aed931d1e8ffd460b684466f1f68fde25b5 (patch)
treeb749320d7392cb4cccc8ba0d4ebb185cf0cb8bfa
parentc3d70530c76bc8ae2daf07cec1b6aed7b32b3799 (diff)
Fix unused param warnings. Comments in header
-rw-r--r--src/credentials/credentials_manager.cpp37
-rw-r--r--src/credentials/credentials_manager.h20
2 files changed, 32 insertions, 25 deletions
diff --git a/src/credentials/credentials_manager.cpp b/src/credentials/credentials_manager.cpp
index 46d9e300c..e7886d307 100644
--- a/src/credentials/credentials_manager.cpp
+++ b/src/credentials/credentials_manager.cpp
@@ -9,41 +9,42 @@
namespace Botan {
-std::string Credentials_Manager::srp_identifier(const std::string& type,
- const std::string& context)
+std::string Credentials_Manager::srp_identifier(const std::string&,
+ const std::string&)
{
return "";
}
-std::string Credentials_Manager::srp_password(const std::string& identifier,
- const std::string& type,
- const std::string& context)
+std::string Credentials_Manager::srp_password(const std::string&,
+ const std::string&,
+ const std::string&)
{
return "";
}
-bool Credentials_Manager::srp_verifier(const std::string& identifier,
- const std::string& type,
- const std::string& context,
- BigInt& group_prime,
- BigInt& group_generator,
- BigInt& verifier,
- MemoryRegion<byte>& salt)
+bool Credentials_Manager::srp_verifier(const std::string&,
+ const std::string&,
+ const std::string&,
+ BigInt&,
+ BigInt&,
+ BigInt&,
+ MemoryRegion<byte>&,
+ bool)
{
return false;
}
std::vector<X509_Certificate> Credentials_Manager::cert_chain(
- const std::string& cert_key_type,
- const std::string& type,
- const std::string& context)
+ const std::string&,
+ const std::string&,
+ const std::string&)
{
return std::vector<X509_Certificate>();
}
-Private_Key* Credentials_Manager::private_key_for(const X509_Certificate& cert,
- const std::string& type,
- const std::string& context)
+Private_Key* Credentials_Manager::private_key_for(const X509_Certificate&,
+ const std::string&,
+ const std::string&)
{
return 0;
}
diff --git a/src/credentials/credentials_manager.h b/src/credentials/credentials_manager.h
index a54b2ec31..43bccec69 100644
--- a/src/credentials/credentials_manager.h
+++ b/src/credentials/credentials_manager.h
@@ -20,9 +20,10 @@ class BigInt;
* Interface for a credentials manager.
*
* A type is a fairly static value that represents the general nature
-* of the transaction occuring. Currently defined are "tls-client" and
-* "tls-server". Context represents a hostname, email address,
+* of the transaction occuring. Currently used values are "tls-client"
+* and "tls-server". Context represents a hostname, email address,
* username, or other identifier.
+
*/
class BOTAN_DLL Credentials_Manager
{
@@ -31,21 +32,25 @@ class BOTAN_DLL Credentials_Manager
/**
* @return identifier for client-side SRP auth, if available
- for this type/context
+ for this type/context. Should return empty string
+ if password auth not desired/available.
*/
virtual std::string srp_identifier(const std::string& type,
const std::string& context);
/**
+ * @param identifier specifies what identifier we want the
+ * password for. This will be a value previously returned
+ * by srp_identifier.
* @return password for client-side SRP auth, if available
- for this identifier/type/context
+ for this identifier/type/context.
*/
virtual std::string srp_password(const std::string& identifier,
const std::string& type,
const std::string& context);
/**
- * @todo add option for faking verifier if identifier is unknown
+ * Retrieve SRP verifier parameters
*/
virtual bool srp_verifier(const std::string& identifier,
const std::string& type,
@@ -53,11 +58,12 @@ class BOTAN_DLL Credentials_Manager
BigInt& group_prime,
BigInt& group_generator,
BigInt& verifier,
- MemoryRegion<byte>& salt);
+ MemoryRegion<byte>& salt,
+ bool generate_fake_on_unknown);
/**
* @param cert_key_type is a string representing the key type
- * ("RSA", "DSA", "ECDSA") or empty if no preference.
+ * ("rsa", "dsa", "ecdsa", etc) or empty if no preference.
*/
virtual std::vector<X509_Certificate> cert_chain(
const std::string& cert_key_type,