X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmd5.c;h=2f249521cbeab2386b10a5379dda9a3635436eb7;hb=7535c9422de3d94d22a3f0dabbeff9623131417d;hp=0b54898ddca22f73f022a80a7a90d4e252baae68;hpb=f58e60b0a452ed94d06ff8085cd8a45064fb8a62;p=gnulib.git

diff --git a/lib/md5.c b/lib/md5.c
index 0b54898dd..2f249521c 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -1,24 +1,24 @@
 /* md5.c - Functions to compute MD5 message digest of files or memory blocks
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   according to the definition of MD5 in RFC 1321 from April 1992.
+   Copyright (C) 1995, 1996, 2001 Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C
+   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>.  */
+/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #include "md5.h"
+#include "unlocked-io.h"
 
 #ifdef _LIBC
 # include <endian.h>
@@ -72,8 +73,11 @@ md5_init_ctx (ctx)
   ctx->buflen = 0;
 }
 
-/* Put result from CTX in first 16 bytes following RESBUF.  The result must
-   be in little endian byte order.  */
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
 void *
 md5_read_ctx (ctx, resbuf)
      const struct md5_ctx *ctx;
@@ -88,7 +92,10 @@ md5_read_ctx (ctx, resbuf)
 }
 
 /* Process the remaining bytes in the internal buffer and the usual
-   prolog according to the standard and write the result to RESBUF.  */
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
 void *
 md5_finish_ctx (ctx, resbuf)
      struct md5_ctx *ctx;
@@ -298,19 +305,16 @@ md5_process_block (buffer, len, ctx)
         {								\
 	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
 	  ++words;							\
-	  CYCLIC (a, s);						\
+	  a = rol (a, s);						\
 	  a += b;							\
         }								\
       while (0)
 
-      /* It is unfortunate that C does not provide an operator for
-	 cyclic rotation.  Hope the C compiler is smart enough.  */
-#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
-
       /* Before we start, one word to the strange constants.
 	 They are defined in RFC 1321 as
 
-	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64, or
+	 perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
        */
 
       /* Round 1.  */
@@ -339,7 +343,7 @@ md5_process_block (buffer, len, ctx)
       do 								\
 	{								\
 	  a += f (b, c, d) + correct_words[k] + T;			\
-	  CYCLIC (a, s);						\
+	  a = rol (a, s);						\
 	  a += b;							\
 	}								\
       while (0)