From ba554c025e55edd3d7c194a421242b03620d8796 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 14 Jan 2007 13:46:20 +0000 Subject: [PATCH] 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 --- libavutil/aes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/aes.c b/libavutil/aes.c index bdbced191..090ecd234 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -23,8 +23,8 @@ #include "aes.h" typedef struct AVAES{ - uint8_t state[4][4]; uint8_t round_key[15][4][4]; + uint8_t state[4][4]; int rounds; }AVAES; @@ -143,9 +143,9 @@ AVAES *av_aes_init(uint8_t *key, int key_bits) { memcpy(tk, key, KC*4); - for(t= 0; t < (rounds+1)*4; ) { - for(j = 0; j < KC && t < (rounds+1)*4; j++, t++) - memcpy(a->round_key[0][t], tk[j], 4); + for(t= 0; t < (rounds+1)*4;) { + memcpy(a->round_key[0][t], tk, KC*4); + t+= KC; for(i = 0; i < 4; i++) tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]]; -- 2.11.0