annotate aes.c @ 195:d36946d9907e libavutil

fix 2 warnings
author michael
date Sun, 14 Jan 2007 19:58:41 +0000
parents 3d5efe2de0ae
children b1ad10c8f362
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 "log.h"
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
25 #include "aes.h"
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
26
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
27 typedef struct AVAES{
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
28 uint8_t round_key[15][4][4];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
29 uint8_t state[4][4];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
30 int rounds;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
31 }AVAES;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
32
192
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
33 static const uint8_t rcon[10] = {
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
34 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
35 };
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
36
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
37 static uint8_t sbox[256];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
38 static uint8_t inv_sbox[256];
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
39 #ifdef CONFIG_SMALL
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
40 static uint32_t enc_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
41 static uint32_t dec_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
42 #else
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
43 static uint32_t enc_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
44 static uint32_t dec_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
45 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
46
168
8ebd419dcff9 stealing reimars XOR_BLOCK
michael
parents: 167
diff changeset
47 static inline void addkey(uint64_t state[2], uint64_t round_key[2]){
8ebd419dcff9 stealing reimars XOR_BLOCK
michael
parents: 167
diff changeset
48 state[0] ^= round_key[0];
8ebd419dcff9 stealing reimars XOR_BLOCK
michael
parents: 167
diff changeset
49 state[1] ^= round_key[1];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
50 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
51
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
52 #define SUBSHIFT0(s, box) s[0]=box[s[ 0]]; s[ 4]=box[s[ 4]]; s[ 8]=box[s[ 8]]; s[12]=box[s[12]];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
53 #define SUBSHIFT1(s, box) t=s[0]; s[0]=box[s[ 4]]; s[ 4]=box[s[ 8]]; s[ 8]=box[s[12]]; s[12]=box[t];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
54 #define SUBSHIFT2(s, box) t=s[0]; s[0]=box[s[ 8]]; s[ 8]=box[ t]; t=s[ 4]; s[ 4]=box[s[12]]; s[12]=box[t];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
55 #define SUBSHIFT3(s, box) t=s[0]; s[0]=box[s[12]]; s[12]=box[s[ 8]]; s[ 8]=box[s[ 4]]; s[ 4]=box[t];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
56
185
d9e0ba529059 unused stuff removial
michael
parents: 184
diff changeset
57 #define SUBSHIFT1x(s) t=s[0]; s[0]=s[ 4]; s[ 4]=s[ 8]; s[ 8]=s[12]; s[12]=t;
d9e0ba529059 unused stuff removial
michael
parents: 184
diff changeset
58 #define SUBSHIFT2x(s) t=s[0]; s[0]=s[ 8]; s[ 8]= t; t=s[ 4]; s[ 4]=s[12]; s[12]=t;
d9e0ba529059 unused stuff removial
michael
parents: 184
diff changeset
59 #define SUBSHIFT3x(s) t=s[0]; s[0]=s[12]; s[12]=s[ 8]; s[ 8]=s[ 4]; s[ 4]=t;
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
60
181
c7eb2194c9c2 fix CONFIG_SMALL case
michael
parents: 180
diff changeset
61 #define ROT(x,s) ((x<<s)|(x>>(32-s)))
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
62
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
63 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
64 int i;
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
65 for(i=0; i<4; i++)
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
66 #ifdef CONFIG_SMALL
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
67 ((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
68 ^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
69
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 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
75
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
76 static inline void crypt(AVAES *a, int s, uint8_t *sbox, uint32_t *multbl){
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
77 int t, r;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
78
188
969465695c2c make decode look more like encode
michael
parents: 187
diff changeset
79 for(r=a->rounds; r>1; r--){
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
80 addkey(a->state, a->round_key[r]);
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
81 SUBSHIFT3x((a->state[0]+1+s))
185
d9e0ba529059 unused stuff removial
michael
parents: 184
diff changeset
82 SUBSHIFT2x((a->state[0]+2))
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
83 SUBSHIFT1x((a->state[0]+3-s))
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
84 mix(a->state, multbl);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
85 }
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
86 addkey(a->state, a->round_key[1]);
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
87 SUBSHIFT0((a->state[0]+0 ), sbox)
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 SUBSHIFT3((a->state[0]+1+s), sbox)
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
89 SUBSHIFT2((a->state[0]+2 ), sbox)
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
90 SUBSHIFT1((a->state[0]+3-s), sbox)
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
91 addkey(a->state, a->round_key[0]);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
92 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
93
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
94 void av_aes_decrypt(AVAES *a){
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
95 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
96 }
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
97
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
98 void av_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
99 crypt(a, 2, sbox, enc_multbl);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
100 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
101
195
d36946d9907e fix 2 warnings
michael
parents: 194
diff changeset
102 static void init_multbl2(uint8_t tbl[1024], int c[4], uint8_t *log8, uint8_t *alog8, uint8_t *sbox){
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
103 int i;
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
104 for(i=0; i<1024; i++){
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
105 int x= sbox[i/4];
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
106 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
107 }
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
108 }
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
109
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
110
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
111 // this is based on the reference AES code by Paulo Barreto and Vincent Rijmen
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
112 AVAES *av_aes_init(uint8_t *key, int key_bits, int decrypt) {
166
c7ea70dea191 memleak
michael
parents: 165
diff changeset
113 AVAES *a;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
114 int i, j, t, rconpointer = 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
115 uint8_t tk[8][4];
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
116 int KC= key_bits/32;
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
117 int rounds= KC + 6;
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
118 uint8_t log8[256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
119 uint8_t alog8[512];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
120
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
121 if(!sbox[255]){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
122 j=1;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
123 for(i=0; i<255; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
124 alog8[i]=
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
125 alog8[i+255]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
126 log8[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
127 j^= j+j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
128 if(j>255) j^= 0x11B;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
129 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
130 for(i=0; i<256; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
131 j= i ? alog8[255-log8[i]] : 0;
165
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
132 j ^= (j<<1) ^ (j<<2) ^ (j<<3) ^ (j<<4);
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
133 j = (j ^ (j>>8) ^ 99) & 255;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
134 inv_sbox[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
135 sbox [i]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
136 // av_log(NULL, AV_LOG_ERROR, "%d, ", log8[i]);
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
137 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
138 init_multbl2(dec_multbl[0], (int[4]){0xe, 0x9, 0xd, 0xb}, log8, alog8, inv_sbox);
181
c7eb2194c9c2 fix CONFIG_SMALL case
michael
parents: 180
diff changeset
139 #ifndef CONFIG_SMALL
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
140 init_multbl2(dec_multbl[1], (int[4]){0xb, 0xe, 0x9, 0xd}, log8, alog8, inv_sbox);
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
141 init_multbl2(dec_multbl[2], (int[4]){0xd, 0xb, 0xe, 0x9}, log8, alog8, inv_sbox);
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
142 init_multbl2(dec_multbl[3], (int[4]){0x9, 0xd, 0xb, 0xe}, log8, alog8, inv_sbox);
181
c7eb2194c9c2 fix CONFIG_SMALL case
michael
parents: 180
diff changeset
143 #endif
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
144 init_multbl2(enc_multbl[0], (int[4]){0x2, 0x1, 0x1, 0x3}, log8, alog8, sbox);
181
c7eb2194c9c2 fix CONFIG_SMALL case
michael
parents: 180
diff changeset
145 #ifndef CONFIG_SMALL
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
146 init_multbl2(enc_multbl[1], (int[4]){0x3, 0x2, 0x1, 0x1}, log8, alog8, sbox);
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
147 init_multbl2(enc_multbl[2], (int[4]){0x1, 0x3, 0x2, 0x1}, log8, alog8, sbox);
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
148 init_multbl2(enc_multbl[3], (int[4]){0x1, 0x1, 0x3, 0x2}, log8, alog8, sbox);
181
c7eb2194c9c2 fix CONFIG_SMALL case
michael
parents: 180
diff changeset
149 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
150 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
151
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
152 if(key_bits!=128 && key_bits!=192 && key_bits!=256)
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
153 return NULL;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
154
166
c7ea70dea191 memleak
michael
parents: 165
diff changeset
155 a= av_malloc(sizeof(AVAES));
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
174
263bbdc10c1e simplify round_key generation by writing over the end but ensuring that theres some irrelevant stuff afterwards
michael
parents: 173
diff changeset
160 for(t= 0; t < (rounds+1)*4;) {
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
161 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
162 t+= KC;
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++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
169 if(KC != 8 || j != KC/2)
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++){
michael
parents: 189
diff changeset
178 for(j=0; j<16; j++)
michael
parents: 189
diff changeset
179 a->round_key[i][0][j]= sbox[a->round_key[i][0][j]];
michael
parents: 189
diff changeset
180 mix(a->round_key[i], dec_multbl);
michael
parents: 189
diff changeset
181 }
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
182 }else{
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
183 for(i=0; i<(rounds+1)/2; i++){
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
184 for(j=0; j<16; j++)
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
185 FFSWAP(int, a->round_key[i][0][j], a->round_key[rounds-i][0][j]);
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
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
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
189 return a;
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
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
193
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
194 int main(){
195
d36946d9907e fix 2 warnings
michael
parents: 194
diff changeset
195 int i,j;
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
196 AVAES *ae= av_aes_init("PI=3.141592654..", 128, 0);
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
197 AVAES *ad= av_aes_init("PI=3.141592654..", 128, 1);
182
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
198 uint8_t zero[16]= {0};
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
199 uint8_t pt[16]= {0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad, 0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3};
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
200 uint8_t ct[16]= {0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf};
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
201 AVAES *b= av_aes_init(zero, 128, 1);
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
202
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
203 /* uint8_t key[16]= {0x42, 0x78, 0xb8, 0x40, 0xfb, 0x44, 0xaa, 0xa7, 0x57, 0xc1, 0xbf, 0x04, 0xac, 0xbe, 0x1a, 0x3e};
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
204 uint8_t IV[16] = {0x57, 0xf0, 0x2a, 0x5c, 0x53, 0x39, 0xda, 0xeb, 0x0a, 0x29, 0x08, 0xa0, 0x6a, 0xc6, 0x39, 0x3f};
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
205 uint8_t pt[16] = {0x3c, 0x88, 0x8b, 0xbb, 0xb1, 0xa8, 0xeb, 0x9f, 0x3e, 0x9b, 0x87, 0xac, 0xaa, 0xd9, 0x86, 0xc4};
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
206 // 66e2f7071c83083b8a557971918850e5
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
207 uint8_t ct[16] = {0x47, 0x9c, 0x89, 0xec, 0x14, 0xbc, 0x98, 0x99, 0x4e, 0x62, 0xb2, 0xc7, 0x05, 0xb5, 0x0, 0x14e};
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
208 // 175bd7832e7e60a1e92aac568a861eb7*/
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
209 uint8_t ckey[16]= {0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59};
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
210 uint8_t cct[16] = {0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65};
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
211 AVAES *c= av_aes_init(ckey, 128, 1);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
212
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
213 av_log_level= AV_LOG_DEBUG;
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
214
182
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
215 memcpy(b->state, ct, 16);
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
216 av_aes_decrypt(b);
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
217 for(j=0; j<16; j++)
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
218 if(pt[j] != b->state[0][j]){
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
219 av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, pt[j], b->state[0][j]);
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
220 }
8a1a8491a81b 1 test vector
michael
parents: 181
diff changeset
221
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
222 memcpy(c->state, cct, 16);
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
223 av_aes_decrypt(c);
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
224 for(j=0; j<16; j++)
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
225 if(zero[j] != c->state[0][j]){
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
226 av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, zero[j], c->state[0][j]);
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
227 }
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
228
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
229 for(i=0; i<10000; i++){
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
230 for(j=0; j<16; j++){
0b829d22e97b init multbl
michael
parents: 177
diff changeset
231 pt[j]= random();
0b829d22e97b init multbl
michael
parents: 177
diff changeset
232 }
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
233 memcpy(ae->state, pt, 16);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
234 {START_TIMER
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
235 av_aes_encrypt(ae);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
236 if(!(i&(i-1)))
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
237 av_log(NULL, AV_LOG_ERROR, "%02X %02X %02X %02X\n", ae->state[0][0], ae->state[1][1], ae->state[2][2], ae->state[3][3]);
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
238 memcpy(ad->state, ae->state, 16);
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
239 av_aes_decrypt(ad);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
240 STOP_TIMER("aes")}
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
241 for(j=0; j<16; j++){
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
242 if(pt[j] != ad->state[0][j]){
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
243 av_log(NULL, AV_LOG_ERROR, "%d %d %02X %02X\n", i,j, pt[j], ad->state[0][j]);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
244 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
245 }
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
246 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
247 return 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
248 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
249 #endif