changeset 2878:53969d50efee

Give credit (GnuPG) where due. (M): Use rol rather than open-coding it. Add a FIXME comment.
author Jim Meyering <jim@meyering.net>
date Sun, 24 Sep 2000 23:59:39 +0000
parents ae0c0b393b0f
children b9de4fb7b460
files lib/sha.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lib/sha.c
+++ b/lib/sha.c
@@ -241,7 +241,8 @@
 #define F4(B,C,D) (B ^ C ^ D)
 
 /* Process LEN bytes of BUFFER, accumulating context into CTX.
-   It is assumed that LEN % 64 == 0.  */
+   It is assumed that LEN % 64 == 0.
+   Most of this code comes from GnuPG's cipher/sha1.c.  */
 
 void
 sha_process_block (const void *buffer, size_t len, struct sha_ctx *ctx)
@@ -265,7 +266,7 @@
 
 #define M(I) ( tm =   x[I&0x0f] ^ x[(I-14)&0x0f] \
 		    ^ x[(I-8)&0x0f] ^ x[(I-3)&0x0f] \
-	       , (x[I&0x0f] = (tm << 1) | (tm >> 31)) )
+	       , (x[I&0x0f] = rol(tm, 1)) )
 
 #define R(A,B,C,D,E,F,K,M)  do { E += rol( A, 5 )     \
 				      + F( B, C, D )  \
@@ -278,6 +279,7 @@
     {
       md5_uint32 tm;
       int t;
+      /* FIXME: see sha1.c for a better implementation.  */
       for (t = 0; t < 16; t++)
 	{
 	  x[t] = NOTSWAP (*words);