Mercurial > libavutil.hg

changeset 196:b1ad10c8f362 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author michael
date Sun, 14 Jan 2007 21:03:15 +0000
parents d36946d9907e
children a0010ccdc817
files aes.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/aes.c	Sun Jan 14 19:58:41 2007 +0000
+++ b/aes.c	Sun Jan 14 21:03:15 2007 +0000
@@ -158,7 +158,9 @@
     memcpy(tk, key, KC*4);
 
     for(t= 0; t < (rounds+1)*4;) {
-        memcpy(a->round_key[0][t], tk, KC*4);
+        if(decrypt) memcpy(a->round_key[0     ][ t], tk, KC*4);
+        else        memcpy(a->round_key[rounds][-t], tk, KC*4);
+
         t+= KC;
 
         for(i = 0; i < 4; i++)
@@ -179,11 +181,6 @@
                 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;