annotate aes.c @ 976:0a6c0fb069d2 libavutil

aes: fix array index out of bounds warning
author mru
date Sun, 04 Jul 2010 20:38:46 +0000
parents 90ee1cca76a2
children
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
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
26 typedef union {
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
27 uint64_t u64[2];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
28 uint32_t u32[4];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
29 uint8_t u8x4[4][4];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
30 uint8_t u8[16];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
31 } av_aes_block;
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
32
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
33 typedef struct AVAES{
368
99c56fd6e3f4 Document aes init code writing on purpose beyond round_key array into state array.
reimar
parents: 354
diff changeset
34 // 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
35 // overwrites state, which does not matter (see also r7471).
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
36 av_aes_block round_key[15];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
37 av_aes_block state[2];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
38 int rounds;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
39 }AVAES;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
40
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
41 const int av_aes_size= sizeof(AVAES);
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
42
192
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
43 static const uint8_t rcon[10] = {
7787c6fb07e1 unused think
michael
parents: 191
diff changeset
44 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
45 };
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
46
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
47 static uint8_t sbox[256];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
48 static uint8_t inv_sbox[256];
603
880c6441f56a Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 423
diff changeset
49 #if CONFIG_SMALL
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
50 static uint32_t enc_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
51 static uint32_t dec_multbl[1][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
52 #else
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
53 static uint32_t enc_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
54 static uint32_t dec_multbl[4][256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
55 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
56
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
57 static inline void addkey(av_aes_block *dst, const av_aes_block *src, const av_aes_block *round_key){
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
58 dst->u64[0] = src->u64[0] ^ round_key->u64[0];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
59 dst->u64[1] = src->u64[1] ^ round_key->u64[1];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
60 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
61
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
62 static void subshift(av_aes_block s0[2], int s, const uint8_t *box){
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
63 av_aes_block *s1= (av_aes_block *)(s0[0].u8 - s);
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
64 av_aes_block *s3= (av_aes_block *)(s0[0].u8 + s);
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
65 s0[0].u8[0]=box[s0[1].u8[ 0]]; s0[0].u8[ 4]=box[s0[1].u8[ 4]]; s0[0].u8[ 8]=box[s0[1].u8[ 8]]; s0[0].u8[12]=box[s0[1].u8[12]];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
66 s1[0].u8[3]=box[s1[1].u8[ 7]]; s1[0].u8[ 7]=box[s1[1].u8[11]]; s1[0].u8[11]=box[s1[1].u8[15]]; s1[0].u8[15]=box[s1[1].u8[ 3]];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
67 s0[0].u8[2]=box[s0[1].u8[10]]; s0[0].u8[10]=box[s0[1].u8[ 2]]; s0[0].u8[ 6]=box[s0[1].u8[14]]; s0[0].u8[14]=box[s0[1].u8[ 6]];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
68 s3[0].u8[1]=box[s3[1].u8[13]]; s3[0].u8[13]=box[s3[1].u8[ 9]]; s3[0].u8[ 9]=box[s3[1].u8[ 5]]; s3[0].u8[ 5]=box[s3[1].u8[ 1]];
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
69 }
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
70
953
567489a515b2 Use a consistent type for multbl array function parameters.
reimar
parents: 726
diff changeset
71 static inline int mix_core(uint32_t multbl[][256], int a, int b, int c, int d){
603
880c6441f56a Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 423
diff changeset
72 #if CONFIG_SMALL
220
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
73 #define ROT(x,s) ((x<<s)|(x>>(32-s)))
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
74 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
75 #else
220
b842bcbc6880 fix CONFIG_SMALL again
michael
parents: 219
diff changeset
76 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
77 #endif
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
78 }
209
42e62ac3b2ba merge shift into mix
michael
parents: 208
diff changeset
79
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
80 static inline void mix(av_aes_block state[2], uint32_t multbl[][256], int s1, int s3){
974
90ee1cca76a2 Make mix function more readable.
reimar
parents: 955
diff changeset
81 uint8_t (*src)[4] = state[1].u8x4;
90ee1cca76a2 Make mix function more readable.
reimar
parents: 955
diff changeset
82 state[0].u32[0] = mix_core(multbl, src[0][0], src[s1 ][1], src[2][2], src[s3 ][3]);
90ee1cca76a2 Make mix function more readable.
reimar
parents: 955
diff changeset
83 state[0].u32[1] = mix_core(multbl, src[1][0], src[s3-1][1], src[3][2], src[s1-1][3]);
90ee1cca76a2 Make mix function more readable.
reimar
parents: 955
diff changeset
84 state[0].u32[2] = mix_core(multbl, src[2][0], src[s3 ][1], src[0][2], src[s1 ][3]);
90ee1cca76a2 Make mix function more readable.
reimar
parents: 955
diff changeset
85 state[0].u32[3] = mix_core(multbl, src[3][0], src[s1-1][1], src[1][2], src[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
953
567489a515b2 Use a consistent type for multbl array function parameters.
reimar
parents: 726
diff changeset
88 static inline void crypt(AVAES *a, int s, const uint8_t *sbox, uint32_t multbl[][256]){
210
dd27616bb3fe unused variable
michael
parents: 209
diff changeset
89 int r;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
90
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
91 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
92 mix(a->state, multbl, 3-s, 1+s);
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
93 addkey(&a->state[1], &a->state[0], &a->round_key[r]);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
94 }
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
95 subshift(&a->state[0], s, sbox);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
96 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
97
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
98 void av_aes_crypt(AVAES *a, uint8_t *dst_, const uint8_t *src_, int count, uint8_t *iv_, int decrypt){
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
99 av_aes_block *dst = (av_aes_block *)dst_;
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
100 const av_aes_block *src = (const av_aes_block *)src_;
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
101 av_aes_block *iv = (av_aes_block *)iv_;
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
102 while(count--){
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
103 addkey(&a->state[1], src, &a->round_key[a->rounds]);
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
104 if(decrypt) {
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
105 crypt(a, 0, inv_sbox, dec_multbl);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
106 if(iv){
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
107 addkey(&a->state[0], &a->state[0], iv);
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
108 memcpy(iv, src, 16);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
109 }
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
110 addkey(dst, &a->state[0], &a->round_key[0]);
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
111 }else{
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
112 if(iv) addkey(&a->state[1], &a->state[1], iv);
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
113 crypt(a, 2, sbox, enc_multbl);
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
114 addkey(dst, &a->state[0], &a->round_key[0]);
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
115 if(iv) memcpy(iv, dst, 16);
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
116 }
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
117 src++;
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
118 dst++;
216
1c3c3b1b9596 cbc support
michael
parents: 215
diff changeset
119 }
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
120 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
121
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
122 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
123 int i, j;
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
124 for(i=0; i<1024; i++){
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
125 int x= sbox[i>>2];
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
126 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
127 }
603
880c6441f56a Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 423
diff changeset
128 #if !CONFIG_SMALL
200
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
129 for(j=256; j<1024; j++)
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
130 for(i=0; i<4; i++)
5f59ab1a1258 simplify
michael
parents: 199
diff changeset
131 tbl[4*j+i]= tbl[4*j + ((i-1)&3) - 1024];
199
7e2e223f99f2 simplify multiply table init
michael
parents: 198
diff changeset
132 #endif
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
133 }
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
134
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
135 // 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
136 int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) {
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
137 int i, j, t, rconpointer = 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
138 uint8_t tk[8][4];
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
139 int KC= key_bits>>5;
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
140 int rounds= KC + 6;
169
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
141 uint8_t log8[256];
94bd7a8efb06 stealing multbl trick from reimar
michael
parents: 168
diff changeset
142 uint8_t alog8[512];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
143
976
0a6c0fb069d2 aes: fix array index out of bounds warning
mru
parents: 974
diff changeset
144 if(!enc_multbl[FF_ARRAY_ELEMS(enc_multbl)-1][FF_ARRAY_ELEMS(enc_multbl[0])-1]){
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
145 j=1;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
146 for(i=0; i<255; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
147 alog8[i]=
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
148 alog8[i+255]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
149 log8[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
150 j^= j+j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
151 if(j>255) j^= 0x11B;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
152 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
153 for(i=0; i<256; i++){
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
154 j= i ? alog8[255-log8[i]] : 0;
165
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
155 j ^= (j<<1) ^ (j<<2) ^ (j<<3) ^ (j<<4);
d64f200afe17 simplify sbox init
michael
parents: 164
diff changeset
156 j = (j ^ (j>>8) ^ 99) & 255;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
157 inv_sbox[j]= i;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
158 sbox [i]= j;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
159 }
635
0a51400a64c9 Add "const" to AES function arguments where possible without generating
reimar
parents: 603
diff changeset
160 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
161 init_multbl2(enc_multbl[0], (const int[4]){0x2, 0x1, 0x1, 0x3}, log8, alog8, sbox);
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
162 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
163
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
164 if(key_bits!=128 && key_bits!=192 && key_bits!=256)
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
165 return -1;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
166
167
6104bbdb757b cosmetic
michael
parents: 166
diff changeset
167 a->rounds= rounds;
166
c7ea70dea191 memleak
michael
parents: 165
diff changeset
168
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
169 memcpy(tk, key, KC*4);
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
170
219
26de83603cfa 30byte smaller object file
michael
parents: 216
diff changeset
171 for(t= 0; t < (rounds+1)*16;) {
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
172 memcpy(a->round_key[0].u8+t, tk, KC*4);
219
26de83603cfa 30byte smaller object file
michael
parents: 216
diff changeset
173 t+= KC*4;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
174
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
175 for(i = 0; i < 4; i++)
173
712b0f43e8ac cosmetics
michael
parents: 172
diff changeset
176 tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
177 tk[0][0] ^= rcon[rconpointer++];
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
178
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
179 for(j = 1; j < KC; j++){
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
180 if(KC != 8 || j != KC>>1)
175
937928db9781 cosmetic
michael
parents: 174
diff changeset
181 for(i = 0; i < 4; i++) tk[j][i] ^= tk[j-1][i];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
182 else
175
937928db9781 cosmetic
michael
parents: 174
diff changeset
183 for(i = 0; i < 4; i++) tk[j][i] ^= sbox[tk[j-1][i]];
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
184 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
185 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
186
189
61ca39abb491 remove duplicate round_key
michael
parents: 188
diff changeset
187 if(decrypt){
190
michael
parents: 189
diff changeset
188 for(i=1; i<rounds; i++){
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
189 av_aes_block tmp[3];
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
190 memcpy(&tmp[2], &a->round_key[i], 16);
954
2b38811998d1 Pass subshift an argument of the proper type.
reimar
parents: 953
diff changeset
191 subshift(&tmp[1], 0, sbox);
212
d31d4880105e use 2 state arrays so that fewer temporary variables are needed
michael
parents: 211
diff changeset
192 mix(tmp, dec_multbl, 1, 3);
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
193 memcpy(&a->round_key[i], &tmp[0], 16);
190
michael
parents: 189
diff changeset
194 }
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
195 }else{
204
b7ac7733b2f4 replace / by >> this makes the .o ~150 bytes smaller
michael
parents: 203
diff changeset
196 for(i=0; i<(rounds+1)>>1; i++){
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
197 for(j=0; j<16; j++)
955
040bf8859042 Chnage AES code to be strict-aliasing-safe.
reimar
parents: 954
diff changeset
198 FFSWAP(int, a->round_key[i].u8[j], a->round_key[rounds-i].u8[j]);
197
a0010ccdc817 revert simplification (broke 192 bit keys)
michael
parents: 196
diff changeset
199 }
187
9b8b17e058a4 dont use encode tables for decoding
michael
parents: 186
diff changeset
200 }
184
9e5f4c7246cc merge inv_sbox into inv_mix
michael
parents: 183
diff changeset
201
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
202 return 0;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
203 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
204
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
205 #ifdef TEST
701
ae6e96434bec Replace random() usage in test programs by av_lfg_*().
diego
parents: 698
diff changeset
206 #include "lfg.h"
207
b5ff46799eea move #include log.h into the selftesting code where it belongs
michael
parents: 206
diff changeset
207 #include "log.h"
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
208
404
f9a4c04ebb0e main() --> main(void)
diego
parents: 368
diff changeset
209 int main(void){
195
d36946d9907e fix 2 warnings
michael
parents: 194
diff changeset
210 int i,j;
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
211 AVAES ae, ad, b;
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
212 uint8_t rkey[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
213 {0},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
214 {0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59}};
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
215 uint8_t pt[16], rpt[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
216 {0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad, 0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
217 {0}};
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
218 uint8_t rct[2][16]= {
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
219 {0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf},
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
220 {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
221 uint8_t temp[16];
726
5d344280a1f8 cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 701
diff changeset
222 AVLFG prng;
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
223
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
224 av_aes_init(&ae, "PI=3.141592654..", 128, 0);
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
225 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
226 av_log_set_level(AV_LOG_DEBUG);
726
5d344280a1f8 cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 701
diff changeset
227 av_lfg_init(&prng, 1);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
228
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
229 for(i=0; i<2; i++){
206
cd7c6ff2132c remove dependancy on *malloc()
michael
parents: 205
diff changeset
230 av_aes_init(&b, rkey[i], 128, 1);
221
6ff860ccdcff 10l (aes_crypt -> av_aes_crypt)
michael
parents: 220
diff changeset
231 av_aes_crypt(&b, temp, rct[i], 1, NULL, 1);
198
2677cc2d1ff7 simplify selftest
michael
parents: 197
diff changeset
232 for(j=0; j<16; j++)
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
233 if(rpt[i][j] != temp[j])
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
234 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
235 }
183
1e8447171ebd merge sbox with mix on the encryption side
michael
parents: 182
diff changeset
236
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
237 for(i=0; i<10000; i++){
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
238 for(j=0; j<16; j++){
726
5d344280a1f8 cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 701
diff changeset
239 pt[j] = av_lfg_get(&prng);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
240 }
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
241 {START_TIMER
221
6ff860ccdcff 10l (aes_crypt -> av_aes_crypt)
michael
parents: 220
diff changeset
242 av_aes_crypt(&ae, temp, pt, 1, NULL, 0);
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
243 if(!(i&(i-1)))
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
244 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
245 av_aes_crypt(&ad, temp, temp, 1, NULL, 1);
179
14df4d6d42f4 benchmark
michael
parents: 178
diff changeset
246 STOP_TIMER("aes")}
178
0b829d22e97b init multbl
michael
parents: 177
diff changeset
247 for(j=0; j<16; j++){
214
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
248 if(pt[j] != temp[j]){
db327a8aa282 give crypt a src and dst
michael
parents: 213
diff changeset
249 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
250 }
0b829d22e97b init multbl
michael
parents: 177
diff changeset
251 }
164
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
252 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
253 return 0;
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
254 }
f45907fe2530 aes support (unfinished)
michael
parents:
diff changeset
255 #endif