Mercurial > libavutil.hg
changeset 221:6ff860ccdcff libavutil
10l (aes_crypt -> av_aes_crypt)
| author | michael |
|---|---|
| date | Wed, 17 Jan 2007 00:49:48 +0000 |
| parents | b842bcbc6880 |
| children | a8a9454b0874 |
| files | aes.c aes.h |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/aes.c Tue Jan 16 19:50:49 2007 +0000 +++ b/aes.c Wed Jan 17 00:49:48 2007 +0000 @@ -85,7 +85,7 @@ 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 @@ 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 @@ 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]){
--- a/aes.h Tue Jan 16 19:50:49 2007 +0000 +++ b/aes.h Wed Jan 17 00:49:48 2007 +0000 @@ -40,6 +40,6 @@ * @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 */