diff options
| author | Jack Lloyd <[email protected]> | 2015-09-10 01:45:47 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-09-10 01:45:47 -0400 |
| commit | d21de17f070863c7e0b7e8d254eb35689001a53a (patch) | |
| tree | 2627df5d3c911a56dea6a56aeca693a73d66f85e /src/lib/block/aes | |
| parent | a96a7b79662f5045f0810dfa5d5cb4ebbd04ae42 (diff) | |
Fix static lib registration for block, hash, mac, stream, kdf
The support problems from having static libraries not work in the
obvious way will be endless trouble. Instead have each set of
registrations tag along in a source file for the basic type, at the
cost of some extra ifdefs. On shared libs this is harmless -
everything is going into the shared object anyway. With static libs,
this means pulling in a single block cipher pulls in the text of all
the them. But that's still strictly better than the amalgamation
(which is really pulling in everything), and it works (unlike status quo).
Diffstat (limited to 'src/lib/block/aes')
| -rw-r--r-- | src/lib/block/aes/aes.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/block/aes/aes.cpp b/src/lib/block/aes/aes.cpp index b9e00fe6c..61cc9d777 100644 --- a/src/lib/block/aes/aes.cpp +++ b/src/lib/block/aes/aes.cpp @@ -7,15 +7,11 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/internal/block_utils.h> #include <botan/aes.h> +#include <botan/loadstor.h> namespace Botan { -BOTAN_REGISTER_BLOCK_CIPHER_NAMED_NOARGS(AES_128, "AES-128"); -BOTAN_REGISTER_BLOCK_CIPHER_NAMED_NOARGS(AES_192, "AES-192"); -BOTAN_REGISTER_BLOCK_CIPHER_NAMED_NOARGS(AES_256, "AES-256"); - namespace { const byte SE[256] = { |