summaryrefslogtreecommitdiff
path: root/lib/libcrypto/bf
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-07-10 09:01:05 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-07-10 09:01:05 +0000
commit56d2f17f72bc01fb9a19a302360faaf93edf1f49 (patch)
treec02d42f786efdf2051303b2b32d6b4e2ce8726f5 /lib/libcrypto/bf
parent2f99a28ca20ab51d744ad35335578968fd0c9a18 (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.
Diffstat (limited to 'lib/libcrypto/bf')
-rw-r--r--lib/libcrypto/bf/blowfish.h9
1 files changed, 1 insertions, 8 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