comparison src/ciphers/aes/aes.c @ 210:4768b55c5240 libtomcrypt

propagate from branch 'au.asn.ucc.matt.ltc-orig' (head 33c416b902f1a44913d825bae7ad9a160f703ed3) to branch 'au.asn.ucc.matt.dropbear.ltc' (head 4d6aec6e6121e13f68c11c149b6579c41cb63e74)
author Matt Johnston <matt@ucc.asn.au>
date Wed, 06 Jul 2005 12:10:23 +0000
parents 9cc34777b479 39d5d58461d6
children
comparison
equal deleted inserted replaced
199:8be64e2c86f4 210:4768b55c5240
127 #ifndef ENCRYPT_ONLY 127 #ifndef ENCRYPT_ONLY
128 ulong32 *rrk; 128 ulong32 *rrk;
129 #endif 129 #endif
130 LTC_ARGCHK(key != NULL); 130 LTC_ARGCHK(key != NULL);
131 LTC_ARGCHK(skey != NULL); 131 LTC_ARGCHK(skey != NULL);
132 132
133 if (keylen != 16 && keylen != 24 && keylen != 32) { 133 if (keylen != 16 && keylen != 24 && keylen != 32) {
134 return CRYPT_INVALID_KEYSIZE; 134 return CRYPT_INVALID_KEYSIZE;
135 } 135 }
136 136
137 if (num_rounds != 0 && num_rounds != (10 + ((keylen/8)-2)*2)) { 137 if (num_rounds != 0 && num_rounds != (10 + ((keylen/8)-2)*2)) {
747 } 747 }
748 } 748 }
749 749
750 #endif 750 #endif
751 751
752
753 /* $Source: /cvs/libtom/libtomcrypt/src/ciphers/aes/aes.c,v $ */
754 /* $Revision: 1.8 $ */
755 /* $Date: 2005/05/05 14:35:58 $ */