diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-13 12:12:17 -0500 |
|---|---|---|
| committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-13 12:37:48 -0500 |
| commit | bdb1d0c24b3df3e2253cd8289cd619093524464e (patch) | |
| tree | 9da7b37ea9e80383832a491de306356381a1a8ec /crypto | |
| parent | dbc8541b86aee7b6e13e2208545fe625fc13cd7b (diff) | |
Fix DES_LONG breakage
For some strange reason opensslconf.h was only defining DES_LONG
when included via des.h, but that's exceedingly fragile (as a
result of include guards the include via des.h might not actually
process the content again).
Ripped out the nesting constraint, now always define OSSL_DES_LONG
if not already defined. Note, this could just be DES_LONG, but
trying to avoid exposing DES_LONG in places where it has never been
seen before, so it is up to des.h to actually define DES_LONG as
OSSL_DES_LONG.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/des/rpc_des.h | 5 | ||||
| -rw-r--r-- | crypto/opensslconf.h.in | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/crypto/des/rpc_des.h b/crypto/des/rpc_des.h index 4db9062d97..986ac55348 100644 --- a/crypto/des/rpc_des.h +++ b/crypto/des/rpc_des.h @@ -94,11 +94,6 @@ #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ -#ifdef HEADER_DES_H -# undef ENCRYPT -# undef DECRYPT -#endif - enum desdir { ENCRYPT, DECRYPT }; enum desmode { CBC, ECB }; diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in index 20a420fa7b..27c725fc6e 100644 --- a/crypto/opensslconf.h.in +++ b/crypto/opensslconf.h.in @@ -89,11 +89,11 @@ #endif #endif -#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) +#ifndef OSSL_DES_LONG /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ -#ifndef DES_LONG -#define DES_LONG unsigned long +#ifndef OSSL_DES_LONG +#define OSSL_DES_LONG unsigned long #endif #endif |