From e2a2673873e4364ea669439cbe58f478bc3a3b64 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 21 Jan 2020 15:38:48 +0300 Subject: Release version 1.1.1+9 Enable zlib usage Don't define default directory paths Fix 'sslv3 alert bad record mac' failure for some libcrypto function calls --- .../libcrypto/downstream/openssl/opensslconf.h | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'libcrypto/libcrypto/downstream/openssl/opensslconf.h') diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf.h b/libcrypto/libcrypto/downstream/openssl/opensslconf.h index f6692c8..810306b 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf.h @@ -7,13 +7,9 @@ #define LIBCRYPTO_DOWNSTREAM_OPENSSL_OPENSSLCONF_H /* - * Include upstream's auto-generated platform-specific opensslconf.h. - */ -#include - -/* - * Define OPENSSL_PIC and {L|B}_ENDIAN macros if we are building libcrypto - * (see ../../buildfile for details). + * Define OPENSSL_PIC and {L|B}_ENDIAN macros (that upstream defines on the + * command line via -D) if we are building libcrypto (see ../../buildfile for + * details). */ #ifdef LIBCRYPTO_BUILD # define OPENSSL_PIC @@ -26,13 +22,17 @@ # else # if defined(_WIN32) # ifndef BYTE_ORDER -# define BYTE_ORDER LITTLE_ENDIAN +# define BIG_ENDIAN 4321 +# define LITTLE_ENDIAN 1234 +# define BYTE_ORDER LITTLE_ENDIAN # endif # else -# include /* BYTE_ORDER/__BYTE_ORDER */ +# include /* BYTE_ORDER/__BYTE_ORDER */ # ifndef BYTE_ORDER # ifdef __BYTE_ORDER -# define BYTE_ORDER __BYTE_ORDER +# define BYTE_ORDER __BYTE_ORDER +# define BIG_ENDIAN __BIG_ENDIAN +# define LITTLE_ENDIAN __LITTLE_ENDIAN # else # error no BYTE_ORDER/__BYTE_ORDER define # endif @@ -47,4 +47,9 @@ # endif #endif +/* + * Include upstream's auto-generated platform-specific opensslconf.h. + */ +#include + #endif /* LIBCRYPTO_DOWNSTREAM_OPENSSL_OPENSSLCONF_H */ -- cgit v1.1