summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-03-12 22:14:33 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-03-12 22:14:33 +0000
commit3884689bd57efff01e0dd1642758464a06876a09 (patch)
tree236322847296c52ef7ca2b1eff10143772c3b724 /libavutil
parent913cbde41a18e62c5cfa0f98ad9ae2d4e67b90dd (diff)
cosmetic cleanup
Originally committed as revision 8361 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/sha1.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavutil/sha1.c b/libavutil/sha1.c
index 8553707b0c..5ae30cb614 100644
--- a/libavutil/sha1.c
+++ b/libavutil/sha1.c
@@ -13,14 +13,10 @@ typedef struct AVSHA1 {
#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-#define blk0(i) (block[i])
#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) +blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y) +blk (i)+0x5A827999+rol(v,5);w=rol(w,30);
+#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);