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/sm4 | |
| 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/sm4')
| -rw-r--r-- | src/lib/block/sm4/sm4.cpp | 6 | ||||
| -rw-r--r-- | src/lib/block/sm4/sm4.h | 4 | ||||
| -rw-r--r-- | src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
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 { |