dropbear: aes.c annotate

annotate aes.c @ 162:bc4e3ac2dd5a libtomcrypt

make data pointers volatile so that memory zeroing won't get optimised away

author	Matt Johnston <matt@ucc.asn.au>
date	Sun, 02 Jan 2005 17:09:05 +0000
parents	8fc624ea2521
children

rev	line source
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /* LibTomCrypt, modular cryptographic library -- Tom St Denis
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 * LibTomCrypt is a library that provides various cryptographic
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * algorithms in a highly modular and flexible manner.
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 * The library is free for all purposes without any express
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * guarantee it works.
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * Tom St Denis, [email protected], http://libtomcrypt.org
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 /* AES implementation by Tom St Denis
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * Derived from the Public Domain source code by
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 ---
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * rijndael-alg-fst.c
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * @version 3.0 (December 2000)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * Optimised ANSI C code for the Rijndael cipher (now AES)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * @author Vincent Rijmen <[email protected]>
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 * @author Antoon Bosselaers <[email protected]>
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 * @author Paulo Barreto <[email protected]>
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 ---
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "mycrypt.h"
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #ifdef RIJNDAEL
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	33 #ifndef ENCRYPT_ONLY
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	34
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	35 #define SETUP rijndael_setup
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	36 #define ECB_ENC rijndael_ecb_encrypt
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	37 #define ECB_DEC rijndael_ecb_decrypt
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	38 #define ECB_TEST rijndael_test
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	39 #define ECB_KS rijndael_keysize
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	40
151 8fc624ea2521 Cleaning up various unused bits (des_, rijndael, MDS for twofish) Matt Johnston <matt@ucc.asn.au>* parents: 143 diff changeset	41 #if 0
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 const struct _cipher_descriptor rijndael_desc =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 "rijndael",
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 6,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 16, 32, 16, 10,
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	47 SETUP, ECB_ENC, ECB_DEC, ECB_TEST, ECB_KS
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 };
151 8fc624ea2521 Cleaning up various unused bits (des_, rijndael, MDS for twofish) Matt Johnston <matt@ucc.asn.au>* parents: 143 diff changeset	49 #endif
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 const struct _cipher_descriptor aes_desc =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 "aes",
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 6,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 16, 32, 16, 10,
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	56 SETUP, ECB_ENC, ECB_DEC, ECB_TEST, ECB_KS
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 };
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	59 #else
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	60
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	61 #define SETUP rijndael_enc_setup
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	62 #define ECB_ENC rijndael_enc_ecb_encrypt
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	63 #define ECB_KS rijndael_enc_keysize
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	64
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	65 const struct _cipher_descriptor rijndael_enc_desc =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	66 {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	67 "rijndael",
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	68 6,
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	69 16, 32, 16, 10,
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	70 SETUP, ECB_ENC, NULL, NULL, ECB_KS
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	71 };
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	72
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	73 const struct _cipher_descriptor aes_enc_desc =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	74 {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	75 "aes",
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	76 6,
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	77 16, 32, 16, 10,
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	78 SETUP, ECB_ENC, NULL, NULL, ECB_KS
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	79 };
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	80
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	81 #endif
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	82
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 #include "aes_tab.c"
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	85 static ulong32 setup_mix(ulong32 temp)
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	86 {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	87 return (Te4_3[byte(temp, 2)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	88 (Te4_2[byte(temp, 1)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	89 (Te4_1[byte(temp, 0)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	90 (Te4_0[byte(temp, 3)]);
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	91 }
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	92
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	93 #ifndef ENCRYPT_ONLY
143 5d99163f7e32 import of libtomcrypt 0.99 Matt Johnston <matt@ucc.asn.au> parents: 15 diff changeset	94 #ifdef SMALL_CODE
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	95 static ulong32 setup_mix2(ulong32 temp)
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	96 {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	97 return Td0(255 & Te4[byte(temp, 3)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	98 Td1(255 & Te4[byte(temp, 2)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	99 Td2(255 & Te4[byte(temp, 1)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	100 Td3(255 & Te4[byte(temp, 0)]);
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	101 }
143 5d99163f7e32 import of libtomcrypt 0.99 Matt Johnston <matt@ucc.asn.au> parents: 15 diff changeset	102 #endif
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	103 #endif
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	104
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	105 int SETUP(const unsigned char key, int keylen, int rounds, symmetric_key skey)
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 int i, j;
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	108 ulong32 temp, *rk;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	109 #ifndef ENCRYPT_ONLY
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	110 ulong32 *rrk;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	111 #endif
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	112 _ARGCHK(key != NULL);
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 _ARGCHK(skey != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 if (keylen != 16 && keylen != 24 && keylen != 32) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 return CRYPT_INVALID_KEYSIZE;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 if (rounds != 0 && rounds != (10 + ((keylen/8)-2)*2)) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 return CRYPT_INVALID_ROUNDS;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 skey->rijndael.Nr = 10 + ((keylen/8)-2)*2;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 /* setup the forward key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 i = 0;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 rk = skey->rijndael.eK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 LOAD32H(rk[0], key );
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 LOAD32H(rk[1], key + 4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 LOAD32H(rk[2], key + 8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 LOAD32H(rk[3], key + 12);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 if (keylen == 16) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 j = 44;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 for (;;) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 temp = rk[3];
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	136 rk[4] = rk[0] ^ setup_mix(temp) ^ rcon[i];
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 rk[5] = rk[1] ^ rk[4];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 rk[6] = rk[2] ^ rk[5];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 rk[7] = rk[3] ^ rk[6];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 if (++i == 10) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 rk += 4;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 } else if (keylen == 24) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146 j = 52;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147 LOAD32H(rk[4], key + 16);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 LOAD32H(rk[5], key + 20);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 for (;;) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 #ifdef _MSC_VER
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 temp = skey->rijndael.eK[rk - skey->rijndael.eK + 5];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 #else
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 temp = rk[5];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 #endif
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	155 rk[ 6] = rk[ 0] ^ setup_mix(temp) ^ rcon[i];
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156 rk[ 7] = rk[ 1] ^ rk[ 6];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 rk[ 8] = rk[ 2] ^ rk[ 7];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158 rk[ 9] = rk[ 3] ^ rk[ 8];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 if (++i == 8) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 rk[10] = rk[ 4] ^ rk[ 9];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 rk[11] = rk[ 5] ^ rk[10];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 rk += 6;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 } else if (keylen == 32) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 j = 60;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 LOAD32H(rk[4], key + 16);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 LOAD32H(rk[5], key + 20);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 LOAD32H(rk[6], key + 24);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 LOAD32H(rk[7], key + 28);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 for (;;) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 #ifdef _MSC_VER
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 temp = skey->rijndael.eK[rk - skey->rijndael.eK + 7];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 #else
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 temp = rk[7];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 #endif
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	178 rk[ 8] = rk[ 0] ^ setup_mix(temp) ^ rcon[i];
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179 rk[ 9] = rk[ 1] ^ rk[ 8];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 rk[10] = rk[ 2] ^ rk[ 9];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 rk[11] = rk[ 3] ^ rk[10];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 if (++i == 7) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 temp = rk[11];
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	186 rk[12] = rk[ 4] ^ setup_mix(ROR(temp, 8));
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187 rk[13] = rk[ 5] ^ rk[12];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 rk[14] = rk[ 6] ^ rk[13];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189 rk[15] = rk[ 7] ^ rk[14];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 rk += 8;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 } else {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 /* this can't happen */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 j = 4;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 }
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	196
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	197 #ifndef ENCRYPT_ONLY
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 /* setup the inverse key now */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 rk = skey->rijndael.dK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 rrk = skey->rijndael.eK + j - 4;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 /* apply the inverse MixColumn transform to all round keys but the first and the last: */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 /* copy first */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 rk++ = rrk++;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 rk++ = rrk++;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 rk++ = rrk++;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 rk = rrk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 rk -= 3; rrk -= 3;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 for (i = 1; i < skey->rijndael.Nr; i++) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 rrk -= 4;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 rk += 4;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 #ifdef SMALL_CODE
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 temp = rrk[0];
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	215 rk[0] = setup_mix2(temp);
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 temp = rrk[1];
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	217 rk[1] = setup_mix2(temp);
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218 temp = rrk[2];
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	219 rk[2] = setup_mix2(temp);
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 temp = rrk[3];
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	221 rk[3] = setup_mix2(temp);
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 #else
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223 temp = rrk[0];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224 rk[0] =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 Tks0[byte(temp, 3)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 Tks1[byte(temp, 2)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227 Tks2[byte(temp, 1)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 Tks3[byte(temp, 0)];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 temp = rrk[1];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 rk[1] =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 Tks0[byte(temp, 3)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232 Tks1[byte(temp, 2)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 Tks2[byte(temp, 1)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 Tks3[byte(temp, 0)];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 temp = rrk[2];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 rk[2] =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237 Tks0[byte(temp, 3)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 Tks1[byte(temp, 2)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 Tks2[byte(temp, 1)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 Tks3[byte(temp, 0)];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 temp = rrk[3];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242 rk[3] =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 Tks0[byte(temp, 3)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 Tks1[byte(temp, 2)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245 Tks2[byte(temp, 1)] ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246 Tks3[byte(temp, 0)];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	247 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 /* copy last */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 rrk -= 4;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253 rk += 4;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254 rk++ = rrk++;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 rk++ = rrk++;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 rk++ = rrk++;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257 rk = rrk;
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	258 #endif /* ENCRYPT_ONLY */
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264 static void _rijndael_ecb_encrypt(const unsigned char pt, unsigned char ct, symmetric_key *skey)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265 #else
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	266 void ECB_ENC(const unsigned char pt, unsigned char ct, symmetric_key *skey)
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 int Nr, r;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 _ARGCHK(pt != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 _ARGCHK(ct != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274 _ARGCHK(skey != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	275
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	276 Nr = skey->rijndael.Nr;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 rk = skey->rijndael.eK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279 /*
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280 * map byte array block to cipher state
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 * and add initial round key:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283 LOAD32H(s0, pt ); s0 ^= rk[0];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 LOAD32H(s1, pt + 4); s1 ^= rk[1];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 LOAD32H(s2, pt + 8); s2 ^= rk[2];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 LOAD32H(s3, pt + 12); s3 ^= rk[3];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	288
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	289 #ifdef SMALL_CODE
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	290
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	291 for (r = 0; ; r++) {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	292 rk += 4;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	293 t0 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	294 Te0(byte(s0, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	295 Te1(byte(s1, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	296 Te2(byte(s2, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	297 Te3(byte(s3, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	298 rk[0];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	299 t1 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	300 Te0(byte(s1, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	301 Te1(byte(s2, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	302 Te2(byte(s3, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	303 Te3(byte(s0, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	304 rk[1];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	305 t2 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	306 Te0(byte(s2, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	307 Te1(byte(s3, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	308 Te2(byte(s0, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	309 Te3(byte(s1, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	310 rk[2];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	311 t3 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	312 Te0(byte(s3, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	313 Te1(byte(s0, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	314 Te2(byte(s1, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	315 Te3(byte(s2, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	316 rk[3];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	317 if (r == Nr-2) {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	318 break;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	319 }
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	320 s0 = t0; s1 = t1; s2 = t2; s3 = t3;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	321 }
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	322 rk += 4;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	323
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	324 #else
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	325
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 /*
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 * Nr - 1 full rounds:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 r = Nr >> 1;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 for (;;) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 t0 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332 Te0(byte(s0, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 Te1(byte(s1, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334 Te2(byte(s2, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 Te3(byte(s3, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336 rk[4];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 t1 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338 Te0(byte(s1, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339 Te1(byte(s2, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	340 Te2(byte(s3, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	341 Te3(byte(s0, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	342 rk[5];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343 t2 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344 Te0(byte(s2, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 Te1(byte(s3, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346 Te2(byte(s0, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	347 Te3(byte(s1, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	348 rk[6];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 t3 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350 Te0(byte(s3, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351 Te1(byte(s0, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	352 Te2(byte(s1, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353 Te3(byte(s2, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354 rk[7];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	355
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	356 rk += 8;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	357 if (--r == 0) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	358 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	359 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	360
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 s0 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362 Te0(byte(t0, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363 Te1(byte(t1, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 Te2(byte(t2, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365 Te3(byte(t3, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 rk[0];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 s1 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	368 Te0(byte(t1, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 Te1(byte(t2, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 Te2(byte(t3, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371 Te3(byte(t0, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372 rk[1];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373 s2 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374 Te0(byte(t2, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375 Te1(byte(t3, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376 Te2(byte(t0, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 Te3(byte(t1, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378 rk[2];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 s3 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 Te0(byte(t3, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381 Te1(byte(t0, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 Te2(byte(t1, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 Te3(byte(t2, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384 rk[3];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385 }
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	386
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	387 #endif
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	388
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 /*
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390 * apply last round and
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	391 * map cipher state to byte array block:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	392 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	393 s0 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	394 (Te4_3[byte(t0, 3)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	395 (Te4_2[byte(t1, 2)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	396 (Te4_1[byte(t2, 1)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	397 (Te4_0[byte(t3, 0)]) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	398 rk[0];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399 STORE32H(s0, ct);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 s1 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	401 (Te4_3[byte(t1, 3)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	402 (Te4_2[byte(t2, 2)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	403 (Te4_1[byte(t3, 1)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	404 (Te4_0[byte(t0, 0)]) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405 rk[1];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406 STORE32H(s1, ct+4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407 s2 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	408 (Te4_3[byte(t2, 3)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	409 (Te4_2[byte(t3, 2)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	410 (Te4_1[byte(t0, 1)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	411 (Te4_0[byte(t1, 0)]) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	412 rk[2];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 STORE32H(s2, ct+8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 s3 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	415 (Te4_3[byte(t3, 3)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	416 (Te4_2[byte(t0, 2)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	417 (Te4_1[byte(t1, 1)]) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	418 (Te4_0[byte(t2, 0)]) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419 rk[3];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 STORE32H(s3, ct+12);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 #ifdef CLEAN_STACK
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	424 void ECB_ENC(const unsigned char pt, unsigned char ct, symmetric_key *skey)
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426 _rijndael_ecb_encrypt(pt, ct, skey);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 burn_stack(sizeof(unsigned long)8 + sizeof(unsigned long) + sizeof(int)*2);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	428 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	431 #ifndef ENCRYPT_ONLY
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	432
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 static void _rijndael_ecb_decrypt(const unsigned char ct, unsigned char pt, symmetric_key *skey)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435 #else
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	436 void ECB_DEC(const unsigned char ct, unsigned char pt, symmetric_key *skey)
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 int Nr, r;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 _ARGCHK(pt != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443 _ARGCHK(ct != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 _ARGCHK(skey != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 Nr = skey->rijndael.Nr;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447 rk = skey->rijndael.dK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	448
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 /*
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450 * map byte array block to cipher state
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 * and add initial round key:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453 LOAD32H(s0, ct ); s0 ^= rk[0];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 LOAD32H(s1, ct + 4); s1 ^= rk[1];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455 LOAD32H(s2, ct + 8); s2 ^= rk[2];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456 LOAD32H(s3, ct + 12); s3 ^= rk[3];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	458 #ifdef SMALL_CODE
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	459 for (r = 0; ; r++) {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	460 rk += 4;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	461 t0 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	462 Td0(byte(s0, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	463 Td1(byte(s3, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	464 Td2(byte(s2, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	465 Td3(byte(s1, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	466 rk[0];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	467 t1 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	468 Td0(byte(s1, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	469 Td1(byte(s0, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	470 Td2(byte(s3, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	471 Td3(byte(s2, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	472 rk[1];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	473 t2 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	474 Td0(byte(s2, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	475 Td1(byte(s1, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	476 Td2(byte(s0, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	477 Td3(byte(s3, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	478 rk[2];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	479 t3 =
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	480 Td0(byte(s3, 3)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	481 Td1(byte(s2, 2)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	482 Td2(byte(s1, 1)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	483 Td3(byte(s0, 0)) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	484 rk[3];
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	485 if (r == Nr-2) {
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	486 break;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	487 }
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	488 s0 = t0; s1 = t1; s2 = t2; s3 = t3;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	489 }
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	490 rk += 4;
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	491
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	492 #else
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	493
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	494 /*
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	495 * Nr - 1 full rounds:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	496 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	497 r = Nr >> 1;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	498 for (;;) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	499
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	500 t0 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	501 Td0(byte(s0, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	502 Td1(byte(s3, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	503 Td2(byte(s2, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	504 Td3(byte(s1, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	505 rk[4];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	506 t1 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	507 Td0(byte(s1, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	508 Td1(byte(s0, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	509 Td2(byte(s3, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	510 Td3(byte(s2, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511 rk[5];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	512 t2 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	513 Td0(byte(s2, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	514 Td1(byte(s1, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	515 Td2(byte(s0, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	516 Td3(byte(s3, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	517 rk[6];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518 t3 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	519 Td0(byte(s3, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	520 Td1(byte(s2, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	521 Td2(byte(s1, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	522 Td3(byte(s0, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	523 rk[7];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	525 rk += 8;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	526 if (--r == 0) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	527 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	531 s0 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	532 Td0(byte(t0, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	533 Td1(byte(t3, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	534 Td2(byte(t2, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	535 Td3(byte(t1, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	536 rk[0];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537 s1 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538 Td0(byte(t1, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539 Td1(byte(t0, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	540 Td2(byte(t3, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	541 Td3(byte(t2, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542 rk[1];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	543 s2 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	544 Td0(byte(t2, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	545 Td1(byte(t1, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	546 Td2(byte(t0, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	547 Td3(byte(t3, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	548 rk[2];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	549 s3 =
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	550 Td0(byte(t3, 3)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	551 Td1(byte(t2, 2)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	552 Td2(byte(t1, 1)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	553 Td3(byte(t0, 0)) ^
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	554 rk[3];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	555 }
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	556 #endif
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	557
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	558 /*
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	559 * apply last round and
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	560 * map cipher state to byte array block:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	561 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	562 s0 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	563 (Td4[byte(t0, 3)] & 0xff000000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	564 (Td4[byte(t3, 2)] & 0x00ff0000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	565 (Td4[byte(t2, 1)] & 0x0000ff00) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	566 (Td4[byte(t1, 0)] & 0x000000ff) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	567 rk[0];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	568 STORE32H(s0, pt);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	569 s1 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	570 (Td4[byte(t1, 3)] & 0xff000000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	571 (Td4[byte(t0, 2)] & 0x00ff0000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	572 (Td4[byte(t3, 1)] & 0x0000ff00) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	573 (Td4[byte(t2, 0)] & 0x000000ff) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	574 rk[1];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	575 STORE32H(s1, pt+4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	576 s2 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	577 (Td4[byte(t2, 3)] & 0xff000000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	578 (Td4[byte(t1, 2)] & 0x00ff0000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	579 (Td4[byte(t0, 1)] & 0x0000ff00) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	580 (Td4[byte(t3, 0)] & 0x000000ff) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	581 rk[2];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	582 STORE32H(s2, pt+8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	583 s3 =
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	584 (Td4[byte(t3, 3)] & 0xff000000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	585 (Td4[byte(t2, 2)] & 0x00ff0000) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	586 (Td4[byte(t1, 1)] & 0x0000ff00) ^
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	587 (Td4[byte(t0, 0)] & 0x000000ff) ^
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	588 rk[3];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	589 STORE32H(s3, pt+12);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	590 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	591
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	592
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	593 #ifdef CLEAN_STACK
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	594 void ECB_DEC(const unsigned char ct, unsigned char pt, symmetric_key *skey)
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	595 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	596 _rijndael_ecb_decrypt(ct, pt, skey);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	597 burn_stack(sizeof(unsigned long)8 + sizeof(unsigned long) + sizeof(int)*2);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	598 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	599 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	600
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	601 int ECB_TEST(void)
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	602 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	603 #ifndef LTC_TEST
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	604 return CRYPT_NOP;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	605 #else
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	606 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	607 static const struct {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	608 int keylen;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	609 unsigned char key[32], pt[16], ct[16];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	610 } tests[] = {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	611 { 16,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	612 { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	613 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	614 { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	615 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	616 { 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	617 0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	618 }, {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	619 24,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	620 { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	621 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	622 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 },
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	623 { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	624 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	625 { 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	626 0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	627 }, {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	628 32,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	629 { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	630 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	631 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	632 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	633 { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	634 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	635 { 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	636 0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	637 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	638 };
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	639
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	640 symmetric_key key;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	641 unsigned char tmp[2][16];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	642 int i, y;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	643
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	644 for (i = 0; i < (int)(sizeof(tests)/sizeof(tests[0])); i++) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	645 zeromem(&key, sizeof(key));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	646 if ((err = rijndael_setup(tests[i].key, tests[i].keylen, 0, &key)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	647 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	648 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	649
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	650 rijndael_ecb_encrypt(tests[i].pt, tmp[0], &key);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	651 rijndael_ecb_decrypt(tmp[0], tmp[1], &key);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	652 if (memcmp(tmp[0], tests[i].ct, 16) \|\| memcmp(tmp[1], tests[i].pt, 16)) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	653 #if 0
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	654 printf("\n\nTest %d failed\n", i);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	655 if (memcmp(tmp[0], tests[i].ct, 16)) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	656 printf("CT: ");
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	657 for (i = 0; i < 16; i++) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	658 printf("%02x ", tmp[0][i]);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	659 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	660 printf("\n");
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	661 } else {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	662 printf("PT: ");
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	663 for (i = 0; i < 16; i++) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	664 printf("%02x ", tmp[1][i]);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	665 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	666 printf("\n");
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	667 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	668 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	669 return CRYPT_FAIL_TESTVECTOR;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	670 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	671
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	672 /* now see if we can encrypt all zero bytes 1000 times, decrypt and come back where we started */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	673 for (y = 0; y < 16; y++) tmp[0][y] = 0;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	674 for (y = 0; y < 1000; y++) rijndael_ecb_encrypt(tmp[0], tmp[0], &key);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	675 for (y = 0; y < 1000; y++) rijndael_ecb_decrypt(tmp[0], tmp[0], &key);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	676 for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	677 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	678 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	679 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	680 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	681
15 6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	682 #endif /* ENCRYPT_ONLY */
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	683
6362d3854bb4 0.96 release of LibTomCrypt Matt Johnston <matt@ucc.asn.au> parents: 0 diff changeset	684 int ECB_KS(int *desired_keysize)
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	685 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	686 _ARGCHK(desired_keysize != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	687
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	688 if (*desired_keysize < 16)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	689 return CRYPT_INVALID_KEYSIZE;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	690 if (*desired_keysize < 24) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	691 *desired_keysize = 16;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	692 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	693 } else if (*desired_keysize < 32) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	694 *desired_keysize = 24;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	695 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	696 } else {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	697 *desired_keysize = 32;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	698 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	699 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	700 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	701
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	702 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	703

Mercurial > dropbear

annotate aes.c @ 162:bc4e3ac2dd5a libtomcrypt