# HG changeset patch # User Matt Johnston # Date 1103552733 0 # Node ID 8fc624ea252180470daedbefb60bc8c6a0d7e7a9 # Parent c2b93763dac950105a1ba3030631faa3e1a64d93 Cleaning up various unused bits (des_*, rijndael, MDS for twofish) diff -r c2b93763dac9 -r 8fc624ea2521 aes.c --- a/aes.c Sun Dec 19 16:23:32 2004 +0000 +++ b/aes.c Mon Dec 20 14:25:33 2004 +0000 @@ -38,6 +38,7 @@ #define ECB_TEST rijndael_test #define ECB_KS rijndael_keysize +#if 0 const struct _cipher_descriptor rijndael_desc = { "rijndael", @@ -45,6 +46,7 @@ 16, 32, 16, 10, SETUP, ECB_ENC, ECB_DEC, ECB_TEST, ECB_KS }; +#endif const struct _cipher_descriptor aes_desc = { diff -r c2b93763dac9 -r 8fc624ea2521 des.c --- a/des.c Sun Dec 19 16:23:32 2004 +0000 +++ b/des.c Mon Dec 20 14:25:33 2004 +0000 @@ -16,6 +16,7 @@ #define EN0 0 #define DE1 1 +#if 0 const struct _cipher_descriptor des_desc = { "des", @@ -27,6 +28,7 @@ &des_test, &des_keysize }; +#endif const struct _cipher_descriptor des3_desc = { @@ -1510,6 +1512,7 @@ } #endif +#if 0 int des_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey) { _ARGCHK(key != NULL); @@ -1528,6 +1531,7 @@ return CRYPT_OK; } +#endif int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey) { @@ -1553,6 +1557,7 @@ return CRYPT_OK; } +#if 0 void des_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *key) { ulong32 work[2]; @@ -1578,6 +1583,7 @@ STORE32H(work[0],pt+0); STORE32H(work[1],pt+4); } +#endif void des3_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *key) { @@ -1610,6 +1616,7 @@ STORE32H(work[1],pt+4); } +#if 0 int des_test(void) { #ifndef LTC_TEST @@ -1752,6 +1759,7 @@ return CRYPT_OK; #endif } +#endif int des3_test(void) { @@ -1789,6 +1797,7 @@ #endif } +#if 0 int des_keysize(int *desired_keysize) { _ARGCHK(desired_keysize != NULL); @@ -1798,6 +1807,7 @@ *desired_keysize = 8; return CRYPT_OK; } +#endif int des3_keysize(int *desired_keysize) { diff -r c2b93763dac9 -r 8fc624ea2521 twofish.c --- a/twofish.c Sun Dec 19 16:23:32 2004 +0000 +++ b/twofish.c Mon Dec 20 14:25:33 2004 +0000 @@ -38,12 +38,14 @@ #define RS_POLY 0x14D /* The 4x4 MDS Linear Transform */ +#if 0 static const unsigned char MDS[4][4] = { { 0x01, 0xEF, 0x5B, 0x5B }, { 0x5B, 0xEF, 0xEF, 0x01 }, { 0xEF, 0x5B, 0x01, 0xEF }, { 0xEF, 0x01, 0xEF, 0x5B } }; +#endif /* The 4x8 RS Linear Transform */ static const unsigned char RS[4][8] = {