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 /makevms.com | |
| 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 'makevms.com')
| -rwxr-xr-x | makevms.com | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/makevms.com b/makevms.com index b26804b25e..ed0ac04860 100755 --- a/makevms.com +++ b/makevms.com @@ -585,8 +585,8 @@ $ WRITE H_FILE "#define RC4_CHUNK unsigned long long" $ WRITE H_FILE "#endif" $! $ WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)" -$ WRITE H_FILE "#undef DES_LONG" -$ WRITE H_FILE "#define DES_LONG unsigned int" +$ WRITE H_FILE "#undef OSSL_DES_LONG" +$ WRITE H_FILE "#define OSSL_DES_LONG unsigned int" $ WRITE H_FILE "#undef DES_PTR" $ WRITE H_FILE "#define DES_PTR" $ WRITE H_FILE "#undef DES_RISC1" @@ -622,8 +622,8 @@ $ WRITE H_FILE "#define RC4_CHUNK unsigned long" $ WRITE H_FILE "#endif" $! $ WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)" -$ WRITE H_FILE "#undef DES_LONG" -$ WRITE H_FILE "#define DES_LONG unsigned long" +$ WRITE H_FILE "#undef OSSL_DES_LONG" +$ WRITE H_FILE "#define OSSL_DES_LONG unsigned long" $ WRITE H_FILE "#undef DES_PTR" $ WRITE H_FILE "#define DES_PTR" $ WRITE H_FILE "#undef DES_RISC1" |