[svn] GnuPG - r4073 - trunk/cipher

[svn author dshaw]

Author: dshaw
Date: 2006-03-20 17:40:28 +0100 (Mon, 20 Mar 2006)
New Revision: 4073

Modified:
   trunk/cipher/ChangeLog
   trunk/cipher/blowfish.c
   trunk/cipher/md5.c
   trunk/cipher/rmd160.c
   trunk/cipher/sha1.c
   trunk/cipher/sha256.c
   trunk/cipher/sha512.c
Log:
* blowfish.c, md5.c, rmd160.c, sha1.c, sha256.c, sha512.c: Revert previous
change.  It's now all done in configure.


Modified: trunk/cipher/ChangeLog
===================================================================
--- trunk/cipher/ChangeLog	2006-03-20 16:13:52 UTC (rev 4072)
+++ trunk/cipher/ChangeLog	2006-03-20 16:40:28 UTC (rev 4073)
@@ -1,3 +1,8 @@
+2006-03-20  David Shaw  <dshaw at jabberwocky.com>
+
+	* blowfish.c, md5.c, rmd160.c, sha1.c, sha256.c, sha512.c: Revert
+	previous change.  It's now all done in configure.
+
 2006-03-19  David Shaw  <dshaw at jabberwocky.com>
 
 	* blowfish.c, md5.c, rmd160.c, sha1.c, sha256.c, sha512.c: Use

Modified: trunk/cipher/blowfish.c
===================================================================
--- trunk/cipher/blowfish.c	2006-03-20 16:13:52 UTC (rev 4072)
+++ trunk/cipher/blowfish.c	2006-03-20 16:40:28 UTC (rev 4073)
@@ -251,7 +251,7 @@
 {
     u16 a, b, c, d;
 
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
     a = ((byte*)&x)[0];
     b = ((byte*)&x)[1];
     c = ((byte*)&x)[2];
@@ -267,7 +267,7 @@
 }
 #endif
 
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
 #define F(x) ((( s0[((byte*)&x)[0]] + s1[((byte*)&x)[1]])	 \
 		   ^ s2[((byte*)&x)[2]]) + s3[((byte*)&x)[3]] )
 #else
@@ -528,7 +528,7 @@
     }
 
     for(i=j=0; i < BLOWFISH_ROUNDS+2; i++ ) {
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
 	((byte*)&data)[0] = key[j];
 	((byte*)&data)[1] = key[(j+1)%keylen];
 	((byte*)&data)[2] = key[(j+2)%keylen];

Modified: trunk/cipher/md5.c
===================================================================
--- trunk/cipher/md5.c	2006-03-20 16:13:52 UTC (rev 4072)
+++ trunk/cipher/md5.c	2006-03-20 16:40:28 UTC (rev 4073)
@@ -100,7 +100,7 @@
     u32 D = ctx->D;
     u32 *cwp = correct_words;
 
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
     { int i;
       byte *p2, *p1;
       for(i=0, p1=data, p2=(byte*)correct_words; i < 16; i++, p2 += 4 ) {
@@ -311,7 +311,7 @@
     burn_stack (80+6*sizeof(void*));
 
     p = hd->buf;
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
 #define X(a) do { *p++ = hd-> a      ; *p++ = hd-> a >> 8;      \
 		      *p++ = hd-> a >> 16; *p++ = hd-> a >> 24; } while(0)
 #else /* little endian */

Modified: trunk/cipher/rmd160.c
===================================================================
--- trunk/cipher/rmd160.c	2006-03-20 16:13:52 UTC (rev 4072)
+++ trunk/cipher/rmd160.c	2006-03-20 16:40:28 UTC (rev 4073)
@@ -176,7 +176,7 @@
 transform( RMD160_CONTEXT *hd, byte *data )
 {
     u32 a,b,c,d,e,aa,bb,cc,dd,ee,t;
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
     u32 x[16];
     { int i;
       byte *p2, *p1;
@@ -515,7 +515,7 @@
     burn_stack (108+5*sizeof(void*));
 
     p = hd->buf;
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
 #define X(a) do { *p++ = hd->h##a	   ; *p++ = hd->h##a >> 8;	\
 		      *p++ = hd->h##a >> 16; *p++ = hd->h##a >> 24; } while(0)
 #else /* little endian */

Modified: trunk/cipher/sha1.c
===================================================================
--- trunk/cipher/sha1.c	2006-03-20 16:13:52 UTC (rev 4072)
+++ trunk/cipher/sha1.c	2006-03-20 16:40:28 UTC (rev 4073)
@@ -91,7 +91,7 @@
     d = hd->h3;
     e = hd->h4;
 
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
     memcpy( x, data, 64 );
 #else
     { int i;
@@ -305,7 +305,7 @@
     burn_stack (88+4*sizeof(void*));
 
     p = hd->buf;
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
 #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0)
 #else /* little endian */
 #define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16;	 \

Modified: trunk/cipher/sha256.c
===================================================================
--- trunk/cipher/sha256.c	2006-03-20 16:13:52 UTC (rev 4072)
+++ trunk/cipher/sha256.c	2006-03-20 16:40:28 UTC (rev 4073)
@@ -111,7 +111,7 @@
   g = hd->h6;
   h = hd->h7;
 
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
   memcpy( w, data, 64 );
 #else
   {
@@ -257,7 +257,7 @@
     burn_stack (328);
 
     p = hd->buf;
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
 #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0)
 #else /* little endian */
 #define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16;	 \

Modified: trunk/cipher/sha512.c
===================================================================
--- trunk/cipher/sha512.c	2006-03-20 16:13:52 UTC (rev 4072)
+++ trunk/cipher/sha512.c	2006-03-20 16:40:28 UTC (rev 4073)
@@ -171,7 +171,7 @@
   g = hd->h6;
   h = hd->h7;
 
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
   memcpy( w, data, 128 );
 #else
   {
@@ -332,7 +332,7 @@
     burn_stack (768);
 
     p = hd->buf;
-#if BIG_ENDIAN_HOST
+#ifdef BIG_ENDIAN_HOST
 #define X(a) do { *(u64*)p = hd->h##a ; p += 8; } while(0)
 #else /* little endian */
 #define X(a) do { *p++ = hd->h##a >> 56; *p++ = hd->h##a >> 48;	 \