Mercurial > libavutil.hg
diff sha.c @ 993:f8db9a2bae05 libavutil
Add av_ prefix to bswap macros
author | mru |
---|---|
date | Sat, 10 Jul 2010 22:12:30 +0000 |
parents | a13125b5be3a |
children |
line wrap: on
line diff
--- a/sha.c Sat Jul 10 22:09:01 2010 +0000 +++ b/sha.c Sat Jul 10 22:12:30 2010 +0000 @@ -43,7 +43,7 @@ #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define blk0(i) (block[i] = be2ne_32(((const uint32_t*)buffer)[i])) +#define blk0(i) (block[i] = av_be2ne32(((const uint32_t*)buffer)[i])) #define blk(i) (block[i] = rol(block[i-3] ^ block[i-8] ^ block[i-14] ^ block[i-16], 1)) #define R0(v,w,x,y,z,i) z += ((w&(x^y))^y) + blk0(i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); @@ -68,7 +68,7 @@ for (i = 0; i < 80; i++) { int t; if (i < 16) - t = be2ne_32(((uint32_t*)buffer)[i]); + t = av_be2ne32(((uint32_t*)buffer)[i]); else t = rol(block[i-3] ^ block[i-8] ^ block[i-14] ^ block[i-16], 1); block[i] = t; @@ -314,7 +314,7 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest) { int i; - uint64_t finalcount = be2ne_64(ctx->count << 3); + uint64_t finalcount = av_be2ne64(ctx->count << 3); av_sha_update(ctx, "\200", 1); while ((ctx->count & 63) != 56)