From bdb1d0c24b3df3e2253cd8289cd619093524464e Mon Sep 17 00:00:00 2001 From: Viktor Dukhovni Date: Wed, 13 Jan 2016 12:12:17 -0500 Subject: 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 --- include/openssl/des.h | 2 ++ include/openssl/e_os2.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/openssl/des.h b/include/openssl/des.h index 6bb037d9b4..9bb2e777a2 100644 --- a/include/openssl/des.h +++ b/include/openssl/des.h @@ -66,6 +66,8 @@ # error DES is disabled. # endif +# define DES_LONG OSSL_DES_LONG + # ifdef OPENSSL_BUILD_SHLIBCRYPTO # undef OPENSSL_EXTERN # define OPENSSL_EXTERN OPENSSL_EXPORT diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index fb022b13bd..ceecbfaccc 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -285,7 +285,7 @@ extern "C" { # endif /* Standard integer types */ -# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || \ +# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ defined(__osf__) || defined(__sgi) || defined(__hpux) || \ defined(OPENSSL_SYS_VMS) # include -- cgit v1.2.3