diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-01-23 14:48:11 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-01-23 19:09:01 +0100 |
| commit | 04f8bcf1960c1309e143718642611bb68479cbbf (patch) | |
| tree | e93d63af51f668036626fea6bb2f6ddb8c5e2d8e /crypto/md5 | |
| parent | 68b00c237298b2e7e382686ffd583847d57bbc0b (diff) | |
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/md5')
| -rw-r--r-- | crypto/md5/md5.h | 13 | ||||
| -rw-r--r-- | crypto/md5/md5_locl.h | 4 |
2 files changed, 2 insertions, 15 deletions
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) |