Mercurial > libavutil.hg
comparison aes.c @ 954:2b38811998d1 libavutil
Pass subshift an argument of the proper type.
No changes in generated code.
| author | reimar |
|---|---|
| date | Mon, 28 Jun 2010 17:19:55 +0000 |
| parents | 567489a515b2 |
| children | 040bf8859042 |
comparison
equal
deleted
inserted
replaced
| 953:567489a515b2 | 954:2b38811998d1 |
|---|---|
| 175 | 175 |
| 176 if(decrypt){ | 176 if(decrypt){ |
| 177 for(i=1; i<rounds; i++){ | 177 for(i=1; i<rounds; i++){ |
| 178 uint8_t tmp[3][16]; | 178 uint8_t tmp[3][16]; |
| 179 memcpy(tmp[2], a->round_key[i][0], 16); | 179 memcpy(tmp[2], a->round_key[i][0], 16); |
| 180 subshift(tmp[1], 0, sbox); | 180 subshift(&tmp[1], 0, sbox); |
| 181 mix(tmp, dec_multbl, 1, 3); | 181 mix(tmp, dec_multbl, 1, 3); |
| 182 memcpy(a->round_key[i][0], tmp[0], 16); | 182 memcpy(a->round_key[i][0], tmp[0], 16); |
| 183 } | 183 } |
| 184 }else{ | 184 }else{ |
| 185 for(i=0; i<(rounds+1)>>1; i++){ | 185 for(i=0; i<(rounds+1)>>1; i++){ |