diff options
Diffstat (limited to 'src/lib/block')
55 files changed, 103 insertions, 172 deletions
diff --git a/src/lib/block/aes/aes.cpp b/src/lib/block/aes/aes.cpp index 88d6e9027..72acfa0c9 100644 --- a/src/lib/block/aes/aes.cpp +++ b/src/lib/block/aes/aes.cpp @@ -4,10 +4,10 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/aes.h> -#include <botan/loadstor.h> +#include <botan/internal/aes.h> +#include <botan/internal/loadstor.h> #include <botan/cpuid.h> -#include <botan/rotate.h> +#include <botan/internal/rotate.h> #include <botan/internal/bit_ops.h> #include <botan/internal/ct_utils.h> diff --git a/src/lib/block/aes/aes.h b/src/lib/block/aes/aes.h index 76248200d..f454fd857 100644 --- a/src/lib/block/aes/aes.h +++ b/src/lib/block/aes/aes.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(aes.h) - namespace Botan { /** * AES-128 */ -class BOTAN_PUBLIC_API(2,0) AES_128 final : public Block_Cipher_Fixed_Params<16, 16> +class AES_128 final : public Block_Cipher_Fixed_Params<16, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -54,7 +52,7 @@ class BOTAN_PUBLIC_API(2,0) AES_128 final : public Block_Cipher_Fixed_Params<16, /** * AES-192 */ -class BOTAN_PUBLIC_API(2,0) AES_192 final : public Block_Cipher_Fixed_Params<16, 24> +class AES_192 final : public Block_Cipher_Fixed_Params<16, 24> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -91,7 +89,7 @@ class BOTAN_PUBLIC_API(2,0) AES_192 final : public Block_Cipher_Fixed_Params<16, /** * AES-256 */ -class BOTAN_PUBLIC_API(2,0) AES_256 final : public Block_Cipher_Fixed_Params<16, 32> +class AES_256 final : public Block_Cipher_Fixed_Params<16, 32> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/aes/aes_armv8/aes_armv8.cpp b/src/lib/block/aes/aes_armv8/aes_armv8.cpp index 9766bf88c..7aeea2bdd 100644 --- a/src/lib/block/aes/aes_armv8/aes_armv8.cpp +++ b/src/lib/block/aes/aes_armv8/aes_armv8.cpp @@ -8,8 +8,8 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/aes.h> -#include <botan/loadstor.h> +#include <botan/internal/aes.h> +#include <botan/internal/loadstor.h> #include <arm_neon.h> namespace Botan { diff --git a/src/lib/block/aes/aes_ni/aes_ni.cpp b/src/lib/block/aes/aes_ni/aes_ni.cpp index 76c695f32..0baf41aef 100644 --- a/src/lib/block/aes/aes_ni/aes_ni.cpp +++ b/src/lib/block/aes/aes_ni/aes_ni.cpp @@ -5,8 +5,8 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/aes.h> -#include <botan/loadstor.h> +#include <botan/internal/aes.h> +#include <botan/internal/loadstor.h> #include <wmmintrin.h> namespace Botan { diff --git a/src/lib/block/aes/aes_power8/aes_power8.cpp b/src/lib/block/aes/aes_power8/aes_power8.cpp index 8ab784a50..710b627f8 100644 --- a/src/lib/block/aes/aes_power8/aes_power8.cpp +++ b/src/lib/block/aes/aes_power8/aes_power8.cpp @@ -9,7 +9,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/aes.h> +#include <botan/internal/aes.h> #include <botan/cpuid.h> #include <altivec.h> diff --git a/src/lib/block/aes/aes_vperm/aes_vperm.cpp b/src/lib/block/aes/aes_vperm/aes_vperm.cpp index 3c71421b6..9ced89d72 100644 --- a/src/lib/block/aes/aes_vperm/aes_vperm.cpp +++ b/src/lib/block/aes/aes_vperm/aes_vperm.cpp @@ -10,7 +10,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/aes.h> +#include <botan/internal/aes.h> #include <botan/internal/ct_utils.h> #include <botan/internal/simd_32.h> diff --git a/src/lib/block/aria/aria.cpp b/src/lib/block/aria/aria.cpp index 23a8657a1..565f25462 100644 --- a/src/lib/block/aria/aria.cpp +++ b/src/lib/block/aria/aria.cpp @@ -16,9 +16,9 @@ * Internet & Security Agency homepage</A> */ -#include <botan/aria.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/aria.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> #include <botan/cpuid.h> namespace Botan { diff --git a/src/lib/block/aria/aria.h b/src/lib/block/aria/aria.h index 507226b7d..fc0522275 100644 --- a/src/lib/block/aria/aria.h +++ b/src/lib/block/aria/aria.h @@ -18,14 +18,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(aria.h) - namespace Botan { /** * ARIA-128 */ -class BOTAN_PUBLIC_API(2,3) ARIA_128 final : public Block_Cipher_Fixed_Params<16, 16> +class ARIA_128 final : public Block_Cipher_Fixed_Params<16, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -44,7 +42,7 @@ class BOTAN_PUBLIC_API(2,3) ARIA_128 final : public Block_Cipher_Fixed_Params<16 /** * ARIA-192 */ -class BOTAN_PUBLIC_API(2,3) ARIA_192 final : public Block_Cipher_Fixed_Params<16, 24> +class ARIA_192 final : public Block_Cipher_Fixed_Params<16, 24> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -63,7 +61,7 @@ class BOTAN_PUBLIC_API(2,3) ARIA_192 final : public Block_Cipher_Fixed_Params<16 /** * ARIA-256 */ -class BOTAN_PUBLIC_API(2,3) ARIA_256 final : public Block_Cipher_Fixed_Params<16, 32> +class ARIA_256 final : public Block_Cipher_Fixed_Params<16, 32> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/aria/info.txt b/src/lib/block/aria/info.txt index 78c16726c..c94c4a464 100644 --- a/src/lib/block/aria/info.txt +++ b/src/lib/block/aria/info.txt @@ -1,7 +1,3 @@ <defines> ARIA -> 20170415 </defines> - -<header:public> -aria.h -</header:public> diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp index 1883d477c..2450ead96 100644 --- a/src/lib/block/block_cipher.cpp +++ b/src/lib/block/block_cipher.cpp @@ -10,71 +10,71 @@ #include <botan/exceptn.h> #if defined(BOTAN_HAS_AES) - #include <botan/aes.h> + #include <botan/internal/aes.h> #endif #if defined(BOTAN_HAS_ARIA) - #include <botan/aria.h> + #include <botan/internal/aria.h> #endif #if defined(BOTAN_HAS_BLOWFISH) - #include <botan/blowfish.h> + #include <botan/internal/blowfish.h> #endif #if defined(BOTAN_HAS_CAMELLIA) - #include <botan/camellia.h> + #include <botan/internal/camellia.h> #endif #if defined(BOTAN_HAS_CAST_128) - #include <botan/cast128.h> + #include <botan/internal/cast128.h> #endif #if defined(BOTAN_HAS_CASCADE) - #include <botan/cascade.h> + #include <botan/internal/cascade.h> #endif #if defined(BOTAN_HAS_DES) - #include <botan/des.h> + #include <botan/internal/des.h> #endif #if defined(BOTAN_HAS_GOST_28147_89) - #include <botan/gost_28147.h> + #include <botan/internal/gost_28147.h> #endif #if defined(BOTAN_HAS_IDEA) - #include <botan/idea.h> + #include <botan/internal/idea.h> #endif #if defined(BOTAN_HAS_LION) - #include <botan/lion.h> + #include <botan/internal/lion.h> #endif #if defined(BOTAN_HAS_NOEKEON) - #include <botan/noekeon.h> + #include <botan/internal/noekeon.h> #endif #if defined(BOTAN_HAS_SEED) - #include <botan/seed.h> + #include <botan/internal/seed.h> #endif #if defined(BOTAN_HAS_SERPENT) - #include <botan/serpent.h> + #include <botan/internal/serpent.h> #endif #if defined(BOTAN_HAS_SHACAL2) - #include <botan/shacal2.h> + #include <botan/internal/shacal2.h> #endif #if defined(BOTAN_HAS_SM4) - #include <botan/sm4.h> + #include <botan/internal/sm4.h> #endif #if defined(BOTAN_HAS_TWOFISH) - #include <botan/twofish.h> + #include <botan/internal/twofish.h> #endif #if defined(BOTAN_HAS_THREEFISH_512) - #include <botan/threefish_512.h> + #include <botan/internal/threefish_512.h> #endif #if defined(BOTAN_HAS_OPENSSL) diff --git a/src/lib/block/blowfish/blowfish.cpp b/src/lib/block/blowfish/blowfish.cpp index ecb9f82e3..34e49c424 100644 --- a/src/lib/block/blowfish/blowfish.cpp +++ b/src/lib/block/blowfish/blowfish.cpp @@ -5,8 +5,8 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/blowfish.h> -#include <botan/loadstor.h> +#include <botan/internal/blowfish.h> +#include <botan/internal/loadstor.h> namespace Botan { diff --git a/src/lib/block/blowfish/blowfish.h b/src/lib/block/blowfish/blowfish.h index 3ba39cbdb..8ead03e51 100644 --- a/src/lib/block/blowfish/blowfish.h +++ b/src/lib/block/blowfish/blowfish.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(blowfish.h) - namespace Botan { /** * Blowfish */ -class BOTAN_PUBLIC_API(2,0) Blowfish final : public Block_Cipher_Fixed_Params<8, 1, 56> +class BOTAN_TEST_API Blowfish final : public Block_Cipher_Fixed_Params<8, 1, 56> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -30,13 +28,6 @@ class BOTAN_PUBLIC_API(2,0) Blowfish final : public Block_Cipher_Fixed_Params<8, const uint8_t salt[], size_t salt_length, const size_t workfactor, bool salt_first = false); - BOTAN_DEPRECATED("Use Blowfish::salted_set_key taking salt length") - void eks_key_schedule(const uint8_t key[], size_t key_length, - const uint8_t salt[16], size_t workfactor) - { - salted_set_key(key, key_length, salt, 16, workfactor); - } - void clear() override; std::string name() const override { return "Blowfish"; } BlockCipher* clone() const override { return new Blowfish; } diff --git a/src/lib/block/camellia/camellia.cpp b/src/lib/block/camellia/camellia.cpp index 31aafd838..c9d82944f 100644 --- a/src/lib/block/camellia/camellia.cpp +++ b/src/lib/block/camellia/camellia.cpp @@ -5,9 +5,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/camellia.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/camellia.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> namespace Botan { diff --git a/src/lib/block/camellia/camellia.h b/src/lib/block/camellia/camellia.h index 4995eb0c9..421b1ed7c 100644 --- a/src/lib/block/camellia/camellia.h +++ b/src/lib/block/camellia/camellia.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(camellia.h) - namespace Botan { /** * Camellia-128 */ -class BOTAN_PUBLIC_API(2,0) Camellia_128 final : public Block_Cipher_Fixed_Params<16, 16> +class Camellia_128 final : public Block_Cipher_Fixed_Params<16, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -35,7 +33,7 @@ class BOTAN_PUBLIC_API(2,0) Camellia_128 final : public Block_Cipher_Fixed_Param /** * Camellia-192 */ -class BOTAN_PUBLIC_API(2,0) Camellia_192 final : public Block_Cipher_Fixed_Params<16, 24> +class Camellia_192 final : public Block_Cipher_Fixed_Params<16, 24> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -53,7 +51,7 @@ class BOTAN_PUBLIC_API(2,0) Camellia_192 final : public Block_Cipher_Fixed_Param /** * Camellia-256 */ -class BOTAN_PUBLIC_API(2,0) Camellia_256 final : public Block_Cipher_Fixed_Params<16, 32> +class Camellia_256 final : public Block_Cipher_Fixed_Params<16, 32> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/camellia/info.txt b/src/lib/block/camellia/info.txt index c70a7f345..c3a07531c 100644 --- a/src/lib/block/camellia/info.txt +++ b/src/lib/block/camellia/info.txt @@ -1,7 +1,3 @@ <defines> CAMELLIA -> 20150922 </defines> - -<header:public> -camellia.h -</header:public> diff --git a/src/lib/block/cascade/cascade.cpp b/src/lib/block/cascade/cascade.cpp index 6607fd5b2..8dbc850fe 100644 --- a/src/lib/block/cascade/cascade.cpp +++ b/src/lib/block/cascade/cascade.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/cascade.h> +#include <botan/internal/cascade.h> namespace Botan { diff --git a/src/lib/block/cascade/cascade.h b/src/lib/block/cascade/cascade.h index 26f513381..b5f9b5653 100644 --- a/src/lib/block/cascade/cascade.h +++ b/src/lib/block/cascade/cascade.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(cascade.h) - namespace Botan { /** * Block Cipher Cascade */ -class BOTAN_PUBLIC_API(2,0) Cascade_Cipher final : public BlockCipher +class Cascade_Cipher final : public BlockCipher { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/cascade/info.txt b/src/lib/block/cascade/info.txt index 15f5b2262..f0ef89fb9 100644 --- a/src/lib/block/cascade/info.txt +++ b/src/lib/block/cascade/info.txt @@ -1,7 +1,3 @@ <defines> CASCADE -> 20131128 </defines> - -<header:public> -cascade.h -</header:public> diff --git a/src/lib/block/cast128/cast128.cpp b/src/lib/block/cast128/cast128.cpp index c5b66992b..1c9dcaf9e 100644 --- a/src/lib/block/cast128/cast128.cpp +++ b/src/lib/block/cast128/cast128.cpp @@ -5,10 +5,10 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/cast128.h> +#include <botan/internal/cast128.h> #include <botan/internal/cast_sboxes.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> namespace Botan { diff --git a/src/lib/block/cast128/cast128.h b/src/lib/block/cast128/cast128.h index a5f2a6401..301b1dc5e 100644 --- a/src/lib/block/cast128/cast128.h +++ b/src/lib/block/cast128/cast128.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(cast128.h) - namespace Botan { /** * CAST-128 */ -class BOTAN_PUBLIC_API(2,0) CAST_128 final : public Block_Cipher_Fixed_Params<8, 11, 16> +class CAST_128 final : public Block_Cipher_Fixed_Params<8, 11, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/cast128/info.txt b/src/lib/block/cast128/info.txt index 6e6cf30ab..953f847cf 100644 --- a/src/lib/block/cast128/info.txt +++ b/src/lib/block/cast128/info.txt @@ -2,11 +2,3 @@ CAST -> 20131128 CAST_128 -> 20171203 </defines> - -<header:internal> -cast_sboxes.h -</header:internal> - -<header:public> -cast128.h -</header:public> diff --git a/src/lib/block/des/des.cpp b/src/lib/block/des/des.cpp index 0aa9e6a79..77e9379ba 100644 --- a/src/lib/block/des/des.cpp +++ b/src/lib/block/des/des.cpp @@ -8,9 +8,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/des.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/des.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> namespace Botan { diff --git a/src/lib/block/des/des.h b/src/lib/block/des/des.h index d8bbcfdd1..209a0cdac 100644 --- a/src/lib/block/des/des.h +++ b/src/lib/block/des/des.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(des.h) - namespace Botan { /** * DES */ -class BOTAN_PUBLIC_API(2,0) DES final : public Block_Cipher_Fixed_Params<8, 8> +class DES final : public Block_Cipher_Fixed_Params<8, 8> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; @@ -35,7 +33,7 @@ class BOTAN_PUBLIC_API(2,0) DES final : public Block_Cipher_Fixed_Params<8, 8> /** * Triple DES */ -class BOTAN_PUBLIC_API(2,0) TripleDES final : public Block_Cipher_Fixed_Params<8, 16, 24, 8> +class TripleDES final : public Block_Cipher_Fixed_Params<8, 16, 24, 8> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/des/des_tab.cpp b/src/lib/block/des/des_tab.cpp index dea04dbf3..8400ee374 100644 --- a/src/lib/block/des/des_tab.cpp +++ b/src/lib/block/des/des_tab.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/des.h> +#include <botan/internal/des.h> namespace Botan { diff --git a/src/lib/block/gost_28147/gost_28147.cpp b/src/lib/block/gost_28147/gost_28147.cpp index 2b8aa031e..12ff7cdf5 100644 --- a/src/lib/block/gost_28147/gost_28147.cpp +++ b/src/lib/block/gost_28147/gost_28147.cpp @@ -5,10 +5,10 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/gost_28147.h> +#include <botan/internal/gost_28147.h> #include <botan/exceptn.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> namespace Botan { diff --git a/src/lib/block/gost_28147/gost_28147.h b/src/lib/block/gost_28147/gost_28147.h index f71bb28bd..e9d11e091 100644 --- a/src/lib/block/gost_28147/gost_28147.h +++ b/src/lib/block/gost_28147/gost_28147.h @@ -10,8 +10,6 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(gost_28147.h) - namespace Botan { /** @@ -20,7 +18,7 @@ namespace Botan { * considered a local configuration issue. Several different sets are * used. */ -class BOTAN_PUBLIC_API(2,0) GOST_28147_89_Params final +class GOST_28147_89_Params final { public: /** @@ -57,7 +55,7 @@ class BOTAN_PUBLIC_API(2,0) GOST_28147_89_Params final /** * GOST 28147-89 */ -class BOTAN_PUBLIC_API(2,0) GOST_28147_89 final : public Block_Cipher_Fixed_Params<8, 32> +class GOST_28147_89 final : public Block_Cipher_Fixed_Params<8, 32> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/idea/idea.cpp b/src/lib/block/idea/idea.cpp index f8f5ceb34..ac11c9a64 100644 --- a/src/lib/block/idea/idea.cpp +++ b/src/lib/block/idea/idea.cpp @@ -5,8 +5,8 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/idea.h> -#include <botan/loadstor.h> +#include <botan/internal/idea.h> +#include <botan/internal/loadstor.h> #include <botan/cpuid.h> #include <botan/internal/ct_utils.h> diff --git a/src/lib/block/idea/idea.h b/src/lib/block/idea/idea.h index e5e51606b..c15d34dd8 100644 --- a/src/lib/block/idea/idea.h +++ b/src/lib/block/idea/idea.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(idea.h) - namespace Botan { /** * IDEA */ -class BOTAN_PUBLIC_API(2,0) IDEA final : public Block_Cipher_Fixed_Params<8, 16> +class IDEA final : public Block_Cipher_Fixed_Params<8, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/idea/idea_sse2/idea_sse2.cpp b/src/lib/block/idea/idea_sse2/idea_sse2.cpp index 93648cfc7..608a04106 100644 --- a/src/lib/block/idea/idea_sse2/idea_sse2.cpp +++ b/src/lib/block/idea/idea_sse2/idea_sse2.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/idea.h> +#include <botan/internal/idea.h> #include <botan/internal/ct_utils.h> #include <emmintrin.h> diff --git a/src/lib/block/lion/lion.cpp b/src/lib/block/lion/lion.cpp index c9589a46a..43270f3a7 100644 --- a/src/lib/block/lion/lion.cpp +++ b/src/lib/block/lion/lion.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/lion.h> +#include <botan/internal/lion.h> #include <botan/exceptn.h> namespace Botan { diff --git a/src/lib/block/lion/lion.h b/src/lib/block/lion/lion.h index fa8e9f414..6ffaa9260 100644 --- a/src/lib/block/lion/lion.h +++ b/src/lib/block/lion/lion.h @@ -12,8 +12,6 @@ #include <botan/stream_cipher.h> #include <botan/hash.h> -BOTAN_FUTURE_INTERNAL_HEADER(lion.h) - namespace Botan { /** @@ -24,7 +22,7 @@ namespace Botan { * https://www.cl.cam.ac.uk/~rja14/Papers/bear-lion.pdf */ -class BOTAN_PUBLIC_API(2,0) Lion final : public BlockCipher +class Lion final : public BlockCipher { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/noekeon/noekeon.cpp b/src/lib/block/noekeon/noekeon.cpp index 0a820c701..7586176c4 100644 --- a/src/lib/block/noekeon/noekeon.cpp +++ b/src/lib/block/noekeon/noekeon.cpp @@ -5,9 +5,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/noekeon.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/noekeon.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> #include <botan/cpuid.h> namespace Botan { diff --git a/src/lib/block/noekeon/noekeon.h b/src/lib/block/noekeon/noekeon.h index 9e7e4a5ff..b2a39638b 100644 --- a/src/lib/block/noekeon/noekeon.h +++ b/src/lib/block/noekeon/noekeon.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(noekeon.h) - namespace Botan { /** * Noekeon */ -class BOTAN_PUBLIC_API(2,0) Noekeon final : public Block_Cipher_Fixed_Params<16, 16> +class Noekeon final : public Block_Cipher_Fixed_Params<16, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/noekeon/noekeon_simd/noekeon_simd.cpp b/src/lib/block/noekeon/noekeon_simd/noekeon_simd.cpp index 83467a054..d5410acdd 100644 --- a/src/lib/block/noekeon/noekeon_simd/noekeon_simd.cpp +++ b/src/lib/block/noekeon/noekeon_simd/noekeon_simd.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/noekeon.h> +#include <botan/internal/noekeon.h> #include <botan/internal/simd_32.h> namespace Botan { diff --git a/src/lib/block/seed/seed.cpp b/src/lib/block/seed/seed.cpp index 81194e44a..2f4768700 100644 --- a/src/lib/block/seed/seed.cpp +++ b/src/lib/block/seed/seed.cpp @@ -5,8 +5,8 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/seed.h> -#include <botan/loadstor.h> +#include <botan/internal/seed.h> +#include <botan/internal/loadstor.h> namespace Botan { diff --git a/src/lib/block/seed/seed.h b/src/lib/block/seed/seed.h index a61624313..1105d5075 100644 --- a/src/lib/block/seed/seed.h +++ b/src/lib/block/seed/seed.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(seed.h) - namespace Botan { /** * SEED, a Korean block cipher */ -class BOTAN_PUBLIC_API(2,0) SEED final : public Block_Cipher_Fixed_Params<16, 16> +class SEED final : public Block_Cipher_Fixed_Params<16, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/serpent/info.txt b/src/lib/block/serpent/info.txt index 89b860ce4..1316ef0e2 100644 --- a/src/lib/block/serpent/info.txt +++ b/src/lib/block/serpent/info.txt @@ -1,11 +1,3 @@ <defines> SERPENT -> 20131128 </defines> - -<header:public> -serpent.h -</header:public> - -<header:internal> -serpent_sbox.h -</header:internal> diff --git a/src/lib/block/serpent/serpent.cpp b/src/lib/block/serpent/serpent.cpp index ff37a177c..412b173a5 100644 --- a/src/lib/block/serpent/serpent.cpp +++ b/src/lib/block/serpent/serpent.cpp @@ -5,9 +5,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/serpent.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/serpent.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> #include <botan/internal/serpent_sbox.h> #if defined(BOTAN_HAS_SERPENT_SIMD) || defined(BOTAN_HAS_SERPENT_AVX2) diff --git a/src/lib/block/serpent/serpent.h b/src/lib/block/serpent/serpent.h index 64eb8a8b0..81c841190 100644 --- a/src/lib/block/serpent/serpent.h +++ b/src/lib/block/serpent/serpent.h @@ -10,15 +10,13 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(serpent.h) - namespace Botan { /** * Serpent is the most conservative of the AES finalists * https://www.cl.cam.ac.uk/~rja14/serpent.html */ -class BOTAN_PUBLIC_API(2,0) Serpent final : public Block_Cipher_Fixed_Params<16, 16, 32, 8> +class Serpent final : public Block_Cipher_Fixed_Params<16, 16, 32, 8> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/serpent/serpent_avx2/serpent_avx2.cpp b/src/lib/block/serpent/serpent_avx2/serpent_avx2.cpp index 0db332035..028ee77e5 100644 --- a/src/lib/block/serpent/serpent_avx2/serpent_avx2.cpp +++ b/src/lib/block/serpent/serpent_avx2/serpent_avx2.cpp @@ -4,7 +4,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/serpent.h> +#include <botan/internal/serpent.h> #include <botan/internal/serpent_sbox.h> #include <botan/internal/simd_avx2.h> diff --git a/src/lib/block/serpent/serpent_simd/serpent_simd.cpp b/src/lib/block/serpent/serpent_simd/serpent_simd.cpp index 8ac783ba5..5d1bc28f2 100644 --- a/src/lib/block/serpent/serpent_simd/serpent_simd.cpp +++ b/src/lib/block/serpent/serpent_simd/serpent_simd.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/serpent.h> +#include <botan/internal/serpent.h> #include <botan/internal/serpent_sbox.h> #include <botan/internal/simd_32.h> diff --git a/src/lib/block/shacal2/shacal2.cpp b/src/lib/block/shacal2/shacal2.cpp index b0c57f235..3617708e6 100644 --- a/src/lib/block/shacal2/shacal2.cpp +++ b/src/lib/block/shacal2/shacal2.cpp @@ -5,9 +5,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/shacal2.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/shacal2.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> #include <botan/cpuid.h> namespace Botan { diff --git a/src/lib/block/shacal2/shacal2.h b/src/lib/block/shacal2/shacal2.h index b752a0339..7396f4135 100644 --- a/src/lib/block/shacal2/shacal2.h +++ b/src/lib/block/shacal2/shacal2.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(shacal2.h) - namespace Botan { /** * SHACAL2 */ -class BOTAN_PUBLIC_API(2,3) SHACAL2 final : public Block_Cipher_Fixed_Params<32, 16, 64, 4> +class SHACAL2 final : public Block_Cipher_Fixed_Params<32, 16, 64, 4> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/shacal2/shacal2_avx2/shacal2_avx2.cpp b/src/lib/block/shacal2/shacal2_avx2/shacal2_avx2.cpp index a465a3828..cb83fece8 100644 --- a/src/lib/block/shacal2/shacal2_avx2/shacal2_avx2.cpp +++ b/src/lib/block/shacal2/shacal2_avx2/shacal2_avx2.cpp @@ -4,7 +4,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/shacal2.h> +#include <botan/internal/shacal2.h> #include <botan/internal/simd_avx2.h> namespace Botan { diff --git a/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp b/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp index 6d15faf1a..c7b6182f2 100644 --- a/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp +++ b/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/shacal2.h> +#include <botan/internal/shacal2.h> #include <botan/internal/simd_32.h> namespace Botan { diff --git a/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp b/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp index 1611d6c9b..377f2c925 100644 --- a/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp +++ b/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/shacal2.h> +#include <botan/internal/shacal2.h> #include <immintrin.h> namespace Botan { diff --git a/src/lib/block/sm4/sm4.cpp b/src/lib/block/sm4/sm4.cpp index 8198330e6..515543ed0 100644 --- a/src/lib/block/sm4/sm4.cpp +++ b/src/lib/block/sm4/sm4.cpp @@ -6,9 +6,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/sm4.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/sm4.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> #include <botan/cpuid.h> namespace Botan { diff --git a/src/lib/block/sm4/sm4.h b/src/lib/block/sm4/sm4.h index 637ffd4be..ed6c6742f 100644 --- a/src/lib/block/sm4/sm4.h +++ b/src/lib/block/sm4/sm4.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(sm4.h) - namespace Botan { /** * SM4 */ -class BOTAN_PUBLIC_API(2,2) SM4 final : public Block_Cipher_Fixed_Params<16, 16> +class SM4 final : public Block_Cipher_Fixed_Params<16, 16> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp b/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp index 9e7a71a10..be9f832c4 100644 --- a/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp +++ b/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp @@ -4,7 +4,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/sm4.h> +#include <botan/internal/sm4.h> #include <arm_neon.h> namespace Botan { diff --git a/src/lib/block/threefish_512/threefish_512.cpp b/src/lib/block/threefish_512/threefish_512.cpp index e34a9e0dc..9c202caae 100644 --- a/src/lib/block/threefish_512/threefish_512.cpp +++ b/src/lib/block/threefish_512/threefish_512.cpp @@ -5,9 +5,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/threefish_512.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/threefish_512.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> #include <botan/cpuid.h> namespace Botan { diff --git a/src/lib/block/threefish_512/threefish_512.h b/src/lib/block/threefish_512/threefish_512.h index f3adf71a9..10876fd84 100644 --- a/src/lib/block/threefish_512/threefish_512.h +++ b/src/lib/block/threefish_512/threefish_512.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(threefish_512.h) - namespace Botan { /** * Threefish-512 */ -class BOTAN_PUBLIC_API(2,0) Threefish_512 final : +class Threefish_512 final : public Block_Cipher_Fixed_Params<64, 64, 0, 1, Tweakable_Block_Cipher> { public: diff --git a/src/lib/block/threefish_512/threefish_512_avx2/threefish_512_avx2.cpp b/src/lib/block/threefish_512/threefish_512_avx2/threefish_512_avx2.cpp index 0ceea2d7f..f9d0699f5 100644 --- a/src/lib/block/threefish_512/threefish_512_avx2/threefish_512_avx2.cpp +++ b/src/lib/block/threefish_512/threefish_512_avx2/threefish_512_avx2.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/threefish_512.h> +#include <botan/internal/threefish_512.h> #include <immintrin.h> namespace Botan { diff --git a/src/lib/block/twofish/twofish.cpp b/src/lib/block/twofish/twofish.cpp index 3a508dc9d..7115aa689 100644 --- a/src/lib/block/twofish/twofish.cpp +++ b/src/lib/block/twofish/twofish.cpp @@ -8,9 +8,9 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/twofish.h> -#include <botan/loadstor.h> -#include <botan/rotate.h> +#include <botan/internal/twofish.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/rotate.h> namespace Botan { diff --git a/src/lib/block/twofish/twofish.h b/src/lib/block/twofish/twofish.h index 027e2c701..5d95c198c 100644 --- a/src/lib/block/twofish/twofish.h +++ b/src/lib/block/twofish/twofish.h @@ -10,14 +10,12 @@ #include <botan/block_cipher.h> -BOTAN_FUTURE_INTERNAL_HEADER(twofish.h) - namespace Botan { /** * Twofish, an AES finalist */ -class BOTAN_PUBLIC_API(2,0) Twofish final : public Block_Cipher_Fixed_Params<16, 16, 32, 8> +class Twofish final : public Block_Cipher_Fixed_Params<16, 16, 32, 8> { public: void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override; diff --git a/src/lib/block/twofish/twofish_tab.cpp b/src/lib/block/twofish/twofish_tab.cpp index d6ac8f41b..669449c80 100644 --- a/src/lib/block/twofish/twofish_tab.cpp +++ b/src/lib/block/twofish/twofish_tab.cpp @@ -5,7 +5,7 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#include <botan/twofish.h> +#include <botan/internal/twofish.h> namespace Botan { |