Commit bb8e7ab7 authored by Ulf Möller's avatar Ulf Möller
Browse files

Problems with 64-bit long. 

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

crypto/bf/bf_locl.org

+0 −12
Original line number Diff line number Diff line
@@ -74,20 +74,8 @@ 
#  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( i386 )         /* x86 boxes, should be gcc */

#elif defined( _MSC_VER )     /* x86 boxes, Visual C */

#endif /* Systems-specific speed defines */



#undef c2l

crypto/bf/blowfish.h

+3 −11
Original line number Diff line number Diff line
@@ -66,18 +66,10 @@ extern "C" { 
#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

#ifdef WIN16

#define BF_LONG unsigned long

#  endif

#else

#  define BF_LONG unsigned long

#define BF_LONG unsigned int

#endif



#define BF_ROUNDS	16