annotate aes.c @ 698:8e9c6361e909 libavutil

Make AES test program compile again: Setting the av_log_level variable needs to be replaced by a call to av_log_set_level().
author diego
date Fri, 20 Mar 2009 00:18:46 +0000
parents 0a51400a64c9
children ae6e96434bec
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
1 /*
194
3d5efe2de0ae seems i didnt copy anything from aes128.c so this should be more correct ?
michael
parents: 193
diff changeset
2 * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
3 *
354
1edb0f64861c Move comment to a slightly better place.
diego
parents: 337
diff changeset
4 * some optimization ideas from aes128.c by Reimar Doeffinger
1edb0f64861c Move comment to a slightly better place.
diego
parents: 337
diff changeset
5 *
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
6 * This file is part of FFmpeg.
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
7 *
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
12 *
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
16 * Lesser General Public License for more details.
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
17 *
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
21 */
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
22
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
23 #include "common.h"
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
24 #include "aes.h"
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
25
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
26 typedef struct AVAES{
368
99c56fd6e3f4 Document aes init code writing on purpose beyond round_key array into state array.
reimar
parents: 354
diff changeset
27 // Note: round_key[16] is accessed in the init code, but this only
99c56fd6e3f4 Document aes init code writing on purpose beyond round_key array into state array.
reimar
parents: 354
diff changeset
28 // overwrites state, which does not matter (see also r7471).
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
29 uint8_t round_key[15][4][4];
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
30 uint8_t state[2][4][4];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
31 int rounds;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
32 }AVAES;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
33
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
34 const int av_aes_size= sizeof(AVAES);
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
35
192
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
36 static const uint8_t rcon[10] = {
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
37 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
38 };
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
39
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
40 static uint8_t sbox[256];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
41 static uint8_t inv_sbox[256];
603
880c6441f56a Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 423
diff changeset
42 #if CONFIG_SMALL
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
43 static uint32_t enc_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
44 static uint32_t dec_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
45 #else
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
46 static uint32_t enc_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
47 static uint32_t dec_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
48 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
49
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
50 static inline void addkey(uint64_t dst[2], const uint64_t src[2], const uint64_t round_key[2]){
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
51 dst[0] = src[0] ^ round_key[0];
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
52 dst[1] = src[1] ^ round_key[1];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
53 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
54
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
55 static void subshift(uint8_t s0[2][16], int s, const uint8_t *box){
213
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
56 uint8_t (*s1)[16]= s0[0] - s;
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
57 uint8_t (*s3)[16]= s0[0] + s;
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
58 s0[0][0]=box[s0[1][ 0]]; s0[0][ 4]=box[s0[1][ 4]]; s0[0][ 8]=box[s0[1][ 8]]; s0[0][12]=box[s0[1][12]];
213
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
59 s1[0][3]=box[s1[1][ 7]]; s1[0][ 7]=box[s1[1][11]]; s1[0][11]=box[s1[1][15]]; s1[0][15]=box[s1[1][ 3]];
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
60 s0[0][2]=box[s0[1][10]]; s0[0][10]=box[s0[1][ 2]]; s0[0][ 6]=box[s0[1][14]]; s0[0][14]=box[s0[1][ 6]];
213
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
61 s3[0][1]=box[s3[1][13]]; s3[0][13]=box[s3[1][ 9]]; s3[0][ 9]=box[s3[1][ 5]]; s3[0][ 5]=box[s3[1][ 1]];
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
62 }
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
63
220
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
64 static inline int mix_core(uint32_t multbl[4][256], int a, int b, int c, int d){
603
880c6441f56a Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 423
diff changeset
65 #if CONFIG_SMALL
220
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
66 #define ROT(x,s) ((x<<s)|(x>>(32-s)))
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
67 return multbl[0][a] ^ ROT(multbl[0][b], 8) ^ ROT(multbl[0][c], 16) ^ ROT(multbl[0][d], 24);
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
68 #else
220
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
69 return multbl[0][a] ^ multbl[1][b] ^ multbl[2][c] ^ multbl[3][d];
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
70 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
71 }
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
72
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
73 static inline void mix(uint8_t state[2][4][4], uint32_t multbl[4][256], int s1, int s3){
220
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
74 ((uint32_t *)(state))[0] = mix_core(multbl, state[1][0][0], state[1][s1 ][1], state[1][2][2], state[1][s3 ][3]);
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
75 ((uint32_t *)(state))[1] = mix_core(multbl, state[1][1][0], state[1][s3-1][1], state[1][3][2], state[1][s1-1][3]);
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
76 ((uint32_t *)(state))[2] = mix_core(multbl, state[1][2][0], state[1][s3 ][1], state[1][0][2], state[1][s1 ][3]);
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
77 ((uint32_t *)(state))[3] = mix_core(multbl, state[1][3][0], state[1][s1-1][1], state[1][1][2], state[1][s3-1][3]);
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
78 }
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
79
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
80 static inline void crypt(AVAES *a, int s, const uint8_t *sbox, const uint32_t *multbl){
210
dd27616bb3fe unused variable
michael
parents: 209
diff changeset
81 int r;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
82
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
83 for(r=a->rounds-1; r>0; r--){
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
84 mix(a->state, multbl, 3-s, 1+s);
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
85 addkey(a->state[1], a->state[0], a->round_key[r]);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
86 }
213
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
87 subshift(a->state[0][0], s, sbox);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
88 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
89
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
90 void av_aes_crypt(AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt){
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
91 while(count--){
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
92 addkey(a->state[1], src, a->round_key[a->rounds]);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
93 if(decrypt) {
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
94 crypt(a, 0, inv_sbox, dec_multbl);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
95 if(iv){
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
96 addkey(a->state[0], a->state[0], iv);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
97 memcpy(iv, src, 16);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
98 }
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
99 addkey(dst, a->state[0], a->round_key[0]);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
100 }else{
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
101 if(iv) addkey(a->state[1], a->state[1], iv);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
102 crypt(a, 2, sbox, enc_multbl);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
103 addkey(dst, a->state[0], a->round_key[0]);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
104 if(iv) memcpy(iv, dst, 16);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
105 }
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
106 src+=16;
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
107 dst+=16;
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
108 }
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
109 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
110
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
111 static void init_multbl2(uint8_t tbl[1024], const int c[4], const uint8_t *log8, const uint8_t *alog8, const uint8_t *sbox){
200
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
112 int i, j;
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
113 for(i=0; i<1024; i++){
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
114 int x= sbox[i>>2];
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
115 if(x) tbl[i]= alog8[ log8[x] + log8[c[i&3]] ];
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
116 }
603
880c6441f56a Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 423
diff changeset
117 #if !CONFIG_SMALL
200
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
118 for(j=256; j<1024; j++)
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
119 for(i=0; i<4; i++)
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
120 tbl[4*j+i]= tbl[4*j + ((i-1)&3) - 1024];
199
7e2e223f99f2 simplify multiply table init
michael
parents: 198
diff changeset
121 #endif
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
122 }
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
123
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
124 // this is based on the reference AES code by Paulo Barreto and Vincent Rijmen
241
998d097d926d make key parameter const
bcoudurier
parents: 221
diff changeset
125 int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) {
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
126 int i, j, t, rconpointer = 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
127 uint8_t tk[8][4];
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
128 int KC= key_bits>>5;
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
129 int rounds= KC + 6;
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
130 uint8_t log8[256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
131 uint8_t alog8[512];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
132
337
980e486fcda1 correct last element inited check
michael
parents: 241
diff changeset
133 if(!enc_multbl[0][sizeof(enc_multbl)/sizeof(enc_multbl[0][0])-1]){
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
134 j=1;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
135 for(i=0; i<255; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
136 alog8[i]=
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
137 alog8[i+255]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
138 log8[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
139 j^= j+j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
140 if(j>255) j^= 0x11B;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
141 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
142 for(i=0; i<256; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
143 j= i ? alog8[255-log8[i]] : 0;
165
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
144 j ^= (j<<1) ^ (j<<2) ^ (j<<3) ^ (j<<4);
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
145 j = (j ^ (j>>8) ^ 99) & 255;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
146 inv_sbox[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
147 sbox [i]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
148 }
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
149 init_multbl2(dec_multbl[0], (const int[4]){0xe, 0x9, 0xd, 0xb}, log8, alog8, inv_sbox);
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
150 init_multbl2(enc_multbl[0], (const int[4]){0x2, 0x1, 0x1, 0x3}, log8, alog8, sbox);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
151 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
152
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
153 if(key_bits!=128 && key_bits!=192 && key_bits!=256)
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
154 return -1;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
155
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
156 a->rounds= rounds;
166
c7ea70dea191 memleak
michael
parents: 165
diff changeset
157
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
158 memcpy(tk, key, KC*4);
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
159
219
26de83603cfa 30byte smaller object file
michael
parents: 216
diff changeset
160 for(t= 0; t < (rounds+1)*16;) {
26de83603cfa 30byte smaller object file
michael
parents: 216
diff changeset
161 memcpy(a->round_key[0][0]+t, tk, KC*4);
26de83603cfa 30byte smaller object file
michael
parents: 216
diff changeset
162 t+= KC*4;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
163
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
164 for(i = 0; i < 4; i++)
173
712b0f43e8ac cosmetics
michael
parents: 172
diff changeset
165 tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
166 tk[0][0] ^= rcon[rconpointer++];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
167
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
168 for(j = 1; j < KC; j++){
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
169 if(KC != 8 || j != KC>>1)
175
937928db9781 cosmetic
michael
parents: 174
diff changeset
170 for(i = 0; i < 4; i++) tk[j][i] ^= tk[j-1][i];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
171 else
175
937928db9781 cosmetic
michael
parents: 174
diff changeset
172 for(i = 0; i < 4; i++) tk[j][i] ^= sbox[tk[j-1][i]];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
173 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
174 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
175
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
176 if(decrypt){
190
michael
parents: 189
diff changeset
177 for(i=1; i<rounds; i++){
215
2f388c3535e5 avoid memcpy()
michael
parents: 214
diff changeset
178 uint8_t tmp[3][16];
2f388c3535e5 avoid memcpy()
michael
parents: 214
diff changeset
179 memcpy(tmp[2], a->round_key[i][0], 16);
2f388c3535e5 avoid memcpy()
michael
parents: 214
diff changeset
180 subshift(tmp[1], 0, sbox);
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
181 mix(tmp, dec_multbl, 1, 3);
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
182 memcpy(a->round_key[i][0], tmp[0], 16);
190
michael
parents: 189
diff changeset
183 }
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
184 }else{
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
185 for(i=0; i<(rounds+1)>>1; i++){
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
186 for(j=0; j<16; j++)
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
187 FFSWAP(int, a->round_key[i][0][j], a->round_key[rounds-i][0][j]);
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
188 }
187
9b8b17e058a4 dont use encode tables for decoding
michael
parents: 186
diff changeset
189 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
190
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
191 return 0;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
192 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
193
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
194 #ifdef TEST
207
b5ff46799eea move #include log.h into the selftesting code where it belongs
michael
parents: 206
diff changeset
195 #include "log.h"
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
196
423
cf0184d7d6d7 Fix test program compilation, random() needs to be undefined.
diego
parents: 404
diff changeset
197 #undef random
cf0184d7d6d7 Fix test program compilation, random() needs to be undefined.
diego
parents: 404
diff changeset
198
404
f9a4c04ebb0e main() --> main(void)
diego
parents: 368
diff changeset
199 int main(void){
195
d36946d9907e fix 2 warnings
michael
parents: 194
diff changeset
200 int i,j;
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
201 AVAES ae, ad, b;
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
202 uint8_t rkey[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
203 {0},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
204 {0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59}};
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
205 uint8_t pt[16], rpt[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
206 {0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad, 0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
207 {0}};
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
208 uint8_t rct[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
209 {0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
210 {0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65}};
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
211 uint8_t temp[16];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
212
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
213 av_aes_init(&ae, "PI=3.141592654..", 128, 0);
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
214 av_aes_init(&ad, "PI=3.141592654..", 128, 1);
698
8e9c6361e909 Make AES test program compile again: Setting the av_log_level variable
diego
parents: 635
diff changeset
215 av_log_set_level(AV_LOG_DEBUG);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
216
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
217 for(i=0; i<2; i++){
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
218 av_aes_init(&b, rkey[i], 128, 1);
221
6ff860ccdcff 10l (aes_crypt -> av_aes_crypt)
michael
parents: 220
diff changeset
219 av_aes_crypt(&b, temp, rct[i], 1, NULL, 1);
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
220 for(j=0; j<16; j++)
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
221 if(rpt[i][j] != temp[j])
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
222 av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, rpt[i][j], temp[j]);
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
223 }
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
224
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
225 for(i=0; i<10000; i++){
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
226 for(j=0; j<16; j++){
0b829d22e97b init multbl
michael
parents: 177
diff changeset
227 pt[j]= random();
0b829d22e97b init multbl
michael
parents: 177
diff changeset
228 }
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
229 {START_TIMER
221
6ff860ccdcff 10l (aes_crypt -> av_aes_crypt)
michael
parents: 220
diff changeset
230 av_aes_crypt(&ae, temp, pt, 1, NULL, 0);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
231 if(!(i&(i-1)))
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
232 av_log(NULL, AV_LOG_ERROR, "%02X %02X %02X %02X\n", temp[0], temp[5], temp[10], temp[15]);
221
6ff860ccdcff 10l (aes_crypt -> av_aes_crypt)
michael
parents: 220
diff changeset
233 av_aes_crypt(&ad, temp, temp, 1, NULL, 1);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
234 STOP_TIMER("aes")}
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
235 for(j=0; j<16; j++){
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
236 if(pt[j] != temp[j]){
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
237 av_log(NULL, AV_LOG_ERROR, "%d %d %02X %02X\n", i,j, pt[j], temp[j]);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
238 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
239 }
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
240 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
241 return 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
242 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
243 #endif