Commit 7b484a7a authored by Reimar Döffinger's avatar Reimar Döffinger

Add "const" to AES function arguments where possible without generating

more warnings.

Originally committed as revision 16847 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0838cfdc
...@@ -47,12 +47,12 @@ static uint32_t enc_multbl[4][256]; ...@@ -47,12 +47,12 @@ static uint32_t enc_multbl[4][256];
static uint32_t dec_multbl[4][256]; static uint32_t dec_multbl[4][256];
#endif #endif
static inline void addkey(uint64_t dst[2], uint64_t src[2], uint64_t round_key[2]){ static inline void addkey(uint64_t dst[2], const uint64_t src[2], const uint64_t round_key[2]){
dst[0] = src[0] ^ round_key[0]; dst[0] = src[0] ^ round_key[0];
dst[1] = src[1] ^ round_key[1]; dst[1] = src[1] ^ round_key[1];
} }
static void subshift(uint8_t s0[2][16], int s, uint8_t *box){ static void subshift(uint8_t s0[2][16], int s, const uint8_t *box){
uint8_t (*s1)[16]= s0[0] - s; uint8_t (*s1)[16]= s0[0] - s;
uint8_t (*s3)[16]= s0[0] + s; uint8_t (*s3)[16]= s0[0] + s;
s0[0][0]=box[s0[1][ 0]]; s0[0][ 4]=box[s0[1][ 4]]; s0[0][ 8]=box[s0[1][ 8]]; s0[0][12]=box[s0[1][12]]; s0[0][0]=box[s0[1][ 0]]; s0[0][ 4]=box[s0[1][ 4]]; s0[0][ 8]=box[s0[1][ 8]]; s0[0][12]=box[s0[1][12]];
...@@ -77,7 +77,7 @@ static inline void mix(uint8_t state[2][4][4], uint32_t multbl[4][256], int s1, ...@@ -77,7 +77,7 @@ static inline void mix(uint8_t state[2][4][4], uint32_t multbl[4][256], int s1,
((uint32_t *)(state))[3] = mix_core(multbl, state[1][3][0], state[1][s1-1][1], state[1][1][2], state[1][s3-1][3]); ((uint32_t *)(state))[3] = mix_core(multbl, state[1][3][0], state[1][s1-1][1], state[1][1][2], state[1][s3-1][3]);
} }
static inline void crypt(AVAES *a, int s, uint8_t *sbox, uint32_t *multbl){ static inline void crypt(AVAES *a, int s, const uint8_t *sbox, const uint32_t *multbl){
int r; int r;
for(r=a->rounds-1; r>0; r--){ for(r=a->rounds-1; r>0; r--){
...@@ -87,7 +87,7 @@ static inline void crypt(AVAES *a, int s, uint8_t *sbox, uint32_t *multbl){ ...@@ -87,7 +87,7 @@ static inline void crypt(AVAES *a, int s, uint8_t *sbox, uint32_t *multbl){
subshift(a->state[0][0], s, sbox); subshift(a->state[0][0], s, sbox);
} }
void av_aes_crypt(AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, int decrypt){ void av_aes_crypt(AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt){
while(count--){ while(count--){
addkey(a->state[1], src, a->round_key[a->rounds]); addkey(a->state[1], src, a->round_key[a->rounds]);
if(decrypt) { if(decrypt) {
...@@ -108,7 +108,7 @@ void av_aes_crypt(AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, ...@@ -108,7 +108,7 @@ void av_aes_crypt(AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv,
} }
} }
static void init_multbl2(uint8_t tbl[1024], int c[4], uint8_t *log8, uint8_t *alog8, uint8_t *sbox){ static void init_multbl2(uint8_t tbl[1024], const int c[4], const uint8_t *log8, const uint8_t *alog8, const uint8_t *sbox){
int i, j; int i, j;
for(i=0; i<1024; i++){ for(i=0; i<1024; i++){
int x= sbox[i>>2]; int x= sbox[i>>2];
...@@ -146,8 +146,8 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) { ...@@ -146,8 +146,8 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) {
inv_sbox[j]= i; inv_sbox[j]= i;
sbox [i]= j; sbox [i]= j;
} }
init_multbl2(dec_multbl[0], (int[4]){0xe, 0x9, 0xd, 0xb}, log8, alog8, inv_sbox); init_multbl2(dec_multbl[0], (const int[4]){0xe, 0x9, 0xd, 0xb}, log8, alog8, inv_sbox);
init_multbl2(enc_multbl[0], (int[4]){0x2, 0x1, 0x1, 0x3}, log8, alog8, sbox); init_multbl2(enc_multbl[0], (const int[4]){0x2, 0x1, 0x1, 0x3}, log8, alog8, sbox);
} }
if(key_bits!=128 && key_bits!=192 && key_bits!=256) if(key_bits!=128 && key_bits!=192 && key_bits!=256)
......
...@@ -42,6 +42,6 @@ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt); ...@@ -42,6 +42,6 @@ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
* @param iv initialization vector for CBC mode, if NULL then ECB will be used * @param iv initialization vector for CBC mode, if NULL then ECB will be used
* @param decrypt 0 for encryption, 1 for decryption * @param decrypt 0 for encryption, 1 for decryption
*/ */
void av_aes_crypt(struct AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, int decrypt); void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
#endif /* AVUTIL_AES_H */ #endif /* AVUTIL_AES_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment