aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cli/speed.cpp1
-rw-r--r--src/lib/block/block_cipher.cpp11
-rw-r--r--src/lib/block/cast256/cast256.cpp232
-rw-r--r--src/lib/block/cast256/cast256.h38
-rw-r--r--src/lib/block/cast256/info.txt7
-rw-r--r--src/lib/utils/types.h2
-rw-r--r--src/tests/data/block/cast256.vec53
7 files changed, 1 insertions, 343 deletions
diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp
index b8454d2a7..c5f45c4eb 100644
--- a/src/cli/speed.cpp
+++ b/src/cli/speed.cpp
@@ -345,7 +345,6 @@ class Speed final : public Command
"ARIA-256",
"Blowfish",
"CAST-128",
- "CAST-256",
"Camellia-128",
"Camellia-192",
"Camellia-256",
diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp
index fb0564646..d53f7fbc0 100644
--- a/src/lib/block/block_cipher.cpp
+++ b/src/lib/block/block_cipher.cpp
@@ -29,10 +29,6 @@
#include <botan/cast128.h>
#endif
-#if defined(BOTAN_HAS_CAST_256)
- #include <botan/cast256.h>
-#endif
-
#if defined(BOTAN_HAS_CASCADE)
#include <botan/cascade.h>
#endif
@@ -254,13 +250,6 @@ BlockCipher::create(const std::string& algo,
}
#endif
-#if defined(BOTAN_HAS_CAST_256)
- if(algo == "CAST-256")
- {
- return std::unique_ptr<BlockCipher>(new CAST_256);
- }
-#endif
-
#if defined(BOTAN_HAS_IDEA)
if(algo == "IDEA")
{
diff --git a/src/lib/block/cast256/cast256.cpp b/src/lib/block/cast256/cast256.cpp
deleted file mode 100644
index 226955f7c..000000000
--- a/src/lib/block/cast256/cast256.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-* CAST-256
-* (C) 1999-2007 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#include <botan/cast256.h>
-#include <botan/internal/cast_sboxes.h>
-#include <botan/loadstor.h>
-#include <botan/rotate.h>
-
-namespace Botan {
-
-namespace {
-
-/*
-* CAST-256 Round Type 1
-*/
-void round1(uint32_t& out, uint32_t in, uint32_t MK, uint32_t RK)
- {
- const uint32_t T = rotl_var(MK + in, RK);
- out ^= (CAST_SBOX1[get_byte(0, T)] ^ CAST_SBOX2[get_byte(1, T)]) -
- CAST_SBOX3[get_byte(2, T)] + CAST_SBOX4[get_byte(3, T)];
- }
-
-/*
-* CAST-256 Round Type 2
-*/
-void round2(uint32_t& out, uint32_t in, uint32_t MK, uint32_t RK)
- {
- const uint32_t T = rotl_var(MK ^ in, RK);
- out ^= (CAST_SBOX1[get_byte(0, T)] - CAST_SBOX2[get_byte(1, T)] +
- CAST_SBOX3[get_byte(2, T)]) ^ CAST_SBOX4[get_byte(3, T)];
- }
-
-/*
-* CAST-256 Round Type 3
-*/
-void round3(uint32_t& out, uint32_t in, uint32_t MK, uint32_t RK)
- {
- const uint32_t T = rotl_var(MK - in, RK);
- out ^= ((CAST_SBOX1[get_byte(0, T)] + CAST_SBOX2[get_byte(1, T)]) ^
- CAST_SBOX3[get_byte(2, T)]) - CAST_SBOX4[get_byte(3, T)];
- }
-
-}
-
-/*
-* CAST-256 Encryption
-*/
-void CAST_256::encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const
- {
- verify_key_set(m_RK.empty() == false);
-
- for(size_t i = 0; i != blocks; ++i)
- {
- uint32_t A = load_be<uint32_t>(in, 0);
- uint32_t B = load_be<uint32_t>(in, 1);
- uint32_t C = load_be<uint32_t>(in, 2);
- uint32_t D = load_be<uint32_t>(in, 3);
-
- round1(C, D, m_MK[ 0], m_RK[ 0]); round2(B, C, m_MK[ 1], m_RK[ 1]);
- round3(A, B, m_MK[ 2], m_RK[ 2]); round1(D, A, m_MK[ 3], m_RK[ 3]);
- round1(C, D, m_MK[ 4], m_RK[ 4]); round2(B, C, m_MK[ 5], m_RK[ 5]);
- round3(A, B, m_MK[ 6], m_RK[ 6]); round1(D, A, m_MK[ 7], m_RK[ 7]);
- round1(C, D, m_MK[ 8], m_RK[ 8]); round2(B, C, m_MK[ 9], m_RK[ 9]);
- round3(A, B, m_MK[10], m_RK[10]); round1(D, A, m_MK[11], m_RK[11]);
- round1(C, D, m_MK[12], m_RK[12]); round2(B, C, m_MK[13], m_RK[13]);
- round3(A, B, m_MK[14], m_RK[14]); round1(D, A, m_MK[15], m_RK[15]);
- round1(C, D, m_MK[16], m_RK[16]); round2(B, C, m_MK[17], m_RK[17]);
- round3(A, B, m_MK[18], m_RK[18]); round1(D, A, m_MK[19], m_RK[19]);
- round1(C, D, m_MK[20], m_RK[20]); round2(B, C, m_MK[21], m_RK[21]);
- round3(A, B, m_MK[22], m_RK[22]); round1(D, A, m_MK[23], m_RK[23]);
- round1(D, A, m_MK[27], m_RK[27]); round3(A, B, m_MK[26], m_RK[26]);
- round2(B, C, m_MK[25], m_RK[25]); round1(C, D, m_MK[24], m_RK[24]);
- round1(D, A, m_MK[31], m_RK[31]); round3(A, B, m_MK[30], m_RK[30]);
- round2(B, C, m_MK[29], m_RK[29]); round1(C, D, m_MK[28], m_RK[28]);
- round1(D, A, m_MK[35], m_RK[35]); round3(A, B, m_MK[34], m_RK[34]);
- round2(B, C, m_MK[33], m_RK[33]); round1(C, D, m_MK[32], m_RK[32]);
- round1(D, A, m_MK[39], m_RK[39]); round3(A, B, m_MK[38], m_RK[38]);
- round2(B, C, m_MK[37], m_RK[37]); round1(C, D, m_MK[36], m_RK[36]);
- round1(D, A, m_MK[43], m_RK[43]); round3(A, B, m_MK[42], m_RK[42]);
- round2(B, C, m_MK[41], m_RK[41]); round1(C, D, m_MK[40], m_RK[40]);
- round1(D, A, m_MK[47], m_RK[47]); round3(A, B, m_MK[46], m_RK[46]);
- round2(B, C, m_MK[45], m_RK[45]); round1(C, D, m_MK[44], m_RK[44]);
-
- store_be(out, A, B, C, D);
-
- in += BLOCK_SIZE;
- out += BLOCK_SIZE;
- }
- }
-
-/*
-* CAST-256 Decryption
-*/
-void CAST_256::decrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const
- {
- verify_key_set(m_RK.empty() == false);
-
- for(size_t i = 0; i != blocks; ++i)
- {
- uint32_t A = load_be<uint32_t>(in, 0);
- uint32_t B = load_be<uint32_t>(in, 1);
- uint32_t C = load_be<uint32_t>(in, 2);
- uint32_t D = load_be<uint32_t>(in, 3);
-
- round1(C, D, m_MK[44], m_RK[44]); round2(B, C, m_MK[45], m_RK[45]);
- round3(A, B, m_MK[46], m_RK[46]); round1(D, A, m_MK[47], m_RK[47]);
- round1(C, D, m_MK[40], m_RK[40]); round2(B, C, m_MK[41], m_RK[41]);
- round3(A, B, m_MK[42], m_RK[42]); round1(D, A, m_MK[43], m_RK[43]);
- round1(C, D, m_MK[36], m_RK[36]); round2(B, C, m_MK[37], m_RK[37]);
- round3(A, B, m_MK[38], m_RK[38]); round1(D, A, m_MK[39], m_RK[39]);
- round1(C, D, m_MK[32], m_RK[32]); round2(B, C, m_MK[33], m_RK[33]);
- round3(A, B, m_MK[34], m_RK[34]); round1(D, A, m_MK[35], m_RK[35]);
- round1(C, D, m_MK[28], m_RK[28]); round2(B, C, m_MK[29], m_RK[29]);
- round3(A, B, m_MK[30], m_RK[30]); round1(D, A, m_MK[31], m_RK[31]);
- round1(C, D, m_MK[24], m_RK[24]); round2(B, C, m_MK[25], m_RK[25]);
- round3(A, B, m_MK[26], m_RK[26]); round1(D, A, m_MK[27], m_RK[27]);
- round1(D, A, m_MK[23], m_RK[23]); round3(A, B, m_MK[22], m_RK[22]);
- round2(B, C, m_MK[21], m_RK[21]); round1(C, D, m_MK[20], m_RK[20]);
- round1(D, A, m_MK[19], m_RK[19]); round3(A, B, m_MK[18], m_RK[18]);
- round2(B, C, m_MK[17], m_RK[17]); round1(C, D, m_MK[16], m_RK[16]);
- round1(D, A, m_MK[15], m_RK[15]); round3(A, B, m_MK[14], m_RK[14]);
- round2(B, C, m_MK[13], m_RK[13]); round1(C, D, m_MK[12], m_RK[12]);
- round1(D, A, m_MK[11], m_RK[11]); round3(A, B, m_MK[10], m_RK[10]);
- round2(B, C, m_MK[ 9], m_RK[ 9]); round1(C, D, m_MK[ 8], m_RK[ 8]);
- round1(D, A, m_MK[ 7], m_RK[ 7]); round3(A, B, m_MK[ 6], m_RK[ 6]);
- round2(B, C, m_MK[ 5], m_RK[ 5]); round1(C, D, m_MK[ 4], m_RK[ 4]);
- round1(D, A, m_MK[ 3], m_RK[ 3]); round3(A, B, m_MK[ 2], m_RK[ 2]);
- round2(B, C, m_MK[ 1], m_RK[ 1]); round1(C, D, m_MK[ 0], m_RK[ 0]);
-
- store_be(out, A, B, C, D);
-
- in += BLOCK_SIZE;
- out += BLOCK_SIZE;
- }
- }
-
-/*
-* CAST-256 Key Schedule
-*/
-void CAST_256::key_schedule(const uint8_t key[], size_t length)
- {
- static const uint32_t KEY_MASK[192] = {
- 0x5A827999, 0xC95C653A, 0x383650DB, 0xA7103C7C, 0x15EA281D, 0x84C413BE,
- 0xF39DFF5F, 0x6277EB00, 0xD151D6A1, 0x402BC242, 0xAF05ADE3, 0x1DDF9984,
- 0x8CB98525, 0xFB9370C6, 0x6A6D5C67, 0xD9474808, 0x482133A9, 0xB6FB1F4A,
- 0x25D50AEB, 0x94AEF68C, 0x0388E22D, 0x7262CDCE, 0xE13CB96F, 0x5016A510,
- 0xBEF090B1, 0x2DCA7C52, 0x9CA467F3, 0x0B7E5394, 0x7A583F35, 0xE9322AD6,
- 0x580C1677, 0xC6E60218, 0x35BFEDB9, 0xA499D95A, 0x1373C4FB, 0x824DB09C,
- 0xF1279C3D, 0x600187DE, 0xCEDB737F, 0x3DB55F20, 0xAC8F4AC1, 0x1B693662,
- 0x8A432203, 0xF91D0DA4, 0x67F6F945, 0xD6D0E4E6, 0x45AAD087, 0xB484BC28,
- 0x235EA7C9, 0x9238936A, 0x01127F0B, 0x6FEC6AAC, 0xDEC6564D, 0x4DA041EE,
- 0xBC7A2D8F, 0x2B541930, 0x9A2E04D1, 0x0907F072, 0x77E1DC13, 0xE6BBC7B4,
- 0x5595B355, 0xC46F9EF6, 0x33498A97, 0xA2237638, 0x10FD61D9, 0x7FD74D7A,
- 0xEEB1391B, 0x5D8B24BC, 0xCC65105D, 0x3B3EFBFE, 0xAA18E79F, 0x18F2D340,
- 0x87CCBEE1, 0xF6A6AA82, 0x65809623, 0xD45A81C4, 0x43346D65, 0xB20E5906,
- 0x20E844A7, 0x8FC23048, 0xFE9C1BE9, 0x6D76078A, 0xDC4FF32B, 0x4B29DECC,
- 0xBA03CA6D, 0x28DDB60E, 0x97B7A1AF, 0x06918D50, 0x756B78F1, 0xE4456492,
- 0x531F5033, 0xC1F93BD4, 0x30D32775, 0x9FAD1316, 0x0E86FEB7, 0x7D60EA58,
- 0xEC3AD5F9, 0x5B14C19A, 0xC9EEAD3B, 0x38C898DC, 0xA7A2847D, 0x167C701E,
- 0x85565BBF, 0xF4304760, 0x630A3301, 0xD1E41EA2, 0x40BE0A43, 0xAF97F5E4,
- 0x1E71E185, 0x8D4BCD26, 0xFC25B8C7, 0x6AFFA468, 0xD9D99009, 0x48B37BAA,
- 0xB78D674B, 0x266752EC, 0x95413E8D, 0x041B2A2E, 0x72F515CF, 0xE1CF0170,
- 0x50A8ED11, 0xBF82D8B2, 0x2E5CC453, 0x9D36AFF4, 0x0C109B95, 0x7AEA8736,
- 0xE9C472D7, 0x589E5E78, 0xC7784A19, 0x365235BA, 0xA52C215B, 0x14060CFC,
- 0x82DFF89D, 0xF1B9E43E, 0x6093CFDF, 0xCF6DBB80, 0x3E47A721, 0xAD2192C2,
- 0x1BFB7E63, 0x8AD56A04, 0xF9AF55A5, 0x68894146, 0xD7632CE7, 0x463D1888,
- 0xB5170429, 0x23F0EFCA, 0x92CADB6B, 0x01A4C70C, 0x707EB2AD, 0xDF589E4E,
- 0x4E3289EF, 0xBD0C7590, 0x2BE66131, 0x9AC04CD2, 0x099A3873, 0x78742414,
- 0xE74E0FB5, 0x5627FB56, 0xC501E6F7, 0x33DBD298, 0xA2B5BE39, 0x118FA9DA,
- 0x8069957B, 0xEF43811C, 0x5E1D6CBD, 0xCCF7585E, 0x3BD143FF, 0xAAAB2FA0,
- 0x19851B41, 0x885F06E2, 0xF738F283, 0x6612DE24, 0xD4ECC9C5, 0x43C6B566,
- 0xB2A0A107, 0x217A8CA8, 0x90547849, 0xFF2E63EA, 0x6E084F8B, 0xDCE23B2C,
- 0x4BBC26CD, 0xBA96126E, 0x296FFE0F, 0x9849E9B0, 0x0723D551, 0x75FDC0F2,
- 0xE4D7AC93, 0x53B19834, 0xC28B83D5, 0x31656F76, 0xA03F5B17, 0x0F1946B8 };
-
- static const uint8_t KEY_ROT[32] = {
- 0x13, 0x04, 0x15, 0x06, 0x17, 0x08, 0x19, 0x0A, 0x1B, 0x0C,
- 0x1D, 0x0E, 0x1F, 0x10, 0x01, 0x12, 0x03, 0x14, 0x05, 0x16,
- 0x07, 0x18, 0x09, 0x1A, 0x0B, 0x1C, 0x0D, 0x1E, 0x0F, 0x00,
- 0x11, 0x02 };
-
- m_MK.resize(48);
- m_RK.resize(48);
-
- secure_vector<uint32_t> K(8);
- for(size_t i = 0; i != length; ++i)
- K[i/4] = (K[i/4] << 8) + key[i];
-
- uint32_t A = K[0], B = K[1], C = K[2], D = K[3],
- E = K[4], F = K[5], G = K[6], H = K[7];
-
- for(size_t i = 0; i != 48; i += 4)
- {
- round1(G, H, KEY_MASK[4*i+ 0], KEY_ROT[(4*i+ 0) % 32]);
- round2(F, G, KEY_MASK[4*i+ 1], KEY_ROT[(4*i+ 1) % 32]);
- round3(E, F, KEY_MASK[4*i+ 2], KEY_ROT[(4*i+ 2) % 32]);
- round1(D, E, KEY_MASK[4*i+ 3], KEY_ROT[(4*i+ 3) % 32]);
- round2(C, D, KEY_MASK[4*i+ 4], KEY_ROT[(4*i+ 4) % 32]);
- round3(B, C, KEY_MASK[4*i+ 5], KEY_ROT[(4*i+ 5) % 32]);
- round1(A, B, KEY_MASK[4*i+ 6], KEY_ROT[(4*i+ 6) % 32]);
- round2(H, A, KEY_MASK[4*i+ 7], KEY_ROT[(4*i+ 7) % 32]);
- round1(G, H, KEY_MASK[4*i+ 8], KEY_ROT[(4*i+ 8) % 32]);
- round2(F, G, KEY_MASK[4*i+ 9], KEY_ROT[(4*i+ 9) % 32]);
- round3(E, F, KEY_MASK[4*i+10], KEY_ROT[(4*i+10) % 32]);
- round1(D, E, KEY_MASK[4*i+11], KEY_ROT[(4*i+11) % 32]);
- round2(C, D, KEY_MASK[4*i+12], KEY_ROT[(4*i+12) % 32]);
- round3(B, C, KEY_MASK[4*i+13], KEY_ROT[(4*i+13) % 32]);
- round1(A, B, KEY_MASK[4*i+14], KEY_ROT[(4*i+14) % 32]);
- round2(H, A, KEY_MASK[4*i+15], KEY_ROT[(4*i+15) % 32]);
-
- m_RK[i ] = (A % 32);
- m_RK[i+1] = (C % 32);
- m_RK[i+2] = (E % 32);
- m_RK[i+3] = (G % 32);
- m_MK[i ] = H;
- m_MK[i+1] = F;
- m_MK[i+2] = D;
- m_MK[i+3] = B;
- }
- }
-
-void CAST_256::clear()
- {
- zap(m_MK);
- zap(m_RK);
- }
-
-}
diff --git a/src/lib/block/cast256/cast256.h b/src/lib/block/cast256/cast256.h
deleted file mode 100644
index 3c3016937..000000000
--- a/src/lib/block/cast256/cast256.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* CAST-256
-* (C) 1999-2007 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_CAST256_H_
-#define BOTAN_CAST256_H_
-
-#include <botan/block_cipher.h>
-
-BOTAN_FUTURE_INTERNAL_HEADER(cast256.h)
-
-namespace Botan {
-
-/**
-* CAST-256
-*/
-class BOTAN_PUBLIC_API(2,0) CAST_256 final : public Block_Cipher_Fixed_Params<16, 4, 32, 4>
- {
- 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 "CAST-256"; }
- BlockCipher* clone() const override { return new CAST_256; }
- private:
- void key_schedule(const uint8_t[], size_t) override;
-
- secure_vector<uint32_t> m_MK;
- secure_vector<uint8_t> m_RK;
- };
-
-}
-
-#endif
diff --git a/src/lib/block/cast256/info.txt b/src/lib/block/cast256/info.txt
deleted file mode 100644
index b109fe053..000000000
--- a/src/lib/block/cast256/info.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<defines>
-CAST_256 -> 20171203
-</defines>
-
-<requires>
-cast128
-</requires>
diff --git a/src/lib/utils/types.h b/src/lib/utils/types.h
index 549163aa8..ced3661c1 100644
--- a/src/lib/utils/types.h
+++ b/src/lib/utils/types.h
@@ -32,7 +32,7 @@ namespace Botan {
* @ref GCM_Mode "GCM", @ref OCB_Mode "OCB", @ref SIV_Mode "SIV"
* <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 "CAST-256", DES, @ref DESX "DES-X", @ref TripleDES "3DES",
+* @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 Threefish_512 "Threefish", Twofish, XTEA
* <dt>Stream Ciphers<dd>
diff --git a/src/tests/data/block/cast256.vec b/src/tests/data/block/cast256.vec
deleted file mode 100644
index e0db1b2e2..000000000
--- a/src/tests/data/block/cast256.vec
+++ /dev/null
@@ -1,53 +0,0 @@
-[CAST-256]
-Key = 80000000000000000000000000000000
-In = 00000000000000000000000000000000
-Out = 66918B620F075819CDE620469D5F39B8
-
-Key = 2342BB9EFA38542C0AF75647F29F615D
-In = 00000000000000000000000000000000
-Out = C842A08972B43D20836C91D1B7530F6B
-
-Key = 00000000000000000000000000000000
-In = 00000000000000000000000000000001
-Out = 4DBF11C2CA26D5A712578A5C18E8487B
-
-Key = 2342BB9EFA38542CBED0AC83940AC298BAC77A7717942863
-In = 00000000000000000000000000000000
-Out = 1B386C0210DCADCBDD0E41AA08A7A7E8
-
-Key = 000000000000000000000000000000000000000000000000
-In = 80000000000000000000000000000000
-Out = D64AD4962DCF990CB9EB1BEF19A21B98
-
-Key = 000000000000000000000000000000000000000000000000
-In = 00000000000040000000000000000000
-Out = 0154FF22D769EB57AE14D7ECDD60C1D8
-
-Key = 0000000000000000000000000000000000000000000000000000000000000000
-In = 80000000000000000000000000000000
-Out = D64AD4962DCF990CB9EB1BEF19A21B98
-
-Key = 0000000000000000000000000000000000000000000000000000000000000000
-In = 00000000000000000000000000000001
-Out = 4DBF11C2CA26D5A712578A5C18E8487B
-
-Key = 0000000000000000000000200000000000000000000000000000000000000000
-In = 00000000000000000000000000000000
-Out = 41C30E3025A7E66F6AE733DFDC861341
-
-Key = 2342BB9EFA38542CBED0AC83940AC2988D7C47CE264908461CC1B5137AE6B604
-In = 00000000000000000000000000000000
-Out = 4F6A2038286897B9C9870136553317FA
-
-Key = 2342BB9EFA38542C0AF75647F29F615D
-In = 0000000000000000000000000C9B2807
-Out = 963A8A50CEB54D08E0DEE0F1D0413DCF
-
-Key = 2342BB9EFA38542CBED0AC83940AC298BAC77A7717942863
-In = 000000000000000000000000EE356B0F
-Out = B25683CD9188DB9307F8A1236B53DE86
-
-Key = 2342BB9EFA38542CBED0AC83940AC2988D7C47CE264908461CC1B5137AE6B604
-In = 000000000000000000000000B2E9D805
-Out = AAB348855CAC0DC7BDF2FA02757A2154
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 04:39:04 +0000