84 Commits

Author SHA1 Message Date
d65dc0cdc6 simplify selftest
Originally committed as revision 7501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:20:15 +00:00
f25b650a5b revert simplification (broke 192 bit keys)
Originally committed as revision 7500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:13:14 +00:00
8d4ae47c3f simplify
Originally committed as revision 7499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:03:15 +00:00
1b10524312 fix 2 warnings
Originally committed as revision 7498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:58:41 +00:00
034f5fbaf2 seems i didnt copy anything from aes128.c so this should be more correct ?
Originally committed as revision 7497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:51:23 +00:00
c2fd2b20e5 unneeded
Originally committed as revision 7496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:45:27 +00:00
a6e923c9db unused think
Originally committed as revision 7495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:41:57 +00:00
0c5d2819a5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
Originally committed as revision 7494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:39:38 +00:00
28b5123546 indent
Originally committed as revision 7493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:24:34 +00:00
954bd264c1 remove duplicate round_key
one context is now either for encoding or decoding (makes more sense in reality too)

Originally committed as revision 7492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:24:06 +00:00
54b78b2495 make decode look more like encode
Originally committed as revision 7491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:02:59 +00:00
cc85897055 dont use encode tables for decoding
Originally committed as revision 7490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:01:17 +00:00
73374bf4d0 remove no longer corret comment
Originally committed as revision 7489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:58:45 +00:00
179dc91160 unused stuff removial
Originally committed as revision 7488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:51:09 +00:00
f12cf3d215 merge inv_sbox into inv_mix
Originally committed as revision 7487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:47:01 +00:00
0458e79074 merge sbox with mix on the encryption side
add one more test vector

yes this needs a cleanup ...

Originally committed as revision 7485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:17:45 +00:00
2592438dd8 1 test vector
Originally committed as revision 7483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 17:43:45 +00:00
95d1236bf5 fix CONFIG_SMALL case
Originally committed as revision 7482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 17:19:04 +00:00
388b5e69ec simplify special round
Originally committed as revision 7481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:49:35 +00:00
cf5773e95f benchmark
Originally committed as revision 7480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:45:34 +00:00
ff8f659429 init multbl
code can now decrypt its own encryption correctly
can anyone provide me with a correct test AES key + cyphertext + plaintext?

Originally committed as revision 7479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:43:32 +00:00
b58ecac647 ascii
Originally committed as revision 7478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:19:51 +00:00
b1e5c29485 cosmetic
Originally committed as revision 7472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:47:15 +00:00
ba554c025e simplify round_key generation by writing over the end but ensuring that theres some irrelevant stuff afterwards
Originally committed as revision 7471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:46:20 +00:00
84c72fb129 cosmetics
Originally committed as revision 7470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:38:10 +00:00
7acc1a27bc memcpy
Originally committed as revision 7469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:37:19 +00:00
1070eba2a2 seems the larger rcon values are never accessed
Originally committed as revision 7468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:30:37 +00:00
12d6a1c813 copyright fix
Originally committed as revision 7467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:16:29 +00:00
cd0968c4ca stealing multbl trick from reimar
Originally committed as revision 7466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:15:26 +00:00
e8fc93136d stealing reimars XOR_BLOCK
Originally committed as revision 7464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 12:40:32 +00:00
d43a297579 cosmetic
Originally committed as revision 7463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:27:11 +00:00
eade86e2f5 memleak
Originally committed as revision 7462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:25:52 +00:00
2c3427eb2a simplify sbox init
Originally committed as revision 7461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:14:05 +00:00
3306dfd544 aes support (unfinished)
Originally committed as revision 7460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:06:13 +00:00