diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-01-17 00:49:48 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-01-17 00:49:48 +0000 |
| commit | ca2560dff67e12266885e69742a00fae8c16ba3f (patch) | |
| tree | 4edae208ceeeb14a4f5aaee5e53a8ea7198844ab | |
| parent | d9319ccebd2a486431a2fb3474ed53e01ae4f3a2 (diff) | |
10l (aes_crypt -> av_aes_crypt)
Originally committed as revision 7559 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/aes.c | 8 | ||||
| -rw-r--r-- | libavutil/aes.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavutil/aes.c b/libavutil/aes.c index b05d56e59d..611e3f4e4f 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -85,7 +85,7 @@ static inline void crypt(AVAES *a, int s, uint8_t *sbox, uint32_t *multbl){ subshift(a->state[0][0], s, sbox); } -void 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, uint8_t *src, int count, uint8_t *iv, int decrypt){ while(count--){ addkey(a->state[1], src, a->round_key[a->rounds]); if(decrypt) { @@ -212,7 +212,7 @@ int main(){ for(i=0; i<2; i++){ av_aes_init(&b, rkey[i], 128, 1); - aes_crypt(&b, temp, rct[i], 1, NULL, 1); + av_aes_crypt(&b, temp, rct[i], 1, NULL, 1); for(j=0; j<16; j++) if(rpt[i][j] != temp[j]) av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, rpt[i][j], temp[j]); @@ -223,10 +223,10 @@ int main(){ pt[j]= random(); } {START_TIMER - aes_crypt(&ae, temp, pt, 1, NULL, 0); + av_aes_crypt(&ae, temp, pt, 1, NULL, 0); if(!(i&(i-1))) av_log(NULL, AV_LOG_ERROR, "%02X %02X %02X %02X\n", temp[0], temp[5], temp[10], temp[15]); - aes_crypt(&ad, temp, temp, 1, NULL, 1); + av_aes_crypt(&ad, temp, temp, 1, NULL, 1); STOP_TIMER("aes")} for(j=0; j<16; j++){ if(pt[j] != temp[j]){ diff --git a/libavutil/aes.h b/libavutil/aes.h index 6e0c971956..7d02aafec9 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -40,6 +40,6 @@ int av_aes_init(struct AVAES *a, uint8_t *key, int key_bits, int decrypt); * @param iv initalization vector for CBC mode, if NULL then ECB will be used * @param decrypt 0 for encryption, 1 for decryption */ -void 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, uint8_t *src, int count, uint8_t *iv, int decrypt); #endif /* AES_H */ |