[Ffmpeg-cvslog] r7559 - in trunk/libavutil: aes.c aes.h
michael
subversion
Wed Jan 17 01:49:48 CET 2007
Author: michael
Date: Wed Jan 17 01:49:48 2007
New Revision: 7559
Modified:
trunk/libavutil/aes.c
trunk/libavutil/aes.h
Log:
10l (aes_crypt -> av_aes_crypt)
Modified: trunk/libavutil/aes.c
==============================================================================
--- trunk/libavutil/aes.c (original)
+++ trunk/libavutil/aes.c Wed Jan 17 01:49:48 2007
@@ -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]){
Modified: trunk/libavutil/aes.h
==============================================================================
--- trunk/libavutil/aes.h (original)
+++ trunk/libavutil/aes.h Wed Jan 17 01:49:48 2007
@@ -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 */
More information about the ffmpeg-cvslog
mailing list