Update OpenSSL support to the latest release (0.9.8ze, 15-Jan-2015).

Contributed-under: TianoCore Contribution Agreement 1.0

Signed-off-by: Long Qin <qin.long@intel.com>
Reviewed-by: Dong Guo <guo.dong@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16641 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 17 insertions, 17 deletions

diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8zb.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8ze.patch
index c5f646ee96..c5f646ee96 100644
--- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8zb.patch
+++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8ze.patch
diff --git a/CryptoPkg/Library/OpensslLib/Install.cmd b/CryptoPkg/Library/OpensslLib/Install.cmd
index 266c3a4f99..ac9f4999b1 100755
--- a/CryptoPkg/Library/OpensslLib/Install.cmd
+++ b/CryptoPkg/Library/OpensslLib/Install.cmd
@@ -1,4 +1,4 @@
-cd openssl-0.9.8zb

+cd openssl-0.9.8ze

 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 1502ec5687..69fd563c91 100755
--- a/CryptoPkg/Library/OpensslLib/Install.sh
+++ b/CryptoPkg/Library/OpensslLib/Install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-cd openssl-0.9.8zb
+cd openssl-0.9.8ze
 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 ab44e89b72..be46aea1ef 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  This module provides openSSL Library implementation.

 #

-#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -20,7 +20,7 @@
   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = OpensslLib

-  DEFINE OPENSSL_PATH            = openssl-0.9.8zb

+  DEFINE OPENSSL_PATH            = openssl-0.9.8ze

   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_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 a92e01ae6a..58ff5bb315 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.8zb.

-    http://www.openssl.org/source/openssl-0.9.8zb.tar.gz

+  Current supported OpenSSL version for UEFI Crypto Library is 0.9.8ze.

+    http://www.openssl.org/source/openssl-0.9.8ze.tar.gz

 

 

 ================================================================================

                       HOW to Install Openssl for UEFI Building

 ================================================================================

-1.  Download OpenSSL 0.9.8zb from official website:

-   	http://www.openssl.org/source/openssl-0.9.8zb.tar.gz

+1.  Download OpenSSL 0.9.8ze from official website:

+   	http://www.openssl.org/source/openssl-0.9.8ze.tar.gz

 

-    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"

+    NOTE: Some web browsers may rename the downloaded TAR file to openssl-0.9.8ze.tar.tar.

+          When you do the download, rename the "openssl-0.9.8ze.tar.tar" to

+          "openssl-0.9.8ze.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.8zb

+2.  Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-0.9.8ze

 

     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.8zb.patch, and make installation

+3.  Apply this patch: EDKII_openssl-0.9.8ze.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.8zb

-    3) patch -p0 -i ..\EDKII_openssl-0.9.8zb.patch

+    2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-0.9.8ze

+    3) patch -p0 -i ..\EDKII_openssl-0.9.8ze.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.8zb

-    3) patch -p0 -i ../EDKII_openssl-0.9.8zb.patch

+    2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-0.9.8ze

+    3) patch -p0 -i ../EDKII_openssl-0.9.8ze.patch

     4) cd ..

     5) ./Install.sh