Mercurial > libavutil.hg

changeset 197:a0010ccdc817 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert simplification (broke 192 bit keys)
author michael
date Sun, 14 Jan 2007 21:13:14 +0000
parents b1ad10c8f362
children 2677cc2d1ff7
files aes.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/aes.c	Sun Jan 14 21:03:15 2007 +0000
+++ b/aes.c	Sun Jan 14 21:13:14 2007 +0000
@@ -158,9 +158,7 @@
     memcpy(tk, key, KC*4);
 
     for(t= 0; t < (rounds+1)*4;) {
-        if(decrypt) memcpy(a->round_key[0     ][ t], tk, KC*4);
-        else        memcpy(a->round_key[rounds][-t], tk, KC*4);
-
+        memcpy(a->round_key[0][t], tk, KC*4);
         t+= KC;
 
         for(i = 0; i < 4; i++)
@@ -181,6 +179,11 @@
                 a->round_key[i][0][j]= sbox[a->round_key[i][0][j]];
             mix(a->round_key[i], dec_multbl);
         }
+    }else{
+        for(i=0; i<(rounds+1)/2; i++){
+            for(j=0; j<16; j++)
+                FFSWAP(int, a->round_key[i][0][j], a->round_key[rounds-i][0][j]);
+        }
     }
 
     return a;