comparison des.c @ 151:8fc624ea2521 libtomcrypt

Cleaning up various unused bits (des_*, rijndael, MDS for twofish)
author Matt Johnston <matt@ucc.asn.au>
date Mon, 20 Dec 2004 14:25:33 +0000
parents 5d99163f7e32
children
comparison
equal deleted inserted replaced
147:c2b93763dac9 151:8fc624ea2521
14 #ifdef DES 14 #ifdef DES
15 15
16 #define EN0 0 16 #define EN0 0
17 #define DE1 1 17 #define DE1 1
18 18
19 #if 0
19 const struct _cipher_descriptor des_desc = 20 const struct _cipher_descriptor des_desc =
20 { 21 {
21 "des", 22 "des",
22 13, 23 13,
23 8, 8, 8, 16, 24 8, 8, 8, 16,
25 &des_ecb_encrypt, 26 &des_ecb_encrypt,
26 &des_ecb_decrypt, 27 &des_ecb_decrypt,
27 &des_test, 28 &des_test,
28 &des_keysize 29 &des_keysize
29 }; 30 };
31 #endif
30 32
31 const struct _cipher_descriptor des3_desc = 33 const struct _cipher_descriptor des3_desc =
32 { 34 {
33 "3des", 35 "3des",
34 14, 36 14,
1508 _desfunc(block, keys); 1510 _desfunc(block, keys);
1509 burn_stack(sizeof(ulong32) * 4 + sizeof(int)); 1511 burn_stack(sizeof(ulong32) * 4 + sizeof(int));
1510 } 1512 }
1511 #endif 1513 #endif
1512 1514
1515 #if 0
1513 int des_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey) 1516 int des_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
1514 { 1517 {
1515 _ARGCHK(key != NULL); 1518 _ARGCHK(key != NULL);
1516 _ARGCHK(skey != NULL); 1519 _ARGCHK(skey != NULL);
1517 1520
1526 deskey(key, EN0, skey->des.ek); 1529 deskey(key, EN0, skey->des.ek);
1527 deskey(key, DE1, skey->des.dk); 1530 deskey(key, DE1, skey->des.dk);
1528 1531
1529 return CRYPT_OK; 1532 return CRYPT_OK;
1530 } 1533 }
1534 #endif
1531 1535
1532 int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey) 1536 int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
1533 { 1537 {
1534 _ARGCHK(key != NULL); 1538 _ARGCHK(key != NULL);
1535 _ARGCHK(skey != NULL); 1539 _ARGCHK(skey != NULL);
1551 deskey(key+16, DE1, skey->des3.dk[0]); 1555 deskey(key+16, DE1, skey->des3.dk[0]);
1552 1556
1553 return CRYPT_OK; 1557 return CRYPT_OK;
1554 } 1558 }
1555 1559
1560 #if 0
1556 void des_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *key) 1561 void des_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *key)
1557 { 1562 {
1558 ulong32 work[2]; 1563 ulong32 work[2];
1559 _ARGCHK(pt != NULL); 1564 _ARGCHK(pt != NULL);
1560 _ARGCHK(ct != NULL); 1565 _ARGCHK(ct != NULL);
1576 LOAD32H(work[1], ct+4); 1581 LOAD32H(work[1], ct+4);
1577 desfunc(work, key->des.dk); 1582 desfunc(work, key->des.dk);
1578 STORE32H(work[0],pt+0); 1583 STORE32H(work[0],pt+0);
1579 STORE32H(work[1],pt+4); 1584 STORE32H(work[1],pt+4);
1580 } 1585 }
1586 #endif
1581 1587
1582 void des3_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *key) 1588 void des3_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *key)
1583 { 1589 {
1584 ulong32 work[2]; 1590 ulong32 work[2];
1585 1591
1608 desfunc(work, key->des3.dk[2]); 1614 desfunc(work, key->des3.dk[2]);
1609 STORE32H(work[0],pt+0); 1615 STORE32H(work[0],pt+0);
1610 STORE32H(work[1],pt+4); 1616 STORE32H(work[1],pt+4);
1611 } 1617 }
1612 1618
1619 #if 0
1613 int des_test(void) 1620 int des_test(void)
1614 { 1621 {
1615 #ifndef LTC_TEST 1622 #ifndef LTC_TEST
1616 return CRYPT_NOP; 1623 return CRYPT_NOP;
1617 #else 1624 #else
1750 } 1757 }
1751 1758
1752 return CRYPT_OK; 1759 return CRYPT_OK;
1753 #endif 1760 #endif
1754 } 1761 }
1762 #endif
1755 1763
1756 int des3_test(void) 1764 int des3_test(void)
1757 { 1765 {
1758 #ifndef LTC_TEST 1766 #ifndef LTC_TEST
1759 return CRYPT_NOP; 1767 return CRYPT_NOP;
1787 1795
1788 return CRYPT_OK; 1796 return CRYPT_OK;
1789 #endif 1797 #endif
1790 } 1798 }
1791 1799
1800 #if 0
1792 int des_keysize(int *desired_keysize) 1801 int des_keysize(int *desired_keysize)
1793 { 1802 {
1794 _ARGCHK(desired_keysize != NULL); 1803 _ARGCHK(desired_keysize != NULL);
1795 if(*desired_keysize < 8) { 1804 if(*desired_keysize < 8) {
1796 return CRYPT_INVALID_KEYSIZE; 1805 return CRYPT_INVALID_KEYSIZE;
1797 } 1806 }
1798 *desired_keysize = 8; 1807 *desired_keysize = 8;
1799 return CRYPT_OK; 1808 return CRYPT_OK;
1800 } 1809 }
1810 #endif
1801 1811
1802 int des3_keysize(int *desired_keysize) 1812 int des3_keysize(int *desired_keysize)
1803 { 1813 {
1804 _ARGCHK(desired_keysize != NULL); 1814 _ARGCHK(desired_keysize != NULL);
1805 if(*desired_keysize < 24) { 1815 if(*desired_keysize < 24) {