diff options
Diffstat (limited to 'src/lib/base/lookup.h')
| -rw-r--r-- | src/lib/base/lookup.h | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/lib/base/lookup.h b/src/lib/base/lookup.h index c50186e35..d5b17237e 100644 --- a/src/lib/base/lookup.h +++ b/src/lib/base/lookup.h @@ -8,8 +8,10 @@ #ifndef BOTAN_LOOKUP_H__ #define BOTAN_LOOKUP_H__ -#include <botan/symkey.h> +#include <botan/types.h> #include <string> +#include <vector> +#include <memory> namespace Botan { @@ -31,7 +33,11 @@ class PBKDF; * @param algo_spec the name of the desired block cipher * @return pointer to the block cipher object */ -BOTAN_DLL BlockCipher* get_block_cipher(const std::string& algo_spec, const std::string& provider = ""); +BOTAN_DLL BlockCipher* get_block_cipher(const std::string& algo_spec, + const std::string& provider = ""); + +BOTAN_DLL std::unique_ptr<BlockCipher> make_block_cipher(const std::string& algo_spec, + const std::string& provider = ""); BOTAN_DLL std::vector<std::string> get_block_cipher_providers(const std::string& algo_spec); @@ -41,7 +47,11 @@ BOTAN_DLL std::vector<std::string> get_block_cipher_providers(const std::string& * @param algo_spec the name of the desired stream cipher * @return pointer to the stream cipher object */ -BOTAN_DLL StreamCipher* get_stream_cipher(const std::string& algo_spec, const std::string& provider = ""); +BOTAN_DLL StreamCipher* get_stream_cipher(const std::string& algo_spec, + const std::string& provider = ""); + +BOTAN_DLL std::unique_ptr<StreamCipher> make_stream_cipher(const std::string& algo_spec, + const std::string& provider = ""); BOTAN_DLL std::vector<std::string> get_stream_cipher_providers(const std::string& algo_spec); @@ -51,9 +61,14 @@ BOTAN_DLL std::vector<std::string> get_stream_cipher_providers(const std::string * @param algo_spec the name of the desired hash function * @return pointer to the hash function object */ -BOTAN_DLL HashFunction* get_hash_function(const std::string& algo_spec, const std::string& provider = ""); +BOTAN_DLL HashFunction* get_hash_function(const std::string& algo_spec, + const std::string& provider = ""); -inline HashFunction* get_hash(const std::string& algo_spec, const std::string& provider = "") +BOTAN_DLL std::unique_ptr<HashFunction> make_hash_function(const std::string& algo_spec, + const std::string& provider = ""); + +inline HashFunction* get_hash(const std::string& algo_spec, + const std::string& provider = "") { return get_hash_function(algo_spec, provider); } @@ -66,7 +81,11 @@ BOTAN_DLL std::vector<std::string> get_hash_function_providers(const std::string * @param algo_spec the name of the desired MAC * @return pointer to the MAC object */ -BOTAN_DLL MessageAuthenticationCode* get_mac(const std::string& algo_spec, const std::string& provider = ""); +BOTAN_DLL MessageAuthenticationCode* get_mac(const std::string& algo_spec, + const std::string& provider = ""); + +BOTAN_DLL std::unique_ptr<MessageAuthenticationCode> make_message_auth(const std::string& algo_spec, + const std::string& provider = ""); BOTAN_DLL std::vector<std::string> get_mac_providers(const std::string& algo_spec); @@ -75,7 +94,8 @@ BOTAN_DLL std::vector<std::string> get_mac_providers(const std::string& algo_spe * @param algo_spec the name of the desired PBKDF algorithm * @return pointer to newly allocated object of that type */ -BOTAN_DLL PBKDF* get_pbkdf(const std::string& algo_spec, const std::string& provider = ""); +BOTAN_DLL PBKDF* get_pbkdf(const std::string& algo_spec, + const std::string& provider = ""); } |