diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2015-12-29 03:16:05 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-29 03:16:05 +0000 |
| commit | b72472105b6f9976a1d84de7191eb9da8891ddd8 (patch) | |
| tree | 9c1d3ea3ee46b8ec0bbd3eacaebb5db25c3e00de /CryptoPkg/Library | |
| parent | 34885c5af41df1a9f33b77e7af090347c9819199 (diff) | |
| download | edk2-b72472105b6f9976a1d84de7191eb9da8891ddd8.tar.gz edk2-b72472105b6f9976a1d84de7191eb9da8891ddd8.tar.bz2 edk2-b72472105b6f9976a1d84de7191eb9da8891ddd8.zip | |
CryptoPkg/OpensslLib: Eliminate GETPID_IS_MEANINGLESS definition
OpenSSL ought to work this out for itself when OPENSSL_SYS_UEFI is set.
(Sync patch r18707 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Reviewed-by: Qin Long <qin.long@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19564 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'CryptoPkg/Library')
| -rw-r--r-- | CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2d.patch | 12 | ||||
| -rw-r--r-- | CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2d.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2d.patch index fb16e877ec..4e1fd5b688 100644 --- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2d.patch +++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2d.patch @@ -361,6 +361,18 @@ diff U3 crypto/opensslconf.h crypto/opensslconf.h #define CONFIG_HEADER_BN_H
#undef BN_LLONG
+diff U3 e_os.h e_os.h
+--- e_os.h Thu Jul 09 19:57:16 2015
++++ e_os.h Thu Oct 29 16:54:10 2015
+@@ -136,7 +136,7 @@
+ # define MSDOS
+ # endif
+
+-# if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS)
++# if (defined(MSDOS) || defined(OPENSSL_SYS_UEFI)) && !defined(GETPID_IS_MEANINGLESS)
+ # define GETPID_IS_MEANINGLESS
+ # endif
+
diff U3 e_os2.h e_os2.h
--- e_os2.h Thu Jul 09 19:57:16 2015
+++ e_os2.h Thu Oct 29 15:08:19 2015
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index 0be9ee6ec9..72d8949db4 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -21,7 +21,7 @@ VERSION_STRING = 1.0
LIBRARY_CLASS = OpensslLib
DEFINE OPENSSL_PATH = openssl-1.0.2d
- DEFINE OPENSSL_FLAGS = -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_POSIX_IO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_ASM
+ DEFINE OPENSSL_FLAGS = -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSL_NO_STDIO -DOPENSSL_NO_POSIX_IO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_ASM
DEFINE OPENSSL_EXFLAGS = -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_RIPEMD -DOPENSSL_NO_RC2 -DOPENSSL_NO_IDEA -DOPENSSL_NO_BF -DOPENSSL_NO_CAST -DOPENSSL_NO_WHIRLPOOL -DOPENSSL_NO_DSA -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_SRP -DOPENSSL_NO_ENGINE
#
@@ -43,7 +43,6 @@ # OPENSSL_NO_ERR
# OPENSSL_NO_KRB5
# OPENSSL_NO_DYNAMIC_ENGINE
-# GETPID_IS_MEANINGLESS
# OPENSSL_NO_STDIO
# OPENSSL_NO_POSIX_IO
# OPENSSL_NO_FP_API
|