diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch index c42b776de8..541ef45a56 100644 --- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch +++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch @@ -351,328 +351,6 @@ diff U3 crypto/crypto.h crypto/crypto.h "Low level API call to cipher " #alg " forbidden in FIPS mode!") # else -diff U3 crypto/opensslconf.h crypto/opensslconf.h ---- crypto/opensslconf.h Thu Jan 28 21:57:22 2016 -+++ crypto/opensslconf.h Wed Feb 17 14:58:26 2016 -@@ -5,15 +5,72 @@ - extern "C" { - #endif - /* OpenSSL was configured with the following options: */ -+#ifndef OPENSSL_SYSNAME_UEFI -+# define OPENSSL_SYSNAME_UEFI -+#endif - #ifndef OPENSSL_DOING_MAKEDEPEND - - -+#ifndef OPENSSL_NO_BF -+# define OPENSSL_NO_BF -+#endif -+#ifndef OPENSSL_NO_CAMELLIA -+# define OPENSSL_NO_CAMELLIA -+#endif -+#ifndef OPENSSL_NO_CAPIENG -+# define OPENSSL_NO_CAPIENG -+#endif -+#ifndef OPENSSL_NO_CAST -+# define OPENSSL_NO_CAST -+#endif -+#ifndef OPENSSL_NO_CMS -+# define OPENSSL_NO_CMS -+#endif -+#ifndef OPENSSL_NO_DEPRECATED -+# define OPENSSL_NO_DEPRECATED -+#endif -+#ifndef OPENSSL_NO_DGRAM -+# define OPENSSL_NO_DGRAM -+#endif -+#ifndef OPENSSL_NO_DSA -+# define OPENSSL_NO_DSA -+#endif -+#ifndef OPENSSL_NO_DYNAMIC_ENGINE -+# define OPENSSL_NO_DYNAMIC_ENGINE -+#endif -+#ifndef OPENSSL_NO_EC -+# define OPENSSL_NO_EC -+#endif - #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 - # define OPENSSL_NO_EC_NISTP_64_GCC_128 - #endif -+#ifndef OPENSSL_NO_ECDH -+# define OPENSSL_NO_ECDH -+#endif -+#ifndef OPENSSL_NO_ECDSA -+# define OPENSSL_NO_ECDSA -+#endif -+#ifndef OPENSSL_NO_ENGINE -+# define OPENSSL_NO_ENGINE -+#endif -+#ifndef OPENSSL_NO_ENGINES -+# define OPENSSL_NO_ENGINES -+#endif -+#ifndef OPENSSL_NO_FILENAMES -+# define OPENSSL_NO_FILENAMES -+#endif -+#ifndef OPENSSL_NO_FP_API -+# define OPENSSL_NO_FP_API -+#endif - #ifndef OPENSSL_NO_GMP - # define OPENSSL_NO_GMP - #endif -+#ifndef OPENSSL_NO_GOST -+# define OPENSSL_NO_GOST -+#endif -+#ifndef OPENSSL_NO_IDEA -+# define OPENSSL_NO_IDEA -+#endif - #ifndef OPENSSL_NO_JPAKE - # define OPENSSL_NO_JPAKE - #endif -@@ -23,30 +80,90 @@ - #ifndef OPENSSL_NO_LIBUNBOUND - # define OPENSSL_NO_LIBUNBOUND - #endif -+#ifndef OPENSSL_NO_LOCKING -+# define OPENSSL_NO_LOCKING -+#endif - #ifndef OPENSSL_NO_MD2 - # define OPENSSL_NO_MD2 - #endif -+#ifndef OPENSSL_NO_MDC2 -+# define OPENSSL_NO_MDC2 -+#endif -+#ifndef OPENSSL_NO_POSIX_IO -+# define OPENSSL_NO_POSIX_IO -+#endif -+#ifndef OPENSSL_NO_RC2 -+# define OPENSSL_NO_RC2 -+#endif - #ifndef OPENSSL_NO_RC5 - # define OPENSSL_NO_RC5 - #endif -+#ifndef OPENSSL_NO_RCS -+# define OPENSSL_NO_RCS -+#endif - #ifndef OPENSSL_NO_RFC3779 - # define OPENSSL_NO_RFC3779 - #endif -+#ifndef OPENSSL_NO_RIPEMD -+# define OPENSSL_NO_RIPEMD -+#endif -+#ifndef OPENSSL_NO_SCRYPT -+# define OPENSSL_NO_SCRYPT -+#endif -+#ifndef OPENSSL_NO_SCT -+# define OPENSSL_NO_SCT -+#endif - #ifndef OPENSSL_NO_SCTP - # define OPENSSL_NO_SCTP - #endif -+#ifndef OPENSSL_NO_SEED -+# define OPENSSL_NO_SEED -+#endif -+#ifndef OPENSSL_NO_SHA0 -+# define OPENSSL_NO_SHA0 -+#endif -+#ifndef OPENSSL_NO_SOCK -+# define OPENSSL_NO_SOCK -+#endif -+#ifndef OPENSSL_NO_SRP -+# define OPENSSL_NO_SRP -+#endif - #ifndef OPENSSL_NO_SSL_TRACE - # define OPENSSL_NO_SSL_TRACE - #endif -+#ifndef OPENSSL_NO_SSL2 -+# define OPENSSL_NO_SSL2 -+#endif -+#ifndef OPENSSL_NO_SSL3 -+# define OPENSSL_NO_SSL3 -+#endif -+#ifndef OPENSSL_NO_STDIO -+# define OPENSSL_NO_STDIO -+#endif - #ifndef OPENSSL_NO_STORE - # define OPENSSL_NO_STORE - #endif -+#ifndef OPENSSL_NO_UI -+# define OPENSSL_NO_UI -+#endif - #ifndef OPENSSL_NO_UNIT_TEST - # define OPENSSL_NO_UNIT_TEST - #endif -+#ifndef OPENSSL_NO_WHIRLPOOL -+# define OPENSSL_NO_WHIRLPOOL -+#endif - - #endif /* OPENSSL_DOING_MAKEDEPEND */ - -+#ifndef OPENSSL_NO_ASM -+# define OPENSSL_NO_ASM -+#endif -+#ifndef OPENSSL_NO_ERR -+# define OPENSSL_NO_ERR -+#endif -+#ifndef OPENSSL_NO_HW -+# define OPENSSL_NO_HW -+#endif - #ifndef OPENSSL_NO_DYNAMIC_ENGINE - # define OPENSSL_NO_DYNAMIC_ENGINE - #endif -@@ -56,12 +173,66 @@ - who haven't had the time to do the appropriate changes in their - applications. */ - #ifdef OPENSSL_ALGORITHM_DEFINES -+# if defined(OPENSSL_NO_BF) && !defined(NO_BF) -+# define NO_BF -+# endif -+# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) -+# define NO_CAMELLIA -+# endif -+# if defined(OPENSSL_NO_CAPIENG) && !defined(NO_CAPIENG) -+# define NO_CAPIENG -+# endif -+# if defined(OPENSSL_NO_CAST) && !defined(NO_CAST) -+# define NO_CAST -+# endif -+# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) -+# define NO_CMS -+# endif -+# if defined(OPENSSL_NO_DEPRECATED) && !defined(NO_DEPRECATED) -+# define NO_DEPRECATED -+# endif -+# if defined(OPENSSL_NO_DGRAM) && !defined(NO_DGRAM) -+# define NO_DGRAM -+# endif -+# if defined(OPENSSL_NO_DSA) && !defined(NO_DSA) -+# define NO_DSA -+# endif -+# if defined(OPENSSL_NO_DYNAMIC_ENGINE) && !defined(NO_DYNAMIC_ENGINE) -+# define NO_DYNAMIC_ENGINE -+# endif -+# if defined(OPENSSL_NO_EC) && !defined(NO_EC) -+# define NO_EC -+# endif - # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) - # define NO_EC_NISTP_64_GCC_128 - # endif -+# if defined(OPENSSL_NO_ECDH) && !defined(NO_ECDH) -+# define NO_ECDH -+# endif -+# if defined(OPENSSL_NO_ECDSA) && !defined(NO_ECDSA) -+# define NO_ECDSA -+# endif -+# if defined(OPENSSL_NO_ENGINE) && !defined(NO_ENGINE) -+# define NO_ENGINE -+# endif -+# if defined(OPENSSL_NO_ENGINES) && !defined(NO_ENGINES) -+# define NO_ENGINES -+# endif -+# if defined(OPENSSL_NO_FILENAMES) && !defined(NO_FILENAMES) -+# define NO_FILENAMES -+# endif -+# if defined(OPENSSL_NO_FP_API) && !defined(NO_FP_API) -+# define NO_FP_API -+# endif - # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) - # define NO_GMP - # endif -+# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) -+# define NO_GOST -+# endif -+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) -+# define NO_IDEA -+# endif - # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) - # define NO_JPAKE - # endif -@@ -71,27 +242,78 @@ - # if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND) - # define NO_LIBUNBOUND - # endif -+# if defined(OPENSSL_NO_LOCKING) && !defined(NO_LOCKING) -+# define NO_LOCKING -+# endif - # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) - # define NO_MD2 - # endif -+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -+# define NO_MDC2 -+# endif -+# if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO) -+# define NO_POSIX_IO -+# endif -+# if defined(OPENSSL_NO_RC2) && !defined(NO_RC2) -+# define NO_RC2 -+# endif - # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) - # define NO_RC5 - # endif -+# if defined(OPENSSL_NO_RCS) && !defined(NO_RCS) -+# define NO_RCS -+# endif - # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) - # define NO_RFC3779 - # endif -+# if defined(OPENSSL_NO_RIPEMD) && !defined(NO_RIPEMD) -+# define NO_RIPEMD -+# endif -+# if defined(OPENSSL_NO_SCRYPT) && !defined(NO_SCRYPT) -+# define NO_SCRYPT -+# endif -+# if defined(OPENSSL_NO_SCT) && !defined(NO_SCT) -+# define NO_SCT -+# endif - # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) - # define NO_SCTP - # endif -+# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) -+# define NO_SEED -+# endif -+# if defined(OPENSSL_NO_SHA0) && !defined(NO_SHA0) -+# define NO_SHA0 -+# endif -+# if defined(OPENSSL_NO_SOCK) && !defined(NO_SOCK) -+# define NO_SOCK -+# endif -+# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) -+# define NO_SRP -+# endif - # if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE) - # define NO_SSL_TRACE - # endif -+# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) -+# define NO_SSL2 -+# endif -+# if defined(OPENSSL_NO_SSL3) && !defined(NO_SSL3) -+# define NO_SSL3 -+# endif -+# if defined(OPENSSL_NO_STDIO) && !defined(NO_STDIO) -+# define NO_STDIO -+# endif - # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) - # define NO_STORE - # endif -+# if defined(OPENSSL_NO_UI) && !defined(NO_UI) -+# define NO_UI -+# endif - # if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST) - # define NO_UNIT_TEST - # endif -+# if defined(OPENSSL_NO_WHIRLPOOL) && !defined(NO_WHIRLPOOL) -+# define NO_WHIRLPOOL -+# endif - #endif - - /* crypto/opensslconf.h.in */ -@@ -152,7 +374,7 @@ - #endif - #endif - --#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) -+#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) && !defined(OPENSSL_SYSNAME_UEFI) - #define CONFIG_HEADER_BN_H - #undef BN_LLONG - diff U3 e_os.h e_os.h --- e_os.h Thu Jan 28 21:56:08 2016 +++ e_os.h Wed Feb 17 15:52:08 2016 diff --git a/CryptoPkg/Library/OpensslLib/Install.cmd b/CryptoPkg/Library/OpensslLib/Install.cmd index 5d7ad5f43c..14e67b22df 100755 --- a/CryptoPkg/Library/OpensslLib/Install.cmd +++ b/CryptoPkg/Library/OpensslLib/Install.cmd @@ -1,4 +1,5 @@ cd openssl-1.0.2f +copy ..\opensslconf.h crypto if not exist include\openssl mkdir include\openssl copy e_os2.h include\openssl copy crypto\crypto.h include\openssl diff --git a/CryptoPkg/Library/OpensslLib/Install.sh b/CryptoPkg/Library/OpensslLib/Install.sh index 323d2de61c..6b3a044d39 100755 --- a/CryptoPkg/Library/OpensslLib/Install.sh +++ b/CryptoPkg/Library/OpensslLib/Install.sh @@ -1,6 +1,7 @@ #!/bin/sh cd openssl-1.0.2f +cp ../opensslconf.h crypto mkdir -p include/openssl cp e_os2.h include/openssl cp crypto/crypto.h include/openssl diff --git a/CryptoPkg/Library/OpensslLib/opensslconf.h b/CryptoPkg/Library/OpensslLib/opensslconf.h new file mode 100644 index 0000000000..52548f7d70 --- /dev/null +++ b/CryptoPkg/Library/OpensslLib/opensslconf.h @@ -0,0 +1,475 @@ +/* opensslconf.h */ +/* WARNING: Generated automatically from opensslconf.h.in by Configure. */ + +#ifdef __cplusplus +extern "C" { +#endif +/* OpenSSL was configured with the following options: */ +#ifndef OPENSSL_SYSNAME_UEFI +# define OPENSSL_SYSNAME_UEFI +#endif +#ifndef OPENSSL_DOING_MAKEDEPEND + + +#ifndef OPENSSL_NO_BF +# define OPENSSL_NO_BF +#endif +#ifndef OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA +#endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif +#ifndef OPENSSL_NO_CAST +# define OPENSSL_NO_CAST +#endif +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +#ifndef OPENSSL_NO_DEPRECATED +# define OPENSSL_NO_DEPRECATED +#endif +#ifndef OPENSSL_NO_DGRAM +# define OPENSSL_NO_DGRAM +#endif +#ifndef OPENSSL_NO_DSA +# define OPENSSL_NO_DSA +#endif +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE +#endif +#ifndef OPENSSL_NO_EC +# define OPENSSL_NO_EC +#endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif +#ifndef OPENSSL_NO_ECDH +# define OPENSSL_NO_ECDH +#endif +#ifndef OPENSSL_NO_ECDSA +# define OPENSSL_NO_ECDSA +#endif +#ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +#endif +#ifndef OPENSSL_NO_ENGINES +# define OPENSSL_NO_ENGINES +#endif +#ifndef OPENSSL_NO_FILENAMES +# define OPENSSL_NO_FILENAMES +#endif +#ifndef OPENSSL_NO_FP_API +# define OPENSSL_NO_FP_API +#endif +#ifndef OPENSSL_NO_GMP +# define OPENSSL_NO_GMP +#endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif +#ifndef OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA +#endif +#ifndef OPENSSL_NO_JPAKE +# define OPENSSL_NO_JPAKE +#endif +#ifndef OPENSSL_NO_KRB5 +# define OPENSSL_NO_KRB5 +#endif +#ifndef OPENSSL_NO_LIBUNBOUND +# define OPENSSL_NO_LIBUNBOUND +#endif +#ifndef OPENSSL_NO_LOCKING +# define OPENSSL_NO_LOCKING +#endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif +#ifndef OPENSSL_NO_MDC2 +# define OPENSSL_NO_MDC2 +#endif +#ifndef OPENSSL_NO_POSIX_IO +# define OPENSSL_NO_POSIX_IO +#endif +#ifndef OPENSSL_NO_RC2 +# define OPENSSL_NO_RC2 +#endif +#ifndef OPENSSL_NO_RC5 +# define OPENSSL_NO_RC5 +#endif +#ifndef OPENSSL_NO_RCS +# define OPENSSL_NO_RCS +#endif +#ifndef OPENSSL_NO_RFC3779 +# define OPENSSL_NO_RFC3779 +#endif +#ifndef OPENSSL_NO_RIPEMD +# define OPENSSL_NO_RIPEMD +#endif +#ifndef OPENSSL_NO_SCRYPT +# define OPENSSL_NO_SCRYPT +#endif +#ifndef OPENSSL_NO_SCT +# define OPENSSL_NO_SCT +#endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif +#ifndef OPENSSL_NO_SHA0 +# define OPENSSL_NO_SHA0 +#endif +#ifndef OPENSSL_NO_SOCK +# define OPENSSL_NO_SOCK +#endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif +#ifndef OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE +#endif +#ifndef OPENSSL_NO_SSL2 +# define OPENSSL_NO_SSL2 +#endif +#ifndef OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 +#endif +#ifndef OPENSSL_NO_STDIO +# define OPENSSL_NO_STDIO +#endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif +#ifndef OPENSSL_NO_UI +# define OPENSSL_NO_UI +#endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif +#ifndef OPENSSL_NO_WHIRLPOOL +# define OPENSSL_NO_WHIRLPOOL +#endif + +#endif /* OPENSSL_DOING_MAKEDEPEND */ + +#ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +#endif +#ifndef OPENSSL_NO_ERR +# define OPENSSL_NO_ERR +#endif +#ifndef OPENSSL_NO_HW +# define OPENSSL_NO_HW +#endif +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE +#endif + +/* The OPENSSL_NO_* macros are also defined as NO_* if the application + asks for it. This is a transient feature that is provided for those + who haven't had the time to do the appropriate changes in their + applications. */ +#ifdef OPENSSL_ALGORITHM_DEFINES +# if defined(OPENSSL_NO_BF) && !defined(NO_BF) +# define NO_BF +# endif +# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) +# define NO_CAMELLIA +# endif +# if defined(OPENSSL_NO_CAPIENG) && !defined(NO_CAPIENG) +# define NO_CAPIENG +# endif +# if defined(OPENSSL_NO_CAST) && !defined(NO_CAST) +# define NO_CAST +# endif +# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) +# define NO_CMS +# endif +# if defined(OPENSSL_NO_DEPRECATED) && !defined(NO_DEPRECATED) +# define NO_DEPRECATED +# endif +# if defined(OPENSSL_NO_DGRAM) && !defined(NO_DGRAM) +# define NO_DGRAM +# endif +# if defined(OPENSSL_NO_DSA) && !defined(NO_DSA) +# define NO_DSA +# endif +# if defined(OPENSSL_NO_DYNAMIC_ENGINE) && !defined(NO_DYNAMIC_ENGINE) +# define NO_DYNAMIC_ENGINE +# endif +# if defined(OPENSSL_NO_EC) && !defined(NO_EC) +# define NO_EC +# endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif +# if defined(OPENSSL_NO_ECDH) && !defined(NO_ECDH) +# define NO_ECDH +# endif +# if defined(OPENSSL_NO_ECDSA) && !defined(NO_ECDSA) +# define NO_ECDSA +# endif +# if defined(OPENSSL_NO_ENGINE) && !defined(NO_ENGINE) +# define NO_ENGINE +# endif +# if defined(OPENSSL_NO_ENGINES) && !defined(NO_ENGINES) +# define NO_ENGINES +# endif +# if defined(OPENSSL_NO_FILENAMES) && !defined(NO_FILENAMES) +# define NO_FILENAMES +# endif +# if defined(OPENSSL_NO_FP_API) && !defined(NO_FP_API) +# define NO_FP_API +# endif +# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) +# define NO_GMP +# endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) +# define NO_IDEA +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif +# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) +# define NO_KRB5 +# endif +# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND) +# define NO_LIBUNBOUND +# endif +# if defined(OPENSSL_NO_LOCKING) && !defined(NO_LOCKING) +# define NO_LOCKING +# endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif +# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) +# define NO_MDC2 +# endif +# if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO) +# define NO_POSIX_IO +# endif +# if defined(OPENSSL_NO_RC2) && !defined(NO_RC2) +# define NO_RC2 +# endif +# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) +# define NO_RC5 +# endif +# if defined(OPENSSL_NO_RCS) && !defined(NO_RCS) +# define NO_RCS +# endif +# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) +# define NO_RFC3779 +# endif +# if defined(OPENSSL_NO_RIPEMD) && !defined(NO_RIPEMD) +# define NO_RIPEMD +# endif +# if defined(OPENSSL_NO_SCRYPT) && !defined(NO_SCRYPT) +# define NO_SCRYPT +# endif +# if defined(OPENSSL_NO_SCT) && !defined(NO_SCT) +# define NO_SCT +# endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif +# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) +# define NO_SEED +# endif +# if defined(OPENSSL_NO_SHA0) && !defined(NO_SHA0) +# define NO_SHA0 +# endif +# if defined(OPENSSL_NO_SOCK) && !defined(NO_SOCK) +# define NO_SOCK +# endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif +# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE) +# define NO_SSL_TRACE +# endif +# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) +# define NO_SSL2 +# endif +# if defined(OPENSSL_NO_SSL3) && !defined(NO_SSL3) +# define NO_SSL3 +# endif +# if defined(OPENSSL_NO_STDIO) && !defined(NO_STDIO) +# define NO_STDIO +# endif +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE +# endif +# if defined(OPENSSL_NO_UI) && !defined(NO_UI) +# define NO_UI +# endif +# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST) +# define NO_UNIT_TEST +# endif +# if defined(OPENSSL_NO_WHIRLPOOL) && !defined(NO_WHIRLPOOL) +# define NO_WHIRLPOOL +# endif +#endif + +/* crypto/opensslconf.h.in */ + +/* Generate 80386 code? */ +#undef I386_ONLY + +#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ +#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#define ENGINESDIR "/usr/local/ssl/lib/engines" +#define OPENSSLDIR "/usr/local/ssl" +#endif +#endif + +#undef OPENSSL_UNISTD +#define OPENSSL_UNISTD + +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + +#if defined(HEADER_IDEA_H) && !defined(IDEA_INT) +#define IDEA_INT unsigned int +#endif + +#if defined(HEADER_MD2_H) && !defined(MD2_INT) +#define MD2_INT unsigned int +#endif + +#if defined(HEADER_RC2_H) && !defined(RC2_INT) +/* I need to put in a mod for the alpha - eay */ +#define RC2_INT unsigned int +#endif + +#if defined(HEADER_RC4_H) +#if !defined(RC4_INT) +/* using int types make the structure larger but make the code faster + * on most boxes I have tested - up to %20 faster. */ +/* + * I don't know what does "most" mean, but declaring "int" is a must on: + * - Intel P6 because partial register stalls are very expensive; + * - elder Alpha because it lacks byte load/store instructions; + */ +#define RC4_INT unsigned int +#endif +#if !defined(RC4_CHUNK) +/* + * This enables code handling data aligned at natural CPU word + * boundary. See crypto/rc4/rc4_enc.c for further details. + */ +#undef RC4_CHUNK +#endif +#endif + +#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(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 +#endif +#endif + +#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) && !defined(OPENSSL_SYSNAME_UEFI) +#define CONFIG_HEADER_BN_H +#undef BN_LLONG + +/* Should we define BN_DIV2W here? */ + +/* Only one for the following should be defined */ +#undef SIXTY_FOUR_BIT_LONG +#undef SIXTY_FOUR_BIT +#define THIRTY_TWO_BIT +#endif + +#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) +#define CONFIG_HEADER_RC4_LOCL_H +/* if this is defined data[i] is used instead of *data, this is a %20 + * speedup on x86 */ +#undef RC4_INDEX +#endif + +#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) +#define CONFIG_HEADER_BF_LOCL_H +#undef BF_PTR +#endif /* HEADER_BF_LOCL_H */ + +#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) +#define CONFIG_HEADER_DES_LOCL_H +#ifndef DES_DEFAULT_OPTIONS +/* the following is tweaked from a config script, that is why it is a + * protected undef/define */ +#ifndef DES_PTR +#undef DES_PTR +#endif + +/* This helps C compiler generate the correct code for multiple functional + * units. It reduces register dependancies at the expense of 2 more + * registers */ +#ifndef DES_RISC1 +#undef DES_RISC1 +#endif + +#ifndef DES_RISC2 +#undef DES_RISC2 +#endif + +#if defined(DES_RISC1) && defined(DES_RISC2) +#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! +#endif + +/* Unroll the inner loop, this sometimes helps, sometimes hinders. + * Very mucy CPU dependant */ +#ifndef DES_UNROLL +#undef DES_UNROLL +#endif + +/* These default values were supplied by + * Peter Gutman + * They are only used if nothing else has been defined */ +#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) +/* Special defines which change the way the code is built depending on the + CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find + even newer MIPS CPU's, but at the moment one size fits all for + optimization options. Older Sparc's work better with only UNROLL, but + there's no way to tell at compile time what it is you're running on */ + +#if defined( __sun ) || defined ( sun ) /* Newer Sparc's */ +# define DES_PTR +# define DES_RISC1 +# define DES_UNROLL +#elif defined( __ultrix ) /* Older MIPS */ +# define DES_PTR +# define DES_RISC2 +# define DES_UNROLL +#elif defined( __osf1__ ) /* Alpha */ +# define DES_PTR +# define DES_RISC2 +#elif defined ( _AIX ) /* RS6000 */ + /* Unknown */ +#elif defined( __hpux ) /* HP-PA */ + /* Unknown */ +#elif defined( __aux ) /* 68K */ + /* Unknown */ +#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ +# define DES_UNROLL +#elif defined( __sgi ) /* Newer MIPS */ +# define DES_PTR +# define DES_RISC2 +# define DES_UNROLL +#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ +# define DES_PTR +# define DES_RISC1 +# define DES_UNROLL +#endif /* Systems-specific speed defines */ +#endif + +#endif /* DES_DEFAULT_OPTIONS */ +#endif /* HEADER_DES_LOCL_H */ +#ifdef __cplusplus +} +#endif