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/pbkdf1 | |
| 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/pbkdf1')
| -rw-r--r-- | src/lib/pbkdf/pbkdf1/pbkdf1.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/pbkdf/pbkdf1/pbkdf1.cpp b/src/lib/pbkdf/pbkdf1/pbkdf1.cpp index 28bac9572..49e1cf268 100644 --- a/src/lib/pbkdf/pbkdf1/pbkdf1.cpp +++ b/src/lib/pbkdf/pbkdf1/pbkdf1.cpp @@ -5,14 +5,11 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/internal/pbkdf_utils.h> #include <botan/pbkdf1.h> #include <botan/exceptn.h> namespace Botan { -BOTAN_REGISTER_PBKDF_1HASH(PKCS5_PBKDF1, "PBKDF1"); - size_t PKCS5_PBKDF1::pbkdf(byte output_buf[], size_t output_len, const std::string& passphrase, const byte salt[], size_t salt_len, |