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