diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-20 15:54:03 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-20 15:54:03 +0000 |
| commit | bb8e7ab7563a87dea090823ab13b2a6685f17c98 (patch) | |
| tree | 50bba556125c94f1e7e1d0a285f3d9e89c4e4f27 /crypto/bf | |
| parent | 99f53c826d4360741838f22d678031fa742fab40 (diff) | |
| download | openssl-new-bb8e7ab7563a87dea090823ab13b2a6685f17c98.tar.gz | |
Problems with 64-bit long.
Pointed out by Andy Polyakov <appro@fy.chalmers.se>.
Diffstat (limited to 'crypto/bf')
| -rw-r--r-- | crypto/bf/bf_locl.org | 12 | ||||
| -rw-r--r-- | crypto/bf/blowfish.h | 14 |
2 files changed, 3 insertions, 23 deletions
diff --git a/crypto/bf/bf_locl.org b/crypto/bf/bf_locl.org index a5663de8ca..bd62084032 100644 --- 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 -#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 diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h index 61ffff608b..4e5698f3d7 100644 --- a/crypto/bf/blowfish.h +++ b/crypto/bf/blowfish.h @@ -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 -# define BF_LONG unsigned long -# endif +#ifdef WIN16 +#define BF_LONG unsigned long #else -# define BF_LONG unsigned long +#define BF_LONG unsigned int #endif #define BF_ROUNDS 16 |