diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-03-12 22:23:30 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-03-12 22:23:30 +0000 |
| commit | 20bd4e0799f2e40fab0e99570c11c1d68779a65e (patch) | |
| tree | c6a1bbf04e465317e4ada16bf38b9e3a6dc270db /libavutil/sha1.c | |
| parent | 3884689bd57efff01e0dd1642758464a06876a09 (diff) | |
| download | ffmpeg-20bd4e0799f2e40fab0e99570c11c1d68779a65e.tar.gz | |
cosmetic cleanup
Originally committed as revision 8362 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/sha1.c')
| -rw-r--r-- | libavutil/sha1.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavutil/sha1.c b/libavutil/sha1.c index 5ae30cb614..d955953d3f 100644 --- a/libavutil/sha1.c +++ b/libavutil/sha1.c @@ -13,13 +13,11 @@ typedef struct AVSHA1 { #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) -#define blk(i) (block[i]) - /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y) +blk (i)+0x5A827999+rol(v,5);w=rol(w,30); -#define R2(v,w,x,y,z,i) z+=( w^x ^y) +blk (i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); -#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk (i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); -#define R4(v,w,x,y,z,i) z+=( w^x ^y) +blk (i)+0xCA62C1D6+rol(v,5);w=rol(w,30); +#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y) +block[i]+0x5A827999+rol(v,5);w=rol(w,30); +#define R2(v,w,x,y,z,i) z+=( w^x ^y) +block[i]+0x6ED9EBA1+rol(v,5);w=rol(w,30); +#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+block[i]+0x8F1BBCDC+rol(v,5);w=rol(w,30); +#define R4(v,w,x,y,z,i) z+=( w^x ^y) +block[i]+0xCA62C1D6+rol(v,5);w=rol(w,30); /* Hash a single 512-bit block. This is the core of the algorithm. */ |