From f61d69cc4425450450bf2b62a784a038b9bb8073 Mon Sep 17 00:00:00 2001 From: "Long, Qin" Date: Thu, 14 Aug 2014 10:16:57 +0000 Subject: [PATCH] OpenSSL 0.9.8zb was released at 06-Aug-2014, including bug and security fixes. This patch is to catch the latest OpenSSL release. NOTE: The content of EDKII_openssl-0.9.8zb.patch is same with the old EDKII_openssl-0.9.8za.patch, and the extra changes are only name / directory modifications. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Long, Qin Reviewed-by: Ye, Ting Reviewed-by: Fu, Siyuan git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15802 6f19259b-4bc3-4df7-8a09-765794883524 --- ....8za.patch => EDKII_openssl-0.9.8zb.patch} | 0 CryptoPkg/Library/OpensslLib/Install.cmd | 2 +- CryptoPkg/Library/OpensslLib/Install.sh | 2 +- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 +- CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt | 26 +++++++++---------- 5 files changed, 16 insertions(+), 16 deletions(-) rename CryptoPkg/Library/OpensslLib/{EDKII_openssl-0.9.8za.patch => EDKII_openssl-0.9.8zb.patch} (100%) diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8za.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8zb.patch similarity index 100% rename from CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8za.patch rename to CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8zb.patch diff --git a/CryptoPkg/Library/OpensslLib/Install.cmd b/CryptoPkg/Library/OpensslLib/Install.cmd index 2889467ac9..266c3a4f99 100755 --- a/CryptoPkg/Library/OpensslLib/Install.cmd +++ b/CryptoPkg/Library/OpensslLib/Install.cmd @@ -1,4 +1,4 @@ -cd openssl-0.9.8za +cd openssl-0.9.8zb copy e_os2.h ..\..\..\Include\openssl copy crypto\crypto.h ..\..\..\Include\openssl copy crypto\tmdiff.h ..\..\..\Include\openssl diff --git a/CryptoPkg/Library/OpensslLib/Install.sh b/CryptoPkg/Library/OpensslLib/Install.sh index f004362b33..1502ec5687 100755 --- a/CryptoPkg/Library/OpensslLib/Install.sh +++ b/CryptoPkg/Library/OpensslLib/Install.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd openssl-0.9.8za +cd openssl-0.9.8zb cp e_os2.h ../../../Include/openssl cp crypto/crypto.h ../../../Include/openssl cp crypto/tmdiff.h ../../../Include/openssl diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index 2b0f0f2553..5b3c421055 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -19,7 +19,7 @@ MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = OpensslLib - DEFINE OPENSSL_PATH = openssl-0.9.8za + DEFINE OPENSSL_PATH = openssl-0.9.8zb DEFINE OPENSSL_FLAGS = -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -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_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_ASM DEFINE OPENSSL_EXFLAGS = -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_MD2 -DOPENSSL_NO_SHA0 -DOPENSSL_NO_SHA512 -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_ENGINE diff --git a/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt b/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt index 0d7c37f272..a92e01ae6a 100644 --- a/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt +++ b/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt @@ -17,36 +17,36 @@ cryptography. This patch will enable openssl building under UEFI environment. ================================================================================ OpenSSL-Version ================================================================================ - Current supported OpenSSL version for UEFI Crypto Library is 0.9.8za. - http://www.openssl.org/source/openssl-0.9.8za.tar.gz + Current supported OpenSSL version for UEFI Crypto Library is 0.9.8zb. + http://www.openssl.org/source/openssl-0.9.8zb.tar.gz ================================================================================ HOW to Install Openssl for UEFI Building ================================================================================ -1. Download OpenSSL 0.9.8za from official website: - http://www.openssl.org/source/openssl-0.9.8za.tar.gz +1. Download OpenSSL 0.9.8zb from official website: + http://www.openssl.org/source/openssl-0.9.8zb.tar.gz - NOTE: Some web browsers may rename the downloaded TAR file to openssl-0.9.8za.tar.tar. - When you do the download, rename the "openssl-0.9.8za.tar.tar" to - "openssl-0.9.8za.tar.gz" or rename the local downloaded file with ".tar.tar" + NOTE: Some web browsers may rename the downloaded TAR file to openssl-0.9.8zb.tar.tar. + When you do the download, rename the "openssl-0.9.8zb.tar.tar" to + "openssl-0.9.8zb.tar.gz" or rename the local downloaded file with ".tar.tar" extension to ".tar.gz". -2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-0.9.8za +2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-0.9.8zb NOTE: If you use WinZip to unpack the openssl source in Windows, please uncheck the WinZip smart CR/LF conversion option (WINZIP: Options --> Configuration --> Miscellaneous --> "TAR file smart CR/LF conversion"). -3. Apply this patch: EDKII_openssl-0.9.8za.patch, and make installation +3. Apply this patch: EDKII_openssl-0.9.8zb.patch, and make installation For Windows Environment: ------------------------ 1) Make sure the patch utility has been installed in your machine. Install Cygwin or get the patch utility binary from http://gnuwin32.sourceforge.net/packages/patch.htm - 2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-0.9.8za - 3) patch -p0 -i ..\EDKII_openssl-0.9.8za.patch + 2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-0.9.8zb + 3) patch -p0 -i ..\EDKII_openssl-0.9.8zb.patch 4) cd .. 5) Install.cmd @@ -54,8 +54,8 @@ cryptography. This patch will enable openssl building under UEFI environment. ----------------------- 1) Make sure the patch utility has been installed in your machine. Patch utility is available from http://directory.fsf.org/project/patch/ - 2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-0.9.8za - 3) patch -p0 -i ../EDKII_openssl-0.9.8za.patch + 2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-0.9.8zb + 3) patch -p0 -i ../EDKII_openssl-0.9.8zb.patch 4) cd .. 5) ./Install.sh -- 2.39.2