diff options
Diffstat (limited to 'lib/libcrypto/des')
-rw-r--r-- | lib/libcrypto/des/des.h | 4 | ||||
-rw-r--r-- | lib/libcrypto/des/des_locl.h | 12 | ||||
-rw-r--r-- | lib/libcrypto/des/des_ver.h | 5 |
3 files changed, 1 insertions, 20 deletions
diff --git a/lib/libcrypto/des/des.h b/lib/libcrypto/des/des.h index 122fc1403c6..3eff114102f 100644 --- a/lib/libcrypto/des/des.h +++ b/lib/libcrypto/des/des.h @@ -66,10 +66,6 @@ #error DES is disabled. #endif -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif #ifdef __cplusplus extern "C" { diff --git a/lib/libcrypto/des/des_locl.h b/lib/libcrypto/des/des_locl.h index 1b0c53038c4..1a21467b3eb 100644 --- a/lib/libcrypto/des/des_locl.h +++ b/lib/libcrypto/des/des_locl.h @@ -61,24 +61,14 @@ #include <openssl/e_os2.h> - #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #include <math.h> #include <openssl/des.h> - -#if defined(__STDC__) -#include <string.h> -#endif - -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - #define ITERATIONS 16 #define HALF_ITERATIONS 8 diff --git a/lib/libcrypto/des/des_ver.h b/lib/libcrypto/des/des_ver.h index d1ada258a65..b4a6ffdc39e 100644 --- a/lib/libcrypto/des/des_ver.h +++ b/lib/libcrypto/des/des_ver.h @@ -58,11 +58,6 @@ #include <openssl/e_os2.h> -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - /* The following macros make sure the names are different from libdes names */ #define DES_version OSSL_DES_version #define libdes_version OSSL_libdes_version |