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/pbkdf2 | |
| 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/pbkdf2')
| -rw-r--r-- | src/lib/pbkdf/pbkdf2/pbkdf2.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.cpp b/src/lib/pbkdf/pbkdf2/pbkdf2.cpp index a27b9b15c..a5b7f011e 100644 --- a/src/lib/pbkdf/pbkdf2/pbkdf2.cpp +++ b/src/lib/pbkdf/pbkdf2/pbkdf2.cpp @@ -5,16 +5,14 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/internal/pbkdf_utils.h> #include <botan/pbkdf2.h> +#include <botan/lookup.h> #include <botan/get_byte.h> #include <botan/internal/xor_buf.h> #include <botan/internal/rounding.h> namespace Botan { -BOTAN_REGISTER_NAMED_T(PBKDF, "PBKDF2", PKCS5_PBKDF2, PKCS5_PBKDF2::make); - PKCS5_PBKDF2* PKCS5_PBKDF2::make(const Spec& spec) { if(auto mac = get_mac(spec.arg(0))) |