diff options
| author | Jack Lloyd <[email protected]> | 2020-11-05 03:47:06 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-11-06 11:31:22 -0500 |
| commit | a55e4b22b6cbeeb30ca787d4ea4e3933ccccbdf1 (patch) | |
| tree | 3d066440f30d30a46179caded3f1273d06a4dd95 /src/lib/block/aria | |
| parent | 7c27982e27b953682554de3c4b22843e0e7461e7 (diff) | |
Remove deprecated headers, make more headers internal
Now modules default to internal headers instead of defaulting to public; making
a new public API should be a visible and intentional choice.
Brings the public header count from over 300 to around 150.
Also removes the deprecated tls_blocking interface
Diffstat (limited to 'src/lib/block/aria')
| -rw-r--r-- | src/lib/block/aria/aria.cpp | 6 | ||||
| -rw-r--r-- | src/lib/block/aria/aria.h | 8 | ||||
| -rw-r--r-- | src/lib/block/aria/info.txt | 4 |
3 files changed, 6 insertions, 12 deletions
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> |