summaryrefslogtreecommitdiff
path: root/crypto/md4
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/md4
parent68b00c237298b2e7e382686ffd583847d57bbc0b (diff)
downloadopenssl-new-04f8bcf1960c1309e143718642611bb68479cbbf.tar.gz
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/md4')
-rw-r--r--crypto/md4/md4.h13
-rw-r--r--crypto/md4/md4_locl.h4
2 files changed, 2 insertions, 15 deletions
diff --git a/crypto/md4/md4.h b/crypto/md4/md4.h
index d1d25d573c..01052f339f 100644
--- a/crypto/md4/md4.h
+++ b/crypto/md4/md4.h
@@ -72,19 +72,10 @@ extern "C" {
/*-
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD4_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD4_LONG_LOG2 has to be defined along. !
+ * ! MD4_LONG has to be at least 32 bits wide. !
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/
-
-# 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_LONG unsigned int
# define MD4_CBLOCK 64
# define MD4_LBLOCK (MD4_CBLOCK/4)
diff --git a/crypto/md4/md4_locl.h b/crypto/md4/md4_locl.h
index dc86a86c56..6ed21e13da 100644
--- a/crypto/md4/md4_locl.h
+++ b/crypto/md4/md4_locl.h
@@ -61,10 +61,6 @@
#include <openssl/opensslconf.h>
#include <openssl/md4.h>
-#ifndef MD4_LONG_LOG2
-# define MD4_LONG_LOG2 2 /* default to 32 bits */
-#endif
-
void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
#define DATA_ORDER_IS_LITTLE_ENDIAN