Remove MISTY1

9 files changed, 2 insertions, 453 deletions

diff --git a/doc/api_ref/block_cipher.rst b/doc/api_ref/block_cipher.rst
index 00dbb3751..f35ad8a94 100644
--- a/doc/api_ref/block_cipher.rst
+++ b/doc/api_ref/block_cipher.rst
@@ -274,17 +274,6 @@ necessary.
 
 Available if ``BOTAN_HAS_LION`` is defined.
 
-MISTY1
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A 64-bit Japanese cipher standardized by NESSIE and ISO. Seemingly secure, but
-quite slow and saw little adoption. No reason to use it in new code.
-
-Available if ``BOTAN_HAS_MISTY1`` is defined.
-
-.. warning::
-   Support for MISTY1 is deprecated and will be removed in a future major release.
-
 Noekeon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/deprecated.rst b/doc/deprecated.rst
index 68a0aad8b..5cd1784f4 100644
--- a/doc/deprecated.rst
+++ b/doc/deprecated.rst
@@ -59,7 +59,7 @@ Deprecated Functionality
 This section lists cryptographic functionality which will be removed
 in a future major release.
 
-- Block ciphers GOST 28147, Kasumi, MISTY1, DESX, and XTEA.
+- Block ciphers GOST 28147, Kasumi, DESX, and XTEA.
 
 - Hash functions GOST 34.11-94 and Tiger
 
diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp
index c5f45c4eb..24f0478e0 100644
--- a/src/cli/speed.cpp
+++ b/src/cli/speed.cpp
@@ -353,7 +353,6 @@ class Speed final : public Command
             "GOST-28147-89",
             "IDEA",
             "KASUMI",
-            "MISTY1",
             "Noekeon",
             "SHACAL2",
             "SM4",
diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp
index d53f7fbc0..17578b143 100644
--- a/src/lib/block/block_cipher.cpp
+++ b/src/lib/block/block_cipher.cpp
@@ -54,10 +54,6 @@
   #include <botan/lion.h>
 #endif
 
-#if defined(BOTAN_HAS_MISTY1)
-  #include <botan/misty1.h>
-#endif
-
 #if defined(BOTAN_HAS_NOEKEON)
   #include <botan/noekeon.h>
 #endif
@@ -264,13 +260,6 @@ BlockCipher::create(const std::string& algo,
       }
 #endif
 
-#if defined(BOTAN_HAS_MISTY1)
-   if(algo == "MISTY1")
-      {
-      return std::unique_ptr<BlockCipher>(new MISTY1);
-      }
-#endif
-
 #if defined(BOTAN_HAS_SEED)
    if(algo == "SEED")
       {
diff --git a/src/lib/block/misty1/info.txt b/src/lib/block/misty1/info.txt
deleted file mode 100644
index bf21dd439..000000000
--- a/src/lib/block/misty1/info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<defines>
-MISTY1 -> 20131128
-</defines>
diff --git a/src/lib/block/misty1/misty1.cpp b/src/lib/block/misty1/misty1.cpp
deleted file mode 100644
index e7ebffa6e..000000000
--- a/src/lib/block/misty1/misty1.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-* MISTY1
-* (C) 1999-2009 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#include <botan/misty1.h>
-#include <botan/loadstor.h>
-
-namespace Botan {
-
-namespace {
-
-static const uint8_t MISTY1_SBOX_S7[128] = {
-   0x1B, 0x32, 0x33, 0x5A, 0x3B, 0x10, 0x17, 0x54, 0x5B, 0x1A, 0x72, 0x73,
-   0x6B, 0x2C, 0x66, 0x49, 0x1F, 0x24, 0x13, 0x6C, 0x37, 0x2E, 0x3F, 0x4A,
-   0x5D, 0x0F, 0x40, 0x56, 0x25, 0x51, 0x1C, 0x04, 0x0B, 0x46, 0x20, 0x0D,
-   0x7B, 0x35, 0x44, 0x42, 0x2B, 0x1E, 0x41, 0x14, 0x4B, 0x79, 0x15, 0x6F,
-   0x0E, 0x55, 0x09, 0x36, 0x74, 0x0C, 0x67, 0x53, 0x28, 0x0A, 0x7E, 0x38,
-   0x02, 0x07, 0x60, 0x29, 0x19, 0x12, 0x65, 0x2F, 0x30, 0x39, 0x08, 0x68,
-   0x5F, 0x78, 0x2A, 0x4C, 0x64, 0x45, 0x75, 0x3D, 0x59, 0x48, 0x03, 0x57,
-   0x7C, 0x4F, 0x62, 0x3C, 0x1D, 0x21, 0x5E, 0x27, 0x6A, 0x70, 0x4D, 0x3A,
-   0x01, 0x6D, 0x6E, 0x63, 0x18, 0x77, 0x23, 0x05, 0x26, 0x76, 0x00, 0x31,
-   0x2D, 0x7A, 0x7F, 0x61, 0x50, 0x22, 0x11, 0x06, 0x47, 0x16, 0x52, 0x4E,
-   0x71, 0x3E, 0x69, 0x43, 0x34, 0x5C, 0x58, 0x7D };
-
-static const uint16_t MISTY1_SBOX_S9[512] = {
-   0x01C3, 0x00CB, 0x0153, 0x019F, 0x01E3, 0x00E9, 0x00FB, 0x0035, 0x0181,
-   0x00B9, 0x0117, 0x01EB, 0x0133, 0x0009, 0x002D, 0x00D3, 0x00C7, 0x014A,
-   0x0037, 0x007E, 0x00EB, 0x0164, 0x0193, 0x01D8, 0x00A3, 0x011E, 0x0055,
-   0x002C, 0x001D, 0x01A2, 0x0163, 0x0118, 0x014B, 0x0152, 0x01D2, 0x000F,
-   0x002B, 0x0030, 0x013A, 0x00E5, 0x0111, 0x0138, 0x018E, 0x0063, 0x00E3,
-   0x00C8, 0x01F4, 0x001B, 0x0001, 0x009D, 0x00F8, 0x01A0, 0x016D, 0x01F3,
-   0x001C, 0x0146, 0x007D, 0x00D1, 0x0082, 0x01EA, 0x0183, 0x012D, 0x00F4,
-   0x019E, 0x01D3, 0x00DD, 0x01E2, 0x0128, 0x01E0, 0x00EC, 0x0059, 0x0091,
-   0x0011, 0x012F, 0x0026, 0x00DC, 0x00B0, 0x018C, 0x010F, 0x01F7, 0x00E7,
-   0x016C, 0x00B6, 0x00F9, 0x00D8, 0x0151, 0x0101, 0x014C, 0x0103, 0x00B8,
-   0x0154, 0x012B, 0x01AE, 0x0017, 0x0071, 0x000C, 0x0047, 0x0058, 0x007F,
-   0x01A4, 0x0134, 0x0129, 0x0084, 0x015D, 0x019D, 0x01B2, 0x01A3, 0x0048,
-   0x007C, 0x0051, 0x01CA, 0x0023, 0x013D, 0x01A7, 0x0165, 0x003B, 0x0042,
-   0x00DA, 0x0192, 0x00CE, 0x00C1, 0x006B, 0x009F, 0x01F1, 0x012C, 0x0184,
-   0x00FA, 0x0196, 0x01E1, 0x0169, 0x017D, 0x0031, 0x0180, 0x010A, 0x0094,
-   0x01DA, 0x0186, 0x013E, 0x011C, 0x0060, 0x0175, 0x01CF, 0x0067, 0x0119,
-   0x0065, 0x0068, 0x0099, 0x0150, 0x0008, 0x0007, 0x017C, 0x00B7, 0x0024,
-   0x0019, 0x00DE, 0x0127, 0x00DB, 0x00E4, 0x01A9, 0x0052, 0x0109, 0x0090,
-   0x019C, 0x01C1, 0x0028, 0x01B3, 0x0135, 0x016A, 0x0176, 0x00DF, 0x01E5,
-   0x0188, 0x00C5, 0x016E, 0x01DE, 0x01B1, 0x00C3, 0x01DF, 0x0036, 0x00EE,
-   0x01EE, 0x00F0, 0x0093, 0x0049, 0x009A, 0x01B6, 0x0069, 0x0081, 0x0125,
-   0x000B, 0x005E, 0x00B4, 0x0149, 0x01C7, 0x0174, 0x003E, 0x013B, 0x01B7,
-   0x008E, 0x01C6, 0x00AE, 0x0010, 0x0095, 0x01EF, 0x004E, 0x00F2, 0x01FD,
-   0x0085, 0x00FD, 0x00F6, 0x00A0, 0x016F, 0x0083, 0x008A, 0x0156, 0x009B,
-   0x013C, 0x0107, 0x0167, 0x0098, 0x01D0, 0x01E9, 0x0003, 0x01FE, 0x00BD,
-   0x0122, 0x0089, 0x00D2, 0x018F, 0x0012, 0x0033, 0x006A, 0x0142, 0x00ED,
-   0x0170, 0x011B, 0x00E2, 0x014F, 0x0158, 0x0131, 0x0147, 0x005D, 0x0113,
-   0x01CD, 0x0079, 0x0161, 0x01A5, 0x0179, 0x009E, 0x01B4, 0x00CC, 0x0022,
-   0x0132, 0x001A, 0x00E8, 0x0004, 0x0187, 0x01ED, 0x0197, 0x0039, 0x01BF,
-   0x01D7, 0x0027, 0x018B, 0x00C6, 0x009C, 0x00D0, 0x014E, 0x006C, 0x0034,
-   0x01F2, 0x006E, 0x00CA, 0x0025, 0x00BA, 0x0191, 0x00FE, 0x0013, 0x0106,
-   0x002F, 0x01AD, 0x0172, 0x01DB, 0x00C0, 0x010B, 0x01D6, 0x00F5, 0x01EC,
-   0x010D, 0x0076, 0x0114, 0x01AB, 0x0075, 0x010C, 0x01E4, 0x0159, 0x0054,
-   0x011F, 0x004B, 0x00C4, 0x01BE, 0x00F7, 0x0029, 0x00A4, 0x000E, 0x01F0,
-   0x0077, 0x004D, 0x017A, 0x0086, 0x008B, 0x00B3, 0x0171, 0x00BF, 0x010E,
-   0x0104, 0x0097, 0x015B, 0x0160, 0x0168, 0x00D7, 0x00BB, 0x0066, 0x01CE,
-   0x00FC, 0x0092, 0x01C5, 0x006F, 0x0016, 0x004A, 0x00A1, 0x0139, 0x00AF,
-   0x00F1, 0x0190, 0x000A, 0x01AA, 0x0143, 0x017B, 0x0056, 0x018D, 0x0166,
-   0x00D4, 0x01FB, 0x014D, 0x0194, 0x019A, 0x0087, 0x01F8, 0x0123, 0x00A7,
-   0x01B8, 0x0141, 0x003C, 0x01F9, 0x0140, 0x002A, 0x0155, 0x011A, 0x01A1,
-   0x0198, 0x00D5, 0x0126, 0x01AF, 0x0061, 0x012E, 0x0157, 0x01DC, 0x0072,
-   0x018A, 0x00AA, 0x0096, 0x0115, 0x00EF, 0x0045, 0x007B, 0x008D, 0x0145,
-   0x0053, 0x005F, 0x0178, 0x00B2, 0x002E, 0x0020, 0x01D5, 0x003F, 0x01C9,
-   0x01E7, 0x01AC, 0x0044, 0x0038, 0x0014, 0x00B1, 0x016B, 0x00AB, 0x00B5,
-   0x005A, 0x0182, 0x01C8, 0x01D4, 0x0018, 0x0177, 0x0064, 0x00CF, 0x006D,
-   0x0100, 0x0199, 0x0130, 0x015A, 0x0005, 0x0120, 0x01BB, 0x01BD, 0x00E0,
-   0x004F, 0x00D6, 0x013F, 0x01C4, 0x012A, 0x0015, 0x0006, 0x00FF, 0x019B,
-   0x00A6, 0x0043, 0x0088, 0x0050, 0x015F, 0x01E8, 0x0121, 0x0073, 0x017E,
-   0x00BC, 0x00C2, 0x00C9, 0x0173, 0x0189, 0x01F5, 0x0074, 0x01CC, 0x01E6,
-   0x01A8, 0x0195, 0x001F, 0x0041, 0x000D, 0x01BA, 0x0032, 0x003D, 0x01D1,
-   0x0080, 0x00A8, 0x0057, 0x01B9, 0x0162, 0x0148, 0x00D9, 0x0105, 0x0062,
-   0x007A, 0x0021, 0x01FF, 0x0112, 0x0108, 0x01C0, 0x00A9, 0x011D, 0x01B0,
-   0x01A6, 0x00CD, 0x00F3, 0x005C, 0x0102, 0x005B, 0x01D9, 0x0144, 0x01F6,
-   0x00AD, 0x00A5, 0x003A, 0x01CB, 0x0136, 0x017F, 0x0046, 0x00E1, 0x001E,
-   0x01DD, 0x00E6, 0x0137, 0x01FA, 0x0185, 0x008C, 0x008F, 0x0040, 0x01B5,
-   0x00BE, 0x0078, 0x0000, 0x00AC, 0x0110, 0x015E, 0x0124, 0x0002, 0x01BC,
-   0x00A2, 0x00EA, 0x0070, 0x01FC, 0x0116, 0x015C, 0x004C, 0x01C2 };
-
-/*
-* MISTY1 FI Function
-*/
-uint16_t FI(uint16_t input, uint16_t key7, uint16_t key9)
-   {
-   uint16_t D9 = input >> 7, D7 = input & 0x7F;
-   D9 = MISTY1_SBOX_S9[D9] ^ D7;
-   D7 = (MISTY1_SBOX_S7[D7] ^ key7 ^ D9) & 0x7F;
-   D9 = MISTY1_SBOX_S9[D9 ^ key9] ^ D7;
-   return static_cast<uint16_t>(D7 << 9) | D9;
-   }
-
-}
-
-/*
-* MISTY1 Encryption
-*/
-void MISTY1::encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const
-   {
-   verify_key_set(m_EK.empty() == false);
-
-   for(size_t i = 0; i != blocks; ++i)
-      {
-      uint16_t B0 = load_be<uint16_t>(in, 0);
-      uint16_t B1 = load_be<uint16_t>(in, 1);
-      uint16_t B2 = load_be<uint16_t>(in, 2);
-      uint16_t B3 = load_be<uint16_t>(in, 3);
-
-      for(size_t j = 0; j != 12; j += 3)
-         {
-         const uint16_t* RK = &m_EK[8 * j];
-
-         B1 ^= B0 & RK[0];
-         B0 ^= B1 | RK[1];
-         B3 ^= B2 & RK[2];
-         B2 ^= B3 | RK[3];
-
-         uint16_t T0, T1;
-
-         T0  = FI(B0 ^ RK[ 4], RK[ 5], RK[ 6]) ^ B1;
-         T1  = FI(B1 ^ RK[ 7], RK[ 8], RK[ 9]) ^ T0;
-         T0  = FI(T0 ^ RK[10], RK[11], RK[12]) ^ T1;
-
-         B2 ^= T1 ^ RK[13];
-         B3 ^= T0;
-
-         T0  = FI(B2 ^ RK[14], RK[15], RK[16]) ^ B3;
-         T1  = FI(B3 ^ RK[17], RK[18], RK[19]) ^ T0;
-         T0  = FI(T0 ^ RK[20], RK[21], RK[22]) ^ T1;
-
-         B0 ^= T1 ^ RK[23];
-         B1 ^= T0;
-         }
-
-      B1 ^= B0 & m_EK[96];
-      B0 ^= B1 | m_EK[97];
-      B3 ^= B2 & m_EK[98];
-      B2 ^= B3 | m_EK[99];
-
-      store_be(out, B2, B3, B0, B1);
-
-      in += BLOCK_SIZE;
-      out += BLOCK_SIZE;
-      }
-   }
-
-/*
-* MISTY1 Decryption
-*/
-void MISTY1::decrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const
-   {
-   verify_key_set(m_DK.empty() == false);
-
-   for(size_t i = 0; i != blocks; ++i)
-      {
-      uint16_t B0 = load_be<uint16_t>(in, 2);
-      uint16_t B1 = load_be<uint16_t>(in, 3);
-      uint16_t B2 = load_be<uint16_t>(in, 0);
-      uint16_t B3 = load_be<uint16_t>(in, 1);
-
-      for(size_t j = 0; j != 12; j += 3)
-         {
-         const uint16_t* RK = &m_DK[8 * j];
-
-         B2 ^= B3 | RK[0];
-         B3 ^= B2 & RK[1];
-         B0 ^= B1 | RK[2];
-         B1 ^= B0 & RK[3];
-
-         uint16_t T0, T1;
-
-         T0  = FI(B2 ^ RK[ 4], RK[ 5], RK[ 6]) ^ B3;
-         T1  = FI(B3 ^ RK[ 7], RK[ 8], RK[ 9]) ^ T0;
-         T0  = FI(T0 ^ RK[10], RK[11], RK[12]) ^ T1;
-
-         B0 ^= T1 ^ RK[13];
-         B1 ^= T0;
-
-         T0  = FI(B0 ^ RK[14], RK[15], RK[16]) ^ B1;
-         T1  = FI(B1 ^ RK[17], RK[18], RK[19]) ^ T0;
-         T0  = FI(T0 ^ RK[20], RK[21], RK[22]) ^ T1;
-
-         B2 ^= T1 ^ RK[23];
-         B3 ^= T0;
-         }
-
-      B2 ^= B3 | m_DK[96];
-      B3 ^= B2 & m_DK[97];
-      B0 ^= B1 | m_DK[98];
-      B1 ^= B0 & m_DK[99];
-
-      store_be(out, B0, B1, B2, B3);
-
-      in += BLOCK_SIZE;
-      out += BLOCK_SIZE;
-      }
-   }
-
-/*
-* MISTY1 Key Schedule
-*/
-void MISTY1::key_schedule(const uint8_t key[], size_t length)
-   {
-   secure_vector<uint16_t> KS(32);
-   for(size_t i = 0; i != length / 2; ++i)
-      KS[i] = load_be<uint16_t>(key, i);
-
-   for(size_t i = 0; i != 8; ++i)
-      {
-      KS[i+ 8] = FI(KS[i], KS[(i+1) % 8] >> 9, KS[(i+1) % 8] & 0x1FF);
-      KS[i+16] = KS[i+8] >> 9;
-      KS[i+24] = KS[i+8] & 0x1FF;
-      }
-
-   /*
-   * Precomputed indexes for the orderings of the subkeys (MISTY1 reuses
-   * values)
-   */
-   static const uint8_t EK_ORDER[100] = {
-      0x00, 0x0E, 0x0A, 0x04, 0x00, 0x15, 0x1D, 0x02, 0x11, 0x19, 0x07, 0x13,
-      0x1B, 0x04, 0x01, 0x16, 0x1E, 0x03, 0x12, 0x1A, 0x00, 0x14, 0x1C, 0x05,
-      0x01, 0x0F, 0x0B, 0x05, 0x02, 0x17, 0x1F, 0x04, 0x13, 0x1B, 0x01, 0x15,
-      0x1D, 0x06, 0x03, 0x10, 0x18, 0x05, 0x14, 0x1C, 0x02, 0x16, 0x1E, 0x07,
-      0x02, 0x08, 0x0C, 0x06, 0x04, 0x11, 0x19, 0x06, 0x15, 0x1D, 0x03, 0x17,
-      0x1F, 0x00, 0x05, 0x12, 0x1A, 0x07, 0x16, 0x1E, 0x04, 0x10, 0x18, 0x01,
-      0x03, 0x09, 0x0D, 0x07, 0x06, 0x13, 0x1B, 0x00, 0x17, 0x1F, 0x05, 0x11,
-      0x19, 0x02, 0x07, 0x14, 0x1C, 0x01, 0x10, 0x18, 0x06, 0x12, 0x1A, 0x03,
-      0x04, 0x0A, 0x0E, 0x00 };
-
-   static const uint8_t DK_ORDER[100] = {
-      0x00, 0x0E, 0x0A, 0x04, 0x07, 0x14, 0x1C, 0x01, 0x10, 0x18, 0x06, 0x12,
-      0x1A, 0x03, 0x06, 0x13, 0x1B, 0x00, 0x17, 0x1F, 0x05, 0x11, 0x19, 0x02,
-      0x07, 0x0D, 0x09, 0x03, 0x05, 0x12, 0x1A, 0x07, 0x16, 0x1E, 0x04, 0x10,
-      0x18, 0x01, 0x04, 0x11, 0x19, 0x06, 0x15, 0x1D, 0x03, 0x17, 0x1F, 0x00,
-      0x06, 0x0C, 0x08, 0x02, 0x03, 0x10, 0x18, 0x05, 0x14, 0x1C, 0x02, 0x16,
-      0x1E, 0x07, 0x02, 0x17, 0x1F, 0x04, 0x13, 0x1B, 0x01, 0x15, 0x1D, 0x06,
-      0x05, 0x0B, 0x0F, 0x01, 0x01, 0x16, 0x1E, 0x03, 0x12, 0x1A, 0x00, 0x14,
-      0x1C, 0x05, 0x00, 0x15, 0x1D, 0x02, 0x11, 0x19, 0x07, 0x13, 0x1B, 0x04,
-      0x04, 0x0A, 0x0E, 0x00 };
-
-   m_EK.resize(100);
-   m_DK.resize(100);
-
-   for(size_t i = 0; i != 100; ++i)
-      {
-      m_EK[i] = KS[EK_ORDER[i]];
-      m_DK[i] = KS[DK_ORDER[i]];
-      }
-   }
-
-void MISTY1::clear()
-   {
-   zap(m_EK);
-   zap(m_DK);
-   }
-
-}
diff --git a/src/lib/block/misty1/misty1.h b/src/lib/block/misty1/misty1.h
deleted file mode 100644
index b6c4abbd5..000000000
--- a/src/lib/block/misty1/misty1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* MISTY1
-* (C) 1999-2008 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_MISTY1_H_
-#define BOTAN_MISTY1_H_
-
-#include <botan/block_cipher.h>
-
-BOTAN_FUTURE_INTERNAL_HEADER(misty1.h)
-
-namespace Botan {
-
-/**
-* MISTY1 with 8 rounds
-*/
-class BOTAN_PUBLIC_API(2,0) MISTY1 final : public Block_Cipher_Fixed_Params<8, 16>
-   {
-   public:
-      void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override;
-      void decrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override;
-
-      void clear() override;
-      std::string name() const override { return "MISTY1"; }
-      BlockCipher* clone() const override { return new MISTY1; }
-   private:
-      void key_schedule(const uint8_t[], size_t) override;
-
-      secure_vector<uint16_t> m_EK, m_DK;
-   };
-
-}
-
-#endif
diff --git a/src/lib/utils/types.h b/src/lib/utils/types.h
index ced3661c1..c01f1e417 100644
--- a/src/lib/utils/types.h
+++ b/src/lib/utils/types.h
@@ -33,7 +33,7 @@ namespace Botan {
 * <dt>Block Ciphers<dd>
 *        @ref aria.h "ARIA", @ref aes.h "AES", @ref Blowfish, @ref camellia.h "Camellia", @ref Cascade_Cipher "Cascade",
 *        @ref CAST_128 "CAST-128", @ref CAST_128 DES, @ref DESX "DES-X", @ref TripleDES "3DES",
-*        @ref GOST_28147_89 "GOST 28147-89", IDEA, KASUMI, Lion, MISTY1, Noekeon, SEED, Serpent, SHACAL2, SM4,
+*        @ref GOST_28147_89 "GOST 28147-89", IDEA, KASUMI, Lion, Noekeon, SEED, Serpent, SHACAL2, SM4,
 *        @ref Threefish_512 "Threefish", Twofish, XTEA
 * <dt>Stream Ciphers<dd>
 *        ChaCha, @ref CTR_BE "CTR", OFB, RC4, Salsa20
diff --git a/src/tests/data/block/misty.vec b/src/tests/data/block/misty.vec
deleted file mode 100644
index 54770bace..000000000
--- a/src/tests/data/block/misty.vec
+++ /dev/null
@@ -1,125 +0,0 @@
-[MISTY1]
-Key = 00112233445566778899AABBCCDDEEFF
-In = 0123456789ABCDEF
-Out = 8B1DA5F56AB3D07C
-
-Key = 00112233445566778899AABBCCDDEEFF
-In = FEDCBA9876543210
-Out = 04B68240B13BE95D
-
-Key = 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-In = 0A0A0A0A0A0A0A0A
-Out = DAD2CFFB201C00DF
-
-Key = 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-In = 0B0B0B0B0B0B0B0B
-Out = EBCF435B23CFB4C9
-
-Key = 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-In = 0C0C0C0C0C0C0C0C
-Out = 92E00981E5350015
-
-Key = 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-In = 0D0D0D0D0D0D0D0D
-Out = CD70199048ADB686
-
-Key = 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-In = 0E0E0E0E0E0E0E0E
-Out = ACAD6C19AE66EB41
-
-Key = 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-In = 0F0F0F0F0F0F0F0F
-Out = 4ECFE751E0E6A16F
-
-Key = 10101010101010101010101010101010
-In = 1010101010101010
-Out = C7A91953216F1B61
-
-Key = 11111111111111111111111111111111
-In = 1111111111111111
-Out = 0227EB3422109682
-
-Key = 12121212121212121212121212121212
-In = 1212121212121212
-Out = 5B88EB8714B2CE08
-
-Key = 13131313131313131313131313131313
-In = 1313131313131313
-Out = E325B133AB02C021
-
-Key = 14141414141414141414141414141414
-In = 1414141414141414
-Out = 93A4074EE9C38AE3
-
-Key = 15151515151515151515151515151515
-In = 1515151515151515
-Out = 15AB85B70F337868
-
-Key = 16161616161616161616161616161616
-In = 1616161616161616
-Out = 7EFD6E05D384512F
-
-Key = 17171717171717171717171717171717
-In = 1717171717171717
-Out = C1E46E7B54BAD271
-
-Key = 18181818181818181818181818181818
-In = 1818181818181818
-Out = 956504E0F372D380
-
-Key = 19191919191919191919191919191919
-In = 1919191919191919
-Out = 667C8BB548330E81
-
-Key = 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-In = 1A1A1A1A1A1A1A1A
-Out = 1F8787DF7582DCD0
-
-Key = 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-In = 1B1B1B1B1B1B1B1B
-Out = 47F4EAF5BA82C610
-
-Key = 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-In = 1C1C1C1C1C1C1C1C
-Out = 0F772431C6E54F3C
-
-Key = 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-In = 1D1D1D1D1D1D1D1D
-Out = 51CF4361B3EF3EAC
-
-Key = 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-In = 1E1E1E1E1E1E1E1E
-Out = 7AC52498328C66BE
-
-Key = 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-In = 1F1F1F1F1F1F1F1F
-Out = 9C4E0F782BBBD830
-
-Key = 81818181818181818181818181818181
-In = 8181818181818181
-Out = 2FFAF44121E4F834
-
-Key = 82828282828282828282828282828282
-In = 8282828282828282
-Out = 4EED79D6916AA112
-
-Key = 83838383838383838383838383838383
-In = 8383838383838383
-Out = 12B62B3C7FCAA24B
-
-Key = 84848484848484848484848484848484
-In = 8484848484848484
-Out = F7FAF70C7E4ED8B7
-
-Key = 85858585858585858585858585858585
-In = 8585858585858585
-Out = C58EC8FEE9DD45CF
-
-Key = 86868686868686868686868686868686
-In = 8686868686868686
-Out = A6159BD7C1E24B82
-
-Key = FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-In = FFFFFFFFFFFFFFFF
-Out = 651F3092AFA551D0
-