diff options
| author | Jack Lloyd <[email protected]> | 2015-09-21 16:09:36 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-09-21 16:09:36 -0400 |
| commit | 7ebe7511496b8a6950acced513a81516565354ed (patch) | |
| tree | add1163c2afbd1ae3d163aaac8375a3b56bd6c9c /src/lib/kdf/kdf2/kdf2.cpp | |
| parent | 8f732dccce692eaca509fc9732702df62cfa5c87 (diff) | |
| parent | 04319af23bf8ed467b17f9b74c814343e051ab6b (diff) | |
Merge pull request #279 from randombit/fix-static-lib-registration
Move the algorithm factory functions to T::create and move object registration to the source file for its base class. These resolve the issues which prevented successful use of a static library that was built with individual object files. Removes the restriction in configure.py which prevented building non-amalgamation static libs.
Diffstat (limited to 'src/lib/kdf/kdf2/kdf2.cpp')
| -rw-r--r-- | src/lib/kdf/kdf2/kdf2.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/kdf/kdf2/kdf2.cpp b/src/lib/kdf/kdf2/kdf2.cpp index 9deb1a22f..df2b7a91c 100644 --- a/src/lib/kdf/kdf2/kdf2.cpp +++ b/src/lib/kdf/kdf2/kdf2.cpp @@ -5,13 +5,10 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/internal/kdf_utils.h> #include <botan/kdf2.h> namespace Botan { -BOTAN_REGISTER_KDF_1HASH(KDF2, "KDF2"); - size_t KDF2::kdf(byte key[], size_t key_len, const byte secret[], size_t secret_len, const byte salt[], size_t salt_len) const |