Commit Graph

54 Commits

Author SHA1 Message Date
Baptiste Coudurier
57d7b036ea make key parameter const
Originally committed as revision 7935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-11 16:57:17 +00:00
Michael Niedermayer
ca2560dff6 10l (aes_crypt -> av_aes_crypt)
Originally committed as revision 7559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 00:49:48 +00:00
Michael Niedermayer
97f6d1545e fix CONFIG_SMALL again
Originally committed as revision 7554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:50:49 +00:00
Michael Niedermayer
5d1b539348 30byte smaller object file
Originally committed as revision 7553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:30:43 +00:00
Michael Niedermayer
97e3458c46 cbc support
Originally committed as revision 7550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:08:52 +00:00
Michael Niedermayer
2d3475ae6a avoid memcpy()
Originally committed as revision 7549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:58:11 +00:00
Michael Niedermayer
7465619af8 give crypt a src and dst
same speed, 100bytes larger object file

Originally committed as revision 7548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:51:54 +00:00
Michael Niedermayer
b0642c7409 change subshift a little, this reduces the object size a litlle
Originally committed as revision 7546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:40:40 +00:00
Michael Niedermayer
298dd6b7c8 use 2 state arrays so that fewer temporary variables are needed
Originally committed as revision 7545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:17:05 +00:00
Michael Niedermayer
cc6b4da83a remove useless parameter
Originally committed as revision 7544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 16:29:01 +00:00
Michael Niedermayer
14bc38498a unused variable
Originally committed as revision 7543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 16:24:43 +00:00
Michael Niedermayer
1aa72a703c merge shift into mix
this need -fno-strict-aliasing to work (needs to be fixed of course)

Originally committed as revision 7534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 13:45:48 +00:00
Michael Niedermayer
1f83576b48 make aes_en/decrypt() static until we decided on the public API
Originally committed as revision 7533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 10:37:34 +00:00
Michael Niedermayer
0d80bd2f56 move #include log.h into the selftesting code where it belongs
Originally committed as revision 7529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:33:56 +00:00
Michael Niedermayer
6572e1a4d2 remove dependancy on *malloc()
Originally committed as revision 7528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:32:06 +00:00
Michael Niedermayer
347c27988d check the last? entry written for detecting already initalized tables
Originally committed as revision 7527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:05:40 +00:00
Michael Niedermayer
96b103086e replace / by >> this makes the .o ~150 bytes smaller
Originally committed as revision 7525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:01:56 +00:00
Michael Niedermayer
e42244e9df cosmetic
Originally committed as revision 7524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 00:55:51 +00:00
Michael Niedermayer
597e3232ef simplify
Originally committed as revision 7504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:40:21 +00:00
Michael Niedermayer
7200f5d054 simplify multiply table init
Originally committed as revision 7503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:30:54 +00:00
Michael Niedermayer
d65dc0cdc6 simplify selftest
Originally committed as revision 7501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:20:15 +00:00
Michael Niedermayer
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
Michael Niedermayer
8d4ae47c3f simplify
Originally committed as revision 7499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:03:15 +00:00
Michael Niedermayer
1b10524312 fix 2 warnings
Originally committed as revision 7498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:58:41 +00:00
Michael Niedermayer
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
Michael Niedermayer
c2fd2b20e5 unneeded
Originally committed as revision 7496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:45:27 +00:00
Michael Niedermayer
a6e923c9db unused think
Originally committed as revision 7495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:41:57 +00:00
Michael Niedermayer
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
Michael Niedermayer
28b5123546 indent
Originally committed as revision 7493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:24:34 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
179dc91160 unused stuff removial
Originally committed as revision 7488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:51:09 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
2592438dd8 1 test vector
Originally committed as revision 7483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 17:43:45 +00:00
Michael Niedermayer
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
Michael Niedermayer
388b5e69ec simplify special round
Originally committed as revision 7481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:49:35 +00:00
Michael Niedermayer
cf5773e95f benchmark
Originally committed as revision 7480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:45:34 +00:00
Michael Niedermayer
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
Michael Niedermayer
b58ecac647 ascii
Originally committed as revision 7478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:19:51 +00:00
Michael Niedermayer
b1e5c29485 cosmetic
Originally committed as revision 7472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:47:15 +00:00
Michael Niedermayer
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
Michael Niedermayer
84c72fb129 cosmetics
Originally committed as revision 7470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:38:10 +00:00
Michael Niedermayer
7acc1a27bc memcpy
Originally committed as revision 7469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:37:19 +00:00
Michael Niedermayer
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
Michael Niedermayer
12d6a1c813 copyright fix
Originally committed as revision 7467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:16:29 +00:00
Michael Niedermayer
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
Michael Niedermayer
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