diff options
| author | Jack Lloyd <[email protected]> | 2015-09-11 22:44:45 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-09-11 22:44:45 -0400 |
| commit | 72719f52640d2ac3ff00fce46a72082e5938d212 (patch) | |
| tree | 51018f639724326c0e967eb7372a762ce0b89e53 /src/lib/pbkdf/pbkdf.cpp | |
| parent | 8211fdc11fa3bbe692b50d42126f74d259a4a96a (diff) | |
Fix pbkdf, pk padding and ECDH registration for static linking.
With this change the tests pass when linked against a static library
built in the normal (non-amalgamation) fashion.
Remove the restriction in configure.py, and have circleci build the
clang static build as a non-amalg.
Diffstat (limited to 'src/lib/pbkdf/pbkdf.cpp')
| -rw-r--r-- | src/lib/pbkdf/pbkdf.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/lib/pbkdf/pbkdf.cpp b/src/lib/pbkdf/pbkdf.cpp index 7f0a68a01..f11fbc44d 100644 --- a/src/lib/pbkdf/pbkdf.cpp +++ b/src/lib/pbkdf/pbkdf.cpp @@ -6,10 +6,30 @@ */ #include <botan/pbkdf.h> +#include <botan/internal/algo_registry.h> #include <stdexcept> +#if defined(BOTAN_HAS_PBKDF1) +#include <botan/pbkdf1.h> +#endif + +#if defined(BOTAN_HAS_PBKDF2) +#include <botan/pbkdf2.h> +#endif + namespace Botan { +#define BOTAN_REGISTER_PBKDF_1HASH(type, name) \ + BOTAN_REGISTER_NAMED_T(PBKDF, name, type, (make_new_T_1X<type, HashFunction>)) + +#if defined(BOTAN_HAS_PBKDF1) +BOTAN_REGISTER_PBKDF_1HASH(PKCS5_PBKDF1, "PBKDF1"); +#endif + +#if defined(BOTAN_HAS_PBKDF2) +BOTAN_REGISTER_NAMED_T(PBKDF, "PBKDF2", PKCS5_PBKDF2, PKCS5_PBKDF2::make); +#endif + void PBKDF::pbkdf_timed(byte out[], size_t out_len, const std::string& passphrase, const byte salt[], size_t salt_len, |