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/block/aes/aes.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/block/aes/aes.cpp')
| -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] = { |