annotate aes.c @ 213:e50daf73d26c libavutil

change subshift a little, this reduces the object size a litlle
author michael
date Tue, 16 Jan 2007 17:40:40 +0000
parents d31d4880105e
children db327a8aa282
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 *
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
4 * This file is part of FFmpeg.
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
5 *
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
10 *
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
14 * Lesser General Public License for more details.
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
15 *
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
194
3d5efe2de0ae seems i didnt copy anything from aes128.c so this should be more correct ?
michael
parents: 193
diff changeset
19 *
3d5efe2de0ae seems i didnt copy anything from aes128.c so this should be more correct ?
michael
parents: 193
diff changeset
20 * some optimization ideas from aes128.c by Reimar Doeffinger
164
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{
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
27 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
28 uint8_t state[2][4][4];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
29 int rounds;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
30 }AVAES;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
31
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
32 const int av_aes_size= sizeof(AVAES);
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
33
192
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
34 static const uint8_t rcon[10] = {
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
35 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
36 };
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
37
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
38 static uint8_t sbox[256];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
39 static uint8_t inv_sbox[256];
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
40 #ifdef CONFIG_SMALL
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
41 static uint32_t enc_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
42 static uint32_t dec_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
43 #else
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
44 static uint32_t enc_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
45 static uint32_t dec_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
46 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
47
168
8ebd419dcff9 stealing reimars XOR_BLOCK
michael
parents: 167
diff changeset
48 static inline void addkey(uint64_t state[2], uint64_t round_key[2]){
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
49 state[2] = state[0] ^ round_key[0];
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
50 state[3] = state[1] ^ round_key[1];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
51 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
52
213
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
53 static void subshift(uint8_t s0[2][16], int s, uint8_t *box){
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
54 uint8_t (*s1)[16]= s0[0] - s;
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
55 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
56 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
57 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
58 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
59 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
60 }
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
61
181
c7eb2194c9c2 fix CONFIG_SMALL case
michael
parents: 180
diff changeset
62 #define ROT(x,s) ((x<<s)|(x>>(32-s)))
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
63 #if 0
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
64 static inline void mix(uint8_t state[4][4], uint32_t multbl[4][256]){
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
65 int i;
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
66 for(i=0; i<4; i++)
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
67 #ifdef CONFIG_SMALL
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
68 ((uint32_t *)(state))[i] = multbl[0][state[i][0]] ^ ROT(multbl[0][state[i][1]], 8)
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
69 ^ROT(multbl[0][state[i][2]],16) ^ ROT(multbl[0][state[i][3]],24);
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
70 #else
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
71 ((uint32_t *)(state))[i] = multbl[0][state[i][0]] ^ multbl[1][state[i][1]]
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
72 ^multbl[2][state[i][2]] ^ multbl[3][state[i][3]];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
73 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
74 }
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
75 #endif
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
76
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
77 static inline void mix(uint8_t state[2][4][4], uint32_t multbl[4][256], int s1, int s3){
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
78 ((uint32_t *)(state))[0] = multbl[0][state[1][0][0]] ^ multbl[1][state[1][s1 ][1]]
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
79 ^multbl[2][state[1][2][2]] ^ multbl[3][state[1][s3 ][3]];
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
80 ((uint32_t *)(state))[1] = multbl[0][state[1][1][0]] ^ multbl[1][state[1][s3-1][1]]
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
81 ^multbl[2][state[1][3][2]] ^ multbl[3][state[1][s1-1][3]];
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
82 ((uint32_t *)(state))[2] = multbl[0][state[1][2][0]] ^ multbl[1][state[1][s3 ][1]]
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
83 ^multbl[2][state[1][0][2]] ^ multbl[3][state[1][s1 ][3]];
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
84 ((uint32_t *)(state))[3] = multbl[0][state[1][3][0]] ^ multbl[1][state[1][s1-1][1]]
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
85 ^multbl[2][state[1][1][2]] ^ multbl[3][state[1][s3-1][3]];
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
86 }
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
87
191
a2a3c80706e5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
michael
parents: 190
diff changeset
88 static inline void crypt(AVAES *a, int s, uint8_t *sbox, uint32_t *multbl){
210
dd27616bb3fe unused variable
michael
parents: 209
diff changeset
89 int r;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
90
188
969465695c2c make decode look more like encode
michael
parents: 187
diff changeset
91 for(r=a->rounds; r>1; r--){
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
92 addkey(a->state, a->round_key[r]);
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
93 mix(a->state, multbl, 3-s, 1+s);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
94 }
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
95 addkey(a->state, a->round_key[1]);
213
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
96 subshift(a->state[0][0], s, sbox);
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
97 addkey(a->state, a->round_key[0]);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
98 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
99
208
d846d66f99e9 make aes_en/decrypt() static until we decided on the public API
michael
parents: 207
diff changeset
100 static void aes_decrypt(AVAES *a){
191
a2a3c80706e5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
michael
parents: 190
diff changeset
101 crypt(a, 0, inv_sbox, dec_multbl);
a2a3c80706e5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
michael
parents: 190
diff changeset
102 }
a2a3c80706e5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
michael
parents: 190
diff changeset
103
208
d846d66f99e9 make aes_en/decrypt() static until we decided on the public API
michael
parents: 207
diff changeset
104 static void aes_encrypt(AVAES *a){
191
a2a3c80706e5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
michael
parents: 190
diff changeset
105 crypt(a, 2, sbox, enc_multbl);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
106 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
107
195
d36946d9907e fix 2 warnings
michael
parents: 194
diff changeset
108 static void init_multbl2(uint8_t tbl[1024], int c[4], uint8_t *log8, uint8_t *alog8, uint8_t *sbox){
200
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
109 int i, j;
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
110 for(i=0; i<1024; i++){
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
111 int x= sbox[i>>2];
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
112 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
113 }
199
7e2e223f99f2 simplify multiply table init
michael
parents: 198
diff changeset
114 #ifndef CONFIG_SMALL
200
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
115 for(j=256; j<1024; j++)
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
116 for(i=0; i<4; i++)
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
117 tbl[4*j+i]= tbl[4*j + ((i-1)&3) - 1024];
199
7e2e223f99f2 simplify multiply table init
michael
parents: 198
diff changeset
118 #endif
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
119 }
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
120
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
121 // this is based on the reference AES code by Paulo Barreto and Vincent Rijmen
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
122 int av_aes_init(AVAES *a, uint8_t *key, int key_bits, int decrypt) {
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
123 int i, j, t, rconpointer = 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
124 uint8_t tk[8][4];
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
125 int KC= key_bits>>5;
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
126 int rounds= KC + 6;
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
127 uint8_t log8[256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
128 uint8_t alog8[512];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
129
205
0723fdb8d7a8 check the last? entry written for detecting already initalized tables
michael
parents: 204
diff changeset
130 if(!enc_multbl[4][1023]){
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
131 j=1;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
132 for(i=0; i<255; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
133 alog8[i]=
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
134 alog8[i+255]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
135 log8[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
136 j^= j+j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
137 if(j>255) j^= 0x11B;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
138 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
139 for(i=0; i<256; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
140 j= i ? alog8[255-log8[i]] : 0;
165
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
141 j ^= (j<<1) ^ (j<<2) ^ (j<<3) ^ (j<<4);
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
142 j = (j ^ (j>>8) ^ 99) & 255;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
143 inv_sbox[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
144 sbox [i]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
145 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
146 init_multbl2(dec_multbl[0], (int[4]){0xe, 0x9, 0xd, 0xb}, log8, alog8, inv_sbox);
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
147 init_multbl2(enc_multbl[0], (int[4]){0x2, 0x1, 0x1, 0x3}, log8, alog8, sbox);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
148 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
149
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
150 if(key_bits!=128 && key_bits!=192 && key_bits!=256)
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
151 return -1;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
152
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
153 a->rounds= rounds;
166
c7ea70dea191 memleak
michael
parents: 165
diff changeset
154
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
155 memcpy(tk, key, KC*4);
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
156
174
263bbdc10c1e simplify round_key generation by writing over the end but ensuring that theres some irrelevant stuff afterwards
michael
parents: 173
diff changeset
157 for(t= 0; t < (rounds+1)*4;) {
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
158 memcpy(a->round_key[0][t], tk, KC*4);
174
263bbdc10c1e simplify round_key generation by writing over the end but ensuring that theres some irrelevant stuff afterwards
michael
parents: 173
diff changeset
159 t+= KC;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
160
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
161 for(i = 0; i < 4; i++)
173
712b0f43e8ac cosmetics
michael
parents: 172
diff changeset
162 tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
163 tk[0][0] ^= rcon[rconpointer++];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
165 for(j = 1; j < KC; j++){
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
166 if(KC != 8 || j != KC>>1)
175
937928db9781 cosmetic
michael
parents: 174
diff changeset
167 for(i = 0; i < 4; i++) tk[j][i] ^= tk[j-1][i];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
168 else
175
937928db9781 cosmetic
michael
parents: 174
diff changeset
169 for(i = 0; i < 4; i++) tk[j][i] ^= sbox[tk[j-1][i]];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
170 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
171 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
172
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
173 if(decrypt){
190
michael
parents: 189
diff changeset
174 for(i=1; i<rounds; i++){
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
175 uint8_t tmp[2][16];
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
176 memcpy(tmp[1], a->round_key[i][0], 16);
213
e50daf73d26c change subshift a little, this reduces the object size a litlle
michael
parents: 212
diff changeset
177 subshift(tmp[0], 0, sbox);
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
178 memcpy(tmp[1], tmp[0], 16);
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
179 mix(tmp, dec_multbl, 1, 3);
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
180 memcpy(a->round_key[i][0], tmp[0], 16);
190
michael
parents: 189
diff changeset
181 }
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
182 }else{
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
183 for(i=0; i<(rounds+1)>>1; i++){
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
184 for(j=0; j<16; j++)
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
185 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
186 }
187
9b8b17e058a4 dont use encode tables for decoding
michael
parents: 186
diff changeset
187 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
188
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
189 return 0;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
190 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
191
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
192 #ifdef TEST
207
b5ff46799eea move #include log.h into the selftesting code where it belongs
michael
parents: 206
diff changeset
193 #include "log.h"
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
194
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
195 int main(){
195
d36946d9907e fix 2 warnings
michael
parents: 194
diff changeset
196 int i,j;
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
197 AVAES ae, ad, b;
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
198 uint8_t rkey[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
199 {0},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
200 {0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59}};
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
201 uint8_t pt[16], rpt[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
202 {0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad, 0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
203 {0}};
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
204 uint8_t rct[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
205 {0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
206 {0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65}};
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
207
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
208 av_aes_init(&ae, "PI=3.141592654..", 128, 0);
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
209 av_aes_init(&ad, "PI=3.141592654..", 128, 1);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
210 av_log_level= AV_LOG_DEBUG;
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
211
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
212 for(i=0; i<2; i++){
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
213 av_aes_init(&b, rkey[i], 128, 1);
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
214 memcpy(b.state, rct[i], 16);
208
d846d66f99e9 make aes_en/decrypt() static until we decided on the public API
michael
parents: 207
diff changeset
215 aes_decrypt(&b);
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
216 for(j=0; j<16; j++)
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
217 if(rpt[i][j] != b.state[1][0][j])
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
218 av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, rpt[i][j], b.state[1][0][j]);
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
219 }
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
220
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
221 for(i=0; i<10000; i++){
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
222 for(j=0; j<16; j++){
0b829d22e97b init multbl
michael
parents: 177
diff changeset
223 pt[j]= random();
0b829d22e97b init multbl
michael
parents: 177
diff changeset
224 }
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
225 memcpy(ae.state, pt, 16);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
226 {START_TIMER
208
d846d66f99e9 make aes_en/decrypt() static until we decided on the public API
michael
parents: 207
diff changeset
227 aes_encrypt(&ae);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
228 if(!(i&(i-1)))
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
229 av_log(NULL, AV_LOG_ERROR, "%02X %02X %02X %02X\n", ae.state[1][0][0], ae.state[1][1][1], ae.state[1][2][2], ae.state[1][3][3]);
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
230 memcpy(ad.state[0], ae.state[1], 16);
208
d846d66f99e9 make aes_en/decrypt() static until we decided on the public API
michael
parents: 207
diff changeset
231 aes_decrypt(&ad);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
232 STOP_TIMER("aes")}
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
233 for(j=0; j<16; j++){
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
234 if(pt[j] != ad.state[1][0][j]){
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
235 av_log(NULL, AV_LOG_ERROR, "%d %d %02X %02X\n", i,j, pt[j], ad.state[1][0][j]);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
236 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
237 }
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
238 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
239 return 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
240 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
241 #endif