Merge optimized implementations into base class

Various algorithms had an optimized implementation (for SSE2, AVX2, etc)
which was offered alongside the 'base' implementation. This is
admittedly very useful for testing, but it breaks user expectations in
bad ways. See GH #477 for background.

Now encrypting with `AES_128` (say) just runs whatever implementation
is best on the current processor/build.

1 files changed, 0 insertions, 68 deletions

diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp
index 230d9e3a0..2388057c6 100644
--- a/src/lib/block/block_cipher.cpp
+++ b/src/lib/block/block_cipher.cpp
@@ -13,14 +13,6 @@
   #include <botan/aes.h>
 #endif
 
-#if defined(BOTAN_HAS_AES_SSSE3)
-  #include <botan/aes_ssse3.h>
-#endif
-
-#if defined(BOTAN_HAS_AES_NI)
-  #include <botan/aes_ni.h>
-#endif
-
 #if defined(BOTAN_HAS_BLOWFISH)
   #include <botan/blowfish.h>
 #endif
@@ -51,10 +43,6 @@
   #include <botan/idea.h>
 #endif
 
-#if defined(BOTAN_HAS_IDEA_SSE2)
-  #include <botan/idea_sse2.h>
-#endif
-
 #if defined(BOTAN_HAS_KASUMI)
   #include <botan/kasumi.h>
 #endif
@@ -71,10 +59,6 @@
   #include <botan/noekeon.h>
 #endif
 
-#if defined(BOTAN_HAS_NOEKEON_SIMD)
-  #include <botan/noekeon_simd.h>
-#endif
-
 #if defined(BOTAN_HAS_SEED)
   #include <botan/seed.h>
 #endif
@@ -83,10 +67,6 @@
   #include <botan/serpent.h>
 #endif
 
-#if defined(BOTAN_HAS_SERPENT_SIMD)
-  #include <botan/serp_simd.h>
-#endif
-
 #if defined(BOTAN_HAS_TWOFISH)
   #include <botan/twofish.h>
 #endif
@@ -95,18 +75,10 @@
   #include <botan/threefish.h>
 #endif
 
-#if defined(BOTAN_HAS_THREEFISH_512_AVX2)
-  #include <botan/threefish_avx2.h>
-#endif
-
 #if defined(BOTAN_HAS_XTEA)
   #include <botan/xtea.h>
 #endif
 
-#if defined(BOTAN_HAS_XTEA_SIMD)
-  #include <botan/xtea_simd.h>
-#endif
-
 namespace Botan {
 
 BlockCipher::~BlockCipher() {}
@@ -143,21 +115,6 @@ BOTAN_REGISTER_BLOCK_CIPHER_NAMED_NOARGS(AES_192, "AES-192");
 BOTAN_REGISTER_BLOCK_CIPHER_NAMED_NOARGS(AES_256, "AES-256");
 #endif
 
-#if defined(BOTAN_HAS_AES_NI)
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_aes_ni(), AES_128_NI, "AES-128", "aes_ni", 200);
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_aes_ni(), AES_192_NI, "AES-192", "aes_ni", 200);
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_aes_ni(), AES_256_NI, "AES-256", "aes_ni", 200);
-#endif
-
-#if defined(BOTAN_HAS_AES_SSSE3)
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_ssse3(), AES_128_SSSE3, "AES-128",
-                                      "ssse3", BOTAN_SIMD_ALGORITHM_PRIO);
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_ssse3(), AES_192_SSSE3, "AES-192",
-                                      "ssse3", BOTAN_SIMD_ALGORITHM_PRIO);
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_ssse3(), AES_256_SSSE3, "AES-256",
-                                      "ssse3", BOTAN_SIMD_ALGORITHM_PRIO);
-#endif
-
 #if defined(BOTAN_HAS_BLOWFISH)
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Blowfish);
 #endif
@@ -187,11 +144,6 @@ BOTAN_REGISTER_BLOCK_CIPHER_NAMED_1STR(GOST_28147_89, "GOST-28147-89", "R3411_94
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(IDEA);
 #endif
 
-#if defined(BOTAN_HAS_IDEA_SSE2)
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_sse2(), IDEA_SSE2, "IDEA",
-                                      "sse2", BOTAN_SIMD_ALGORITHM_PRIO);
-#endif
-
 #if defined(BOTAN_HAS_KASUMI)
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(KASUMI);
 #endif
@@ -204,11 +156,6 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(MISTY1);
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Noekeon);
 #endif
 
-#if defined(BOTAN_HAS_NOEKEON_SIMD)
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), Noekeon_SIMD, "Noekeon",
-                                      "simd32", BOTAN_SIMD_ALGORITHM_PRIO);
-#endif
-
 #if defined(BOTAN_HAS_SEED)
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(SEED);
 #endif
@@ -217,11 +164,6 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(SEED);
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Serpent);
 #endif
 
-#if defined(BOTAN_HAS_SERPENT_SIMD)
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), Serpent_SIMD, "Serpent",
-                                      "simd32", BOTAN_SIMD_ALGORITHM_PRIO);
-#endif
-
 #if defined(BOTAN_HAS_TWOFISH)
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Twofish);
 #endif
@@ -230,20 +172,10 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Twofish);
 BOTAN_REGISTER_BLOCK_CIPHER_NAMED_NOARGS(Threefish_512, "Threefish-512");
 #endif
 
-#if defined(BOTAN_HAS_THREEFISH_512_AVX2)
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_avx2(), Threefish_512_AVX2, "Threefish-512",
-                                      "avx2", BOTAN_SIMD_ALGORITHM_PRIO);
-#endif
-
 #if defined(BOTAN_HAS_XTEA)
 BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(XTEA);
 #endif
 
-#if defined(BOTAN_HAS_XTEA_SIMD)
-BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), XTEA_SIMD, "XTEA",
-                                      "simd32", BOTAN_SIMD_ALGORITHM_PRIO);
-#endif
-
 #if defined(BOTAN_HAS_CASCADE)
 BOTAN_REGISTER_NAMED_T(BlockCipher, "Cascade", Cascade_Cipher, Cascade_Cipher::make);
 #endif