Statistics
| Branch: | Revision:

ffmpeg / libavutil / aes.c @ 19c039ee

History | View | Annotate | Download (8.44 KB)

# Date Author Comment
19c039ee 07/02/2010 05:33 PM Reimar Döffinger

Make mix function more readable.
Compiler output unchanged with gcc 4.4.

Originally committed as revision 24006 to svn://svn.ffmpeg.org/ffmpeg/trunk
dd025f25 06/30/2010 04:50 AM Reimar Döffinger

Change AES code to be strict-aliasing-safe.
Makes it give correct results with e.g. gcc 4.4.
For unknown reasons the generate asm code also changes
on e.g. gcc 4.3, making the code a bit larger but also
a bit faster.

Originally committed as revision 23896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2ad4a3bc 06/28/2010 05:19 PM Reimar Döffinger

Pass subshift an argument of the proper type.
No changes in generated code.

Originally committed as revision 23856 to svn://svn.ffmpeg.org/ffmpeg/trunk
17c78b08 06/28/2010 05:11 PM Reimar Döffinger

Use a consistent type for multbl array function parameters.

Originally committed as revision 23855 to svn://svn.ffmpeg.org/ffmpeg/trunk
64bde197 04/10/2009 05:23 PM Diego Biurrun

cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).

Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
294eaa26 03/20/2009 11:48 AM Diego Biurrun

Replace random() usage in test programs by av_lfg_*().

Originally committed as revision 18070 to svn://svn.ffmpeg.org/ffmpeg/trunk
b56e34c5 03/20/2009 12:18 AM Diego Biurrun

Make AES test program compile again: Setting the av_log_level variable
needs to be replaced by a call to av_log_set_level().

Originally committed as revision 18055 to svn://svn.ffmpeg.org/ffmpeg/trunk
7b484a7a 01/28/2009 05:48 PM Reimar Döffinger

Add "const" to AES function arguments where possible without generating
more warnings.

Originally committed as revision 16847 to svn://svn.ffmpeg.org/ffmpeg/trunk
b250f9c6 01/13/2009 11:44 PM Aurelien Jacobs

Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
43bfaa89 01/08/2008 10:40 PM Diego Biurrun

Fix test program compilation, random() needs to be undefined.

Originally committed as revision 11470 to svn://svn.ffmpeg.org/ffmpeg/trunk
f8a80fd6 11/23/2007 12:52 AM Diego Biurrun

main() --> main(void)

Originally committed as revision 11079 to svn://svn.ffmpeg.org/ffmpeg/trunk
ef0d7a0d 07/18/2007 12:22 PM Reimar Döffinger

Document aes init code writing on purpose beyond round_key array into state array.

Originally committed as revision 9734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2eb697a4 07/02/2007 05:00 PM Diego Biurrun

Move comment to a slightly better place.

Originally committed as revision 9462 to svn://svn.ffmpeg.org/ffmpeg/trunk
79d4c96a 05/13/2007 07:14 PM Michael Niedermayer

correct last element inited check

Originally committed as revision 9018 to svn://svn.ffmpeg.org/ffmpeg/trunk
57d7b036 02/11/2007 04:57 PM Baptiste Coudurier

make key parameter const

Originally committed as revision 7935 to svn://svn.ffmpeg.org/ffmpeg/trunk
ca2560df 01/17/2007 12:49 AM Michael Niedermayer

10l (aes_crypt -> av_aes_crypt)

Originally committed as revision 7559 to svn://svn.ffmpeg.org/ffmpeg/trunk
97f6d154 01/16/2007 07:50 PM Michael Niedermayer

fix CONFIG_SMALL again

Originally committed as revision 7554 to svn://svn.ffmpeg.org/ffmpeg/trunk
5d1b5393 01/16/2007 07:30 PM Michael Niedermayer

30byte smaller object file

Originally committed as revision 7553 to svn://svn.ffmpeg.org/ffmpeg/trunk
97e3458c 01/16/2007 07:08 PM Michael Niedermayer

cbc support

Originally committed as revision 7550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2d3475ae 01/16/2007 05:58 PM Michael Niedermayer

avoid memcpy()

Originally committed as revision 7549 to svn://svn.ffmpeg.org/ffmpeg/trunk
7465619a 01/16/2007 05:51 PM Michael Niedermayer

give crypt a src and dst
same speed, 100bytes larger object file

Originally committed as revision 7548 to svn://svn.ffmpeg.org/ffmpeg/trunk
b0642c74 01/16/2007 05:40 PM Michael Niedermayer

change subshift a little, this reduces the object size a litlle

Originally committed as revision 7546 to svn://svn.ffmpeg.org/ffmpeg/trunk
298dd6b7 01/16/2007 05:17 PM Michael Niedermayer

use 2 state arrays so that fewer temporary variables are needed

Originally committed as revision 7545 to svn://svn.ffmpeg.org/ffmpeg/trunk
cc6b4da8 01/16/2007 04:29 PM Michael Niedermayer

remove useless parameter

Originally committed as revision 7544 to svn://svn.ffmpeg.org/ffmpeg/trunk
14bc3849 01/16/2007 04:24 PM Michael Niedermayer

unused variable

Originally committed as revision 7543 to svn://svn.ffmpeg.org/ffmpeg/trunk
1aa72a70 01/15/2007 01:45 PM Michael Niedermayer

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
1f83576b 01/15/2007 10:37 AM Michael Niedermayer

make aes_en/decrypt() static until we decided on the public API

Originally committed as revision 7533 to svn://svn.ffmpeg.org/ffmpeg/trunk
0d80bd2f 01/15/2007 01:33 AM Michael Niedermayer

move #include log.h into the selftesting code where it belongs

Originally committed as revision 7529 to svn://svn.ffmpeg.org/ffmpeg/trunk
6572e1a4 01/15/2007 01:32 AM Michael Niedermayer

remove dependancy on *malloc()

Originally committed as revision 7528 to svn://svn.ffmpeg.org/ffmpeg/trunk
347c2798 01/15/2007 01:05 AM Michael Niedermayer

check the last? entry written for detecting already initalized tables

Originally committed as revision 7527 to svn://svn.ffmpeg.org/ffmpeg/trunk
96b10308 01/15/2007 01:01 AM Michael Niedermayer

replace / by >> this makes the .o ~150 bytes smaller

Originally committed as revision 7525 to svn://svn.ffmpeg.org/ffmpeg/trunk
e42244e9 01/15/2007 12:55 AM Michael Niedermayer

cosmetic

Originally committed as revision 7524 to svn://svn.ffmpeg.org/ffmpeg/trunk
597e3232 01/14/2007 09:40 PM Michael Niedermayer

simplify

Originally committed as revision 7504 to svn://svn.ffmpeg.org/ffmpeg/trunk
7200f5d0 01/14/2007 09:30 PM Michael Niedermayer

simplify multiply table init

Originally committed as revision 7503 to svn://svn.ffmpeg.org/ffmpeg/trunk
d65dc0cd 01/14/2007 09:20 PM Michael Niedermayer

simplify selftest

Originally committed as revision 7501 to svn://svn.ffmpeg.org/ffmpeg/trunk
f25b650a 01/14/2007 09:13 PM Michael Niedermayer

revert simplification (broke 192 bit keys)

Originally committed as revision 7500 to svn://svn.ffmpeg.org/ffmpeg/trunk
8d4ae47c 01/14/2007 09:03 PM Michael Niedermayer

simplify

Originally committed as revision 7499 to svn://svn.ffmpeg.org/ffmpeg/trunk
1b105243 01/14/2007 07:58 PM Michael Niedermayer

fix 2 warnings

Originally committed as revision 7498 to svn://svn.ffmpeg.org/ffmpeg/trunk
034f5fba 01/14/2007 07:51 PM Michael Niedermayer

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
c2fd2b20 01/14/2007 07:45 PM Michael Niedermayer

unneeded

Originally committed as revision 7496 to svn://svn.ffmpeg.org/ffmpeg/trunk
a6e923c9 01/14/2007 07:41 PM Michael Niedermayer

unused think

Originally committed as revision 7495 to svn://svn.ffmpeg.org/ffmpeg/trunk
0c5d2819 01/14/2007 07:39 PM Michael Niedermayer

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
28b51235 01/14/2007 07:24 PM Michael Niedermayer

indent

Originally committed as revision 7493 to svn://svn.ffmpeg.org/ffmpeg/trunk
954bd264 01/14/2007 07:24 PM Michael Niedermayer

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
54b78b24 01/14/2007 07:02 PM Michael Niedermayer

make decode look more like encode

Originally committed as revision 7491 to svn://svn.ffmpeg.org/ffmpeg/trunk
cc858970 01/14/2007 07:01 PM Michael Niedermayer

dont use encode tables for decoding

Originally committed as revision 7490 to svn://svn.ffmpeg.org/ffmpeg/trunk
73374bf4 01/14/2007 06:58 PM Michael Niedermayer

remove no longer corret comment

Originally committed as revision 7489 to svn://svn.ffmpeg.org/ffmpeg/trunk
179dc911 01/14/2007 06:51 PM Michael Niedermayer

unused stuff removial

Originally committed as revision 7488 to svn://svn.ffmpeg.org/ffmpeg/trunk
f12cf3d2 01/14/2007 06:47 PM Michael Niedermayer

merge inv_sbox into inv_mix

Originally committed as revision 7487 to svn://svn.ffmpeg.org/ffmpeg/trunk
0458e790 01/14/2007 06:17 PM Michael Niedermayer

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
2592438d 01/14/2007 05:43 PM Michael Niedermayer

1 test vector

Originally committed as revision 7483 to svn://svn.ffmpeg.org/ffmpeg/trunk
95d1236b 01/14/2007 05:19 PM Michael Niedermayer

fix CONFIG_SMALL case

Originally committed as revision 7482 to svn://svn.ffmpeg.org/ffmpeg/trunk
388b5e69 01/14/2007 04:49 PM Michael Niedermayer

simplify special round

Originally committed as revision 7481 to svn://svn.ffmpeg.org/ffmpeg/trunk
cf5773e9 01/14/2007 04:45 PM Michael Niedermayer

benchmark

Originally committed as revision 7480 to svn://svn.ffmpeg.org/ffmpeg/trunk
ff8f6594 01/14/2007 04:43 PM Michael Niedermayer

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
b58ecac6 01/14/2007 04:19 PM Michael Niedermayer

ascii

Originally committed as revision 7478 to svn://svn.ffmpeg.org/ffmpeg/trunk
b1e5c294 01/14/2007 01:47 PM Michael Niedermayer

cosmetic

Originally committed as revision 7472 to svn://svn.ffmpeg.org/ffmpeg/trunk
ba554c02 01/14/2007 01:46 PM Michael Niedermayer

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
84c72fb1 01/14/2007 01:38 PM Michael Niedermayer

cosmetics

Originally committed as revision 7470 to svn://svn.ffmpeg.org/ffmpeg/trunk
7acc1a27 01/14/2007 01:37 PM Michael Niedermayer

memcpy

Originally committed as revision 7469 to svn://svn.ffmpeg.org/ffmpeg/trunk
1070eba2 01/14/2007 01:30 PM Michael Niedermayer

seems the larger rcon values are never accessed

Originally committed as revision 7468 to svn://svn.ffmpeg.org/ffmpeg/trunk
12d6a1c8 01/14/2007 01:16 PM Michael Niedermayer

copyright fix

Originally committed as revision 7467 to svn://svn.ffmpeg.org/ffmpeg/trunk
cd0968c4 01/14/2007 01:15 PM Michael Niedermayer

stealing multbl trick from reimar

Originally committed as revision 7466 to svn://svn.ffmpeg.org/ffmpeg/trunk
e8fc9313 01/14/2007 12:40 PM Michael Niedermayer

stealing reimars XOR_BLOCK

Originally committed as revision 7464 to svn://svn.ffmpeg.org/ffmpeg/trunk
d43a2975 01/14/2007 09:27 AM Michael Niedermayer

cosmetic

Originally committed as revision 7463 to svn://svn.ffmpeg.org/ffmpeg/trunk
eade86e2 01/14/2007 09:25 AM Michael Niedermayer

memleak

Originally committed as revision 7462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2c3427eb 01/14/2007 09:14 AM Michael Niedermayer

simplify sbox init

Originally committed as revision 7461 to svn://svn.ffmpeg.org/ffmpeg/trunk
3306dfd5 01/14/2007 09:06 AM Michael Niedermayer

aes support (unfinished)

Originally committed as revision 7460 to svn://svn.ffmpeg.org/ffmpeg/trunk