Mercurial > libavutil.hg

changeset 167:6104bbdb757b libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetic
author michael
date Sun, 14 Jan 2007 09:27:11 +0000
parents c7ea70dea191
children 8ebd419dcff9
files aes.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/aes.c	Sun Jan 14 09:25:52 2007 +0000
+++ b/aes.c	Sun Jan 14 09:27:11 2007 +0000
@@ -104,12 +104,12 @@
 }
 
 // this is based on the reference AES code by Paulo Barreto and Vincent Rijmen
-AVAES *av_aes_init(uint8_t *key, int keyBits) {
+AVAES *av_aes_init(uint8_t *key, int key_bits) {
     AVAES *a;
     int i, j, t, rconpointer = 0;
     uint8_t tk[8][4];
-    int KC= keyBits/32;
-    int ROUNDS= KC + 6;
+    int KC= key_bits/32;
+    int rounds= KC + 6;
 
     if(!sbox[255]){
         j=1;
@@ -131,16 +131,16 @@
         }
     }
 
-    if(keyBits!=128 && keyBits!=192 && keyBits!=256)
+    if(key_bits!=128 && key_bits!=192 && key_bits!=256)
         return NULL;
 
     a= av_malloc(sizeof(AVAES));
-    a->rounds= ROUNDS;
+    a->rounds= rounds;
 
     memcpy(tk, key, KC*4);
 
-    for(t= 0; t < (ROUNDS+1)*4; ) {
-        for(j = 0; (j < KC) && (t < (ROUNDS+1)*4); j++, t++)
+    for(t= 0; t < (rounds+1)*4; ) {
+        for(j = 0; (j < KC) && (t < (rounds+1)*4); j++, t++)
             for(i = 0; i < 4; i++)
                 a->round_key[0][t][i] = tk[j][i];