summaryrefslogtreecommitdiffstats
path: root/crypto/bf
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2015-01-23 14:48:11 +0100
committerAndy Polyakov <appro@openssl.org>2015-01-23 19:09:01 +0100
commit04f8bcf1960c1309e143718642611bb68479cbbf (patch)
treee93d63af51f668036626fea6bb2f6ddb8c5e2d8e /crypto/bf
parentifdef cleanup part 3: OPENSSL_SYSNAME (diff)
downloadopenssl-04f8bcf1960c1309e143718642611bb68479cbbf.tar.xz
openssl-04f8bcf1960c1309e143718642611bb68479cbbf.zip
Keep disclaiming 16-bit support.
If you examine changes, you are likely to wonder "but what about ILP64, elusive as they are, don't they fall victim to 16-bit rationalization?" No, the case was modeled and verified to work. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/bf')
-rw-r--r--crypto/bf/blowfish.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h
index f50a72559a..ae613e88b7 100644
--- a/crypto/bf/blowfish.h
+++ b/crypto/bf/blowfish.h
@@ -74,19 +74,10 @@ extern "C" {
/*-
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! BF_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! BF_LONG_LOG2 has to be defined along. !
+ * ! BF_LONG has to be at least 32 bits wide. !
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/
-
-# 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_LONG unsigned int
# define BF_ROUNDS 16
# define BF_BLOCK 8