diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-10 09:01:05 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-10 09:01:05 +0000 |
| commit | 56d2f17f72bc01fb9a19a302360faaf93edf1f49 (patch) | |
| tree | c02d42f786efdf2051303b2b32d6b4e2ce8726f5 | |
| parent | 2f99a28ca20ab51d744ad35335578968fd0c9a18 (diff) | |
Remove bogus preprocessor statements trying to pick the largest integer
type for BF_LONG, MD[45]_LONG and SHA_LONG.
First, the preprocessor symbols they check for a 64-bit system is __ILP64__
which no sane system provides; second, on the platforms which have assembler
code to speed things up, the assembler code assumes a 32-bit type will be used.
| -rw-r--r-- | lib/libcrypto/bf/blowfish.h | 9 | ||||
| -rw-r--r-- | lib/libcrypto/md4/md4.h | 9 | ||||
| -rw-r--r-- | lib/libcrypto/md5/md5.h | 9 | ||||
| -rw-r--r-- | lib/libcrypto/sha/sha.h | 9 |
4 files changed, 4 insertions, 32 deletions
diff --git a/lib/libcrypto/bf/blowfish.h b/lib/libcrypto/bf/blowfish.h index 9dbf3c6dc7c..4d2db80552c 100644 --- a/lib/libcrypto/bf/blowfish.h +++ b/lib/libcrypto/bf/blowfish.h @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.h,v 1.13 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: blowfish.h,v 1.14 2014/07/10 09:01:04 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -79,14 +79,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(__LP32__) -#define BF_LONG unsigned long -#elif defined(__ILP64__) -#define BF_LONG unsigned long -#define BF_LONG_LOG2 3 -#else #define BF_LONG unsigned int -#endif #define BF_ROUNDS 16 #define BF_BLOCK 8 diff --git a/lib/libcrypto/md4/md4.h b/lib/libcrypto/md4/md4.h index f8ee0c1fea1..bbdac701f60 100644 --- a/lib/libcrypto/md4/md4.h +++ b/lib/libcrypto/md4/md4.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md4.h,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: md4.h,v 1.12 2014/07/10 09:01:04 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -78,14 +78,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(__LP32__) -#define MD4_LONG unsigned long -#elif defined(__ILP64__) -#define MD4_LONG unsigned long -#define MD4_LONG_LOG2 3 -#else #define MD4_LONG unsigned int -#endif #define MD4_CBLOCK 64 #define MD4_LBLOCK (MD4_CBLOCK/4) diff --git a/lib/libcrypto/md5/md5.h b/lib/libcrypto/md5/md5.h index 66e52ce2273..3f27da8d695 100644 --- a/lib/libcrypto/md5/md5.h +++ b/lib/libcrypto/md5/md5.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.h,v 1.15 2014/06/14 10:28:31 avsm Exp $ */ +/* $OpenBSD: md5.h,v 1.16 2014/07/10 09:01:04 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -78,14 +78,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(__LP32__) -#define MD5_LONG unsigned long -#elif defined(__ILP64__) -#define MD5_LONG unsigned long -#define MD5_LONG_LOG2 3 -#else #define MD5_LONG unsigned int -#endif #define MD5_CBLOCK 64 #define MD5_LBLOCK (MD5_CBLOCK/4) diff --git a/lib/libcrypto/sha/sha.h b/lib/libcrypto/sha/sha.h index a03694cd288..5baa80e62f2 100644 --- a/lib/libcrypto/sha/sha.h +++ b/lib/libcrypto/sha/sha.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sha.h,v 1.15 2014/06/14 10:28:31 avsm Exp $ */ +/* $OpenBSD: sha.h,v 1.16 2014/07/10 09:01:04 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -78,14 +78,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(__LP32__) -#define SHA_LONG unsigned long -#elif defined(__ILP64__) -#define SHA_LONG unsigned long -#define SHA_LONG_LOG2 3 -#else #define SHA_LONG unsigned int -#endif #define SHA_LBLOCK 16 #define SHA_CBLOCK (SHA_LBLOCK*4) /* SHA treats input data as a |