projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7465619
)
avoid memcpy()
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 16 Jan 2007 17:58:11 +0000
(17:58 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 16 Jan 2007 17:58:11 +0000
(17:58 +0000)
Originally committed as revision 7549 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavutil/aes.c
patch
|
blob
|
history
diff --git
a/libavutil/aes.c
b/libavutil/aes.c
index
f46b13c
..
9921b54
100644
(file)
--- a/
libavutil/aes.c
+++ b/
libavutil/aes.c
@@
-172,10
+172,9
@@
int av_aes_init(AVAES *a, uint8_t *key, int key_bits, int decrypt) {
if(decrypt){
for(i=1; i<rounds; i++){
- uint8_t tmp[2][16];
- memcpy(tmp[1], a->round_key[i][0], 16);
- subshift(tmp[0], 0, sbox);
- memcpy(tmp[1], tmp[0], 16);
+ uint8_t tmp[3][16];
+ memcpy(tmp[2], a->round_key[i][0], 16);
+ subshift(tmp[1], 0, sbox);
mix(tmp, dec_multbl, 1, 3);
memcpy(a->round_key[i][0], tmp[0], 16);
}