diff options
| author | Jack Lloyd <[email protected]> | 2016-07-17 11:42:53 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-09-02 05:28:10 -0400 |
| commit | 1c0bc3cc6bcbd6318d8ae33d0442ffd24302a044 (patch) | |
| tree | da27a2597938f5b5edd1bd43f4d3d0e3c978e8be /src/lib/block/block_cipher.cpp | |
| parent | cd9f852b46f62087dcf7940303a0fe52a009e6c7 (diff) | |
Remove deprecated ciphers MARS, RC2, RC5, RC6, SAFER-SK and TEA
XTEA was also deprecated but has been spared, it does seem to be somewhat
common (eg, included in the Go x/crypto library)
Diffstat (limited to 'src/lib/block/block_cipher.cpp')
| -rw-r--r-- | src/lib/block/block_cipher.cpp | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp index c70ba229d..230d9e3a0 100644 --- a/src/lib/block/block_cipher.cpp +++ b/src/lib/block/block_cipher.cpp @@ -63,14 +63,6 @@ #include <botan/lion.h> #endif -#if defined(BOTAN_HAS_LUBY_RACKOFF) - #include <botan/lubyrack.h> -#endif - -#if defined(BOTAN_HAS_MARS) - #include <botan/mars.h> -#endif - #if defined(BOTAN_HAS_MISTY1) #include <botan/misty1.h> #endif @@ -83,22 +75,6 @@ #include <botan/noekeon_simd.h> #endif -#if defined(BOTAN_HAS_RC2) - #include <botan/rc2.h> -#endif - -#if defined(BOTAN_HAS_RC5) - #include <botan/rc5.h> -#endif - -#if defined(BOTAN_HAS_RC6) - #include <botan/rc6.h> -#endif - -#if defined(BOTAN_HAS_SAFER) - #include <botan/safer_sk.h> -#endif - #if defined(BOTAN_HAS_SEED) #include <botan/seed.h> #endif @@ -111,18 +87,6 @@ #include <botan/serp_simd.h> #endif -#if defined(BOTAN_HAS_SKIPJACK) - #include <botan/skipjack.h> -#endif - -#if defined(BOTAN_HAS_SQUARE) - #include <botan/square.h> -#endif - -#if defined(BOTAN_HAS_TEA) - #include <botan/tea.h> -#endif - #if defined(BOTAN_HAS_TWOFISH) #include <botan/twofish.h> #endif @@ -232,10 +196,6 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_sse2(), IDEA_SSE2, "IDEA", BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(KASUMI); #endif -#if defined(BOTAN_HAS_MARS) -BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(MARS); -#endif - #if defined(BOTAN_HAS_MISTY1) BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(MISTY1); #endif @@ -249,22 +209,6 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), Noekeon_SIMD, "Noeke "simd32", BOTAN_SIMD_ALGORITHM_PRIO); #endif -#if defined(BOTAN_HAS_RC2) -BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(RC2); -#endif - -#if defined(BOTAN_HAS_RC5) -BOTAN_REGISTER_BLOCK_CIPHER_1LEN(RC5, 12); -#endif - -#if defined(BOTAN_HAS_RC6) -BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(RC6); -#endif - -#if defined(BOTAN_HAS_SAFER) -BOTAN_REGISTER_BLOCK_CIPHER_NAMED_1LEN(SAFER_SK, "SAFER-SK", 10); -#endif - #if defined(BOTAN_HAS_SEED) BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(SEED); #endif @@ -278,10 +222,6 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), Serpent_SIMD, "Serpe "simd32", BOTAN_SIMD_ALGORITHM_PRIO); #endif -#if defined(BOTAN_HAS_TEA) -BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(TEA); -#endif - #if defined(BOTAN_HAS_TWOFISH) BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Twofish); #endif |