summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES2
-rw-r--r--crypto/bf/blowfish.h13
-rw-r--r--crypto/md32_common.h4
-rw-r--r--crypto/md4/md4.h13
-rw-r--r--crypto/md4/md4_locl.h4
-rw-r--r--crypto/md5/md5.h13
-rw-r--r--crypto/md5/md5_locl.h4
-rw-r--r--crypto/ripemd/ripemd.h9
-rw-r--r--crypto/ripemd/rmd_locl.h4
-rw-r--r--crypto/sha/sha.h13
10 files changed, 11 insertions, 68 deletions
diff --git a/CHANGES b/CHANGES
index 9ebbe61bbb..1a8538d704 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,7 +37,7 @@
NCR
Tandem
Cray
- WIN16
+ 16-bit platforms such as WIN16
[Rich Salz]
*) Start cleaning up OPENSSL_NO_xxx #define's
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
diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 5d17b1348e..46c088cdf0 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -64,8 +64,7 @@
* HASH_CBLOCK
* size of a unit chunk HASH_BLOCK operates on.
* HASH_LONG
- * has to be at lest 32 bit wide, if it's wider, then
- * HASH_LONG_LOG2 *has to* be defined along
+ * has to be at lest 32 bit wide.
* HASH_CTX
* context structure that at least contains following
* members:
@@ -98,7 +97,6 @@
* #define DATA_ORDER_IS_LITTLE_ENDIAN
*
* #define HASH_LONG MD5_LONG
- * #define HASH_LONG_LOG2 MD5_LONG_LOG2
* #define HASH_CTX MD5_CTX
* #define HASH_CBLOCK MD5_CBLOCK
* #define HASH_UPDATE MD5_Update
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
diff --git a/crypto/md5/md5.h b/crypto/md5/md5.h
index 6f50c20297..91f4251ece 100644
--- a/crypto/md5/md5.h
+++ b/crypto/md5/md5.h
@@ -72,19 +72,10 @@ extern "C" {
/*
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD5_LONG_LOG2 has to be defined along. !
+ * ! MD5_LONG has to be at least 32 bits wide. !
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/
-
-# 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_LONG unsigned int
# define MD5_CBLOCK 64
# define MD5_LBLOCK (MD5_CBLOCK/4)
diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h
index 82e69218da..6c1bf35b80 100644
--- a/crypto/md5/md5_locl.h
+++ b/crypto/md5/md5_locl.h
@@ -61,10 +61,6 @@
#include <openssl/e_os2.h>
#include <openssl/md5.h>
-#ifndef MD5_LONG_LOG2
-# define MD5_LONG_LOG2 2 /* default to 32 bits */
-#endif
-
#ifdef MD5_ASM
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
diff --git a/crypto/ripemd/ripemd.h b/crypto/ripemd/ripemd.h
index 898f2d0d97..9933078d69 100644
--- a/crypto/ripemd/ripemd.h
+++ b/crypto/ripemd/ripemd.h
@@ -70,14 +70,7 @@ extern "C" {
# error RIPEMD is disabled.
# endif
-# if defined(__LP32__)
-# define RIPEMD160_LONG unsigned long
-# elif defined(__ILP64__)
-# define RIPEMD160_LONG unsigned long
-# define RIPEMD160_LONG_LOG2 3
-# else
-# define RIPEMD160_LONG unsigned int
-# endif
+# define RIPEMD160_LONG unsigned int
# define RIPEMD160_CBLOCK 64
# define RIPEMD160_LBLOCK (RIPEMD160_CBLOCK/4)
diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_locl.h
index 26e0256333..497a1a167e 100644
--- a/crypto/ripemd/rmd_locl.h
+++ b/crypto/ripemd/rmd_locl.h
@@ -61,10 +61,6 @@
#include <openssl/opensslconf.h>
#include <openssl/ripemd.h>
-#ifndef RIPEMD160_LONG_LOG2
-# define RIPEMD160_LONG_LOG2 2 /* default to 32 bits */
-#endif
-
/*
* DO EXAMINE COMMENTS IN crypto/md5/md5_locl.h & crypto/md5/md5_dgst.c
* FOR EXPLANATIONS ON FOLLOWING "CODE."
diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
index 3d2d2fa136..d76790b35a 100644
--- a/crypto/sha/sha.h
+++ b/crypto/sha/sha.h
@@ -72,19 +72,10 @@ extern "C" {
/*-
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along. !
+ * ! SHA_LONG has to be at least 32 bits wide. !
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/
-
-# 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_LONG unsigned int
# define SHA_LBLOCK 16
# define SHA_CBLOCK (SHA_LBLOCK*4)/* SHA treats input data as a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 20:53:40 +0000