Problems with 64-bit long.

Pointed out by Andy Polyakov <appro@fy.chalmers.se>.

diff --git a/crypto/bf/bf_locl.org b/crypto/bf/bf_locl.org
index a5663de8caef0fe3f9d1ccb5117142dba86fcae8..bd620840323b16b85ad0b793192be5d9ea732466 100644 (file)
--- a/crypto/bf/bf_locl.org
+++ b/crypto/bf/bf_locl.org
@@ -74,20 +74,8 @@
 #  define BF_PTR
 #elif defined( __ultrix )     /* Older MIPS */
 #  define BF_PTR
 #  define BF_PTR
 #elif defined( __ultrix )     /* Older MIPS */
 #  define BF_PTR

-#elif defined( __osf1__ )     /* Alpha */
-  /* None */
-#elif defined ( _AIX )                /* RS6000 */
-  /* Unknown */
-#elif defined( __hpux )               /* HP-PA */
-  /* None */
-#elif defined( __aux )                /* 68K */
-  /* Unknown */
-#elif defined( __dgux )               /* 88K (but P6 in latest boxes) */
-  /* Unknown */

 #elif defined( __sgi )                /* Newer MIPS */
 #  define BF_PTR
 #elif defined( __sgi )                /* Newer MIPS */
 #  define BF_PTR

-#elif defined( i386 )         /* x86 boxes, should be gcc */
-#elif defined( _MSC_VER )     /* x86 boxes, Visual C */

 #endif /* Systems-specific speed defines */
 
 #undef c2l
 #endif /* Systems-specific speed defines */
 
 #undef c2l

diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h
index 61ffff608bd12fb3dcf7911810eb9404a098bbec..4e5698f3d7a7a431b515722574acc209b52b0770 100644 (file)
--- a/crypto/bf/blowfish.h
+++ b/crypto/bf/blowfish.h
@@ -66,18 +66,10 @@ extern "C" {
 #define BF_ENCRYPT     1
 #define BF_DECRYPT     0
 
 #define BF_ENCRYPT     1
 #define BF_DECRYPT     0
 

-/* If you make this 'unsigned int' the pointer variants will work on
- * the Alpha, otherwise they will not.  Strangly using the '8 byte'
- * BF_LONG and the default 'non-pointer' inner loop is the best configuration
- * for the Alpha */
-#if defined(__sgi)
-#  if (_MIPS_SZLONG==64)
-#    define BF_LONG unsigned int
-#  else
-#    define BF_LONG unsigned long
-#  endif
+#ifdef WIN16
+#define BF_LONG unsigned long

 #else
 #else

-#  define BF_LONG unsigned long
+#define BF_LONG unsigned int

 #endif
 
 #define BF_ROUNDS      16
 #endif
 
 #define BF_ROUNDS      16