diff options
author | Long, Qin <qin.long@intel.com> | 2014-07-08 03:03:24 +0000 |
---|---|---|
committer | qlong <qlong@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-07-08 03:03:24 +0000 |
commit | a6908c99aa48551616c25cf594862d3629ce91c0 (patch) | |
tree | 8cd413c7df58a49abd6e44cae23fec621c46aa93 | |
parent | 4918a06a65f0b700c73164cfb4e8c18274a5e5af (diff) | |
download | edk2-a6908c99aa48551616c25cf594862d3629ce91c0.tar.gz edk2-a6908c99aa48551616c25cf594862d3629ce91c0.tar.bz2 edk2-a6908c99aa48551616c25cf594862d3629ce91c0.zip |
Update OpenSSL from 0.9.8w to the latest 0.9.8za.
Main changes include:
1. Update the patch file for 0.9.8za;
2. Update the install scripts to align the path for 0.9.8za;
3. OpensslLib.inf : Update the OPENSSL_PATH for 0.9.8za; enable more OPENSLL FLAGS to disable those un-used algorithms for better build performance and size;
4. Update the HOWTO file to align new OpenSSL version.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Long, Qin <qin.long@intel.com>
Reviewed-by: Ye, Ting <ting.ye@intel.com>
Reviewed-by: Fu, Siyuan <siyuan.fu@intel.com>
Reviewed-by: Dong, Guo <guo.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15638 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r-- | CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8za.patch (renamed from CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8w.patch) | 0 | ||||
-rwxr-xr-x | CryptoPkg/Library/OpensslLib/Install.cmd | 4 | ||||
-rwxr-xr-x | CryptoPkg/Library/OpensslLib/Install.sh | 2 | ||||
-rw-r--r-- | CryptoPkg/Library/OpensslLib/OpensslLib.inf | 236 | ||||
-rw-r--r-- | CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt | 26 |
5 files changed, 159 insertions, 109 deletions
diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8w.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8za.patch index c5f646ee96..c5f646ee96 100644 --- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8w.patch +++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8za.patch diff --git a/CryptoPkg/Library/OpensslLib/Install.cmd b/CryptoPkg/Library/OpensslLib/Install.cmd index a2a88e44e5..2889467ac9 100755 --- a/CryptoPkg/Library/OpensslLib/Install.cmd +++ b/CryptoPkg/Library/OpensslLib/Install.cmd @@ -1,4 +1,4 @@ -cd openssl-0.9.8w
+cd openssl-0.9.8za
copy e_os2.h ..\..\..\Include\openssl
copy crypto\crypto.h ..\..\..\Include\openssl
copy crypto\tmdiff.h ..\..\..\Include\openssl
@@ -68,4 +68,4 @@ copy ssl\ssl23.h ..\..\..\Include\openssl copy ssl\tls1.h ..\..\..\Include\openssl
copy ssl\dtls1.h ..\..\..\Include\openssl
copy ssl\kssl.h ..\..\..\Include\openssl
-cd ..
\ No newline at end of file +cd ..
diff --git a/CryptoPkg/Library/OpensslLib/Install.sh b/CryptoPkg/Library/OpensslLib/Install.sh index 22183615a4..f004362b33 100755 --- a/CryptoPkg/Library/OpensslLib/Install.sh +++ b/CryptoPkg/Library/OpensslLib/Install.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd openssl-0.9.8w +cd openssl-0.9.8za 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 ded563c3b4..1d28ae7f6a 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -1,7 +1,7 @@ ## @file
# OpenSSL Library implementation.
#
-# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2014, 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
@@ -19,9 +19,9 @@ MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = OpensslLib
- DEFINE OPENSSL_PATH = openssl-0.9.8w
+ DEFINE OPENSSL_PATH = openssl-0.9.8za
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_SHA0 -DOPENSSL_NO_SHA512 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED
+ DEFINE OPENSSL_EXFLAGS = -DOPENSSL_SMALL_FOOTPRINT -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
#
# OPENSSL_FLAGS is set to define the following flags to be compatible with
@@ -77,8 +77,12 @@ $(OPENSSL_PATH)/crypto/o_dir.c
$(OPENSSL_PATH)/crypto/o_init.c
$(OPENSSL_PATH)/crypto/fips_err.c
- $(OPENSSL_PATH)/crypto/md2/md2_dgst.c
- $(OPENSSL_PATH)/crypto/md2/md2_one.c
+
+ #
+ # DIsabled by OPENSSL_NO_MD2
+ #
+ # $(OPENSSL_PATH)/crypto/md2/md2_dgst.c
+ # $(OPENSSL_PATH)/crypto/md2/md2_one.c
$(OPENSSL_PATH)/crypto/md4/md4_dgst.c
$(OPENSSL_PATH)/crypto/md4/md4_one.c
$(OPENSSL_PATH)/crypto/md5/md5_dgst.c
@@ -90,8 +94,13 @@ $(OPENSSL_PATH)/crypto/sha/sha256.c
$(OPENSSL_PATH)/crypto/sha/sha512.c
$(OPENSSL_PATH)/crypto/hmac/hmac.c
- $(OPENSSL_PATH)/crypto/ripemd/rmd_dgst.c
- $(OPENSSL_PATH)/crypto/ripemd/rmd_one.c
+
+ #
+ # Disabled by OPENSSL_NO_RIPEMD
+ #
+ # $(OPENSSL_PATH)/crypto/ripemd/rmd_dgst.c
+ # $(OPENSSL_PATH)/crypto/ripemd/rmd_one.c
+
$(OPENSSL_PATH)/crypto/des/des_lib.c
$(OPENSSL_PATH)/crypto/des/set_key.c
$(OPENSSL_PATH)/crypto/des/ecb_enc.c
@@ -119,29 +128,45 @@ $(OPENSSL_PATH)/crypto/des/des_old.c
$(OPENSSL_PATH)/crypto/des/des_old2.c
$(OPENSSL_PATH)/crypto/des/read2pwd.c
- $(OPENSSL_PATH)/crypto/rc2/rc2_ecb.c
- $(OPENSSL_PATH)/crypto/rc2/rc2_skey.c
- $(OPENSSL_PATH)/crypto/rc2/rc2_cbc.c
- $(OPENSSL_PATH)/crypto/rc2/rc2cfb64.c
- $(OPENSSL_PATH)/crypto/rc2/rc2ofb64.c
+
+ #
+ # Disabled by OPENSSL_NO_RC2
+ #
+ # $(OPENSSL_PATH)/crypto/rc2/rc2_ecb.c
+ # $(OPENSSL_PATH)/crypto/rc2/rc2_skey.c
+ # $(OPENSSL_PATH)/crypto/rc2/rc2_cbc.c
+ # $(OPENSSL_PATH)/crypto/rc2/rc2cfb64.c
+ # $(OPENSSL_PATH)/crypto/rc2/rc2ofb64.c
+
$(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
$(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
$(OPENSSL_PATH)/crypto/rc4/rc4_fblk.c
- $(OPENSSL_PATH)/crypto/idea/i_cbc.c
- $(OPENSSL_PATH)/crypto/idea/i_cfb64.c
- $(OPENSSL_PATH)/crypto/idea/i_ofb64.c
- $(OPENSSL_PATH)/crypto/idea/i_ecb.c
- $(OPENSSL_PATH)/crypto/idea/i_skey.c
- $(OPENSSL_PATH)/crypto/bf/bf_skey.c
- $(OPENSSL_PATH)/crypto/bf/bf_ecb.c
- $(OPENSSL_PATH)/crypto/bf/bf_enc.c
- $(OPENSSL_PATH)/crypto/bf/bf_cfb64.c
- $(OPENSSL_PATH)/crypto/bf/bf_ofb64.c
- $(OPENSSL_PATH)/crypto/cast/c_skey.c
- $(OPENSSL_PATH)/crypto/cast/c_ecb.c
- $(OPENSSL_PATH)/crypto/cast/c_enc.c
- $(OPENSSL_PATH)/crypto/cast/c_cfb64.c
- $(OPENSSL_PATH)/crypto/cast/c_ofb64.c
+
+ #
+ # Disabled by OPENSSL_NO_IDEA
+ #
+ # $(OPENSSL_PATH)/crypto/idea/i_cbc.c
+ # $(OPENSSL_PATH)/crypto/idea/i_cfb64.c
+ # $(OPENSSL_PATH)/crypto/idea/i_ofb64.c
+ # $(OPENSSL_PATH)/crypto/idea/i_ecb.c
+ # $(OPENSSL_PATH)/crypto/idea/i_skey.c
+ #
+ # Disabled by OPENSSL_NO_BF
+ #
+ # $(OPENSSL_PATH)/crypto/bf/bf_skey.c
+ # $(OPENSSL_PATH)/crypto/bf/bf_ecb.c
+ # $(OPENSSL_PATH)/crypto/bf/bf_enc.c
+ # $(OPENSSL_PATH)/crypto/bf/bf_cfb64.c
+ # $(OPENSSL_PATH)/crypto/bf/bf_ofb64.c
+ #
+ # Disabled by OPENSSL_NO_CAST
+ #
+ # $(OPENSSL_PATH)/crypto/cast/c_skey.c
+ # $(OPENSSL_PATH)/crypto/cast/c_ecb.c
+ # $(OPENSSL_PATH)/crypto/cast/c_enc.c
+ # $(OPENSSL_PATH)/crypto/cast/c_cfb64.c
+ # $(OPENSSL_PATH)/crypto/cast/c_ofb64.c
+
$(OPENSSL_PATH)/crypto/aes/aes_misc.c
$(OPENSSL_PATH)/crypto/aes/aes_ecb.c
$(OPENSSL_PATH)/crypto/aes/aes_cfb.c
@@ -198,16 +223,21 @@ $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
$(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
$(OPENSSL_PATH)/crypto/rsa/rsa_eng.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_gen.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_key.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_lib.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_asn1.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_vrf.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_sign.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_err.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_ossl.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_depr.c
- $(OPENSSL_PATH)/crypto/dsa/dsa_utl.c
+
+ #
+ # Disabled by OPENSSL_NO_DSA
+ #
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_gen.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_key.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_lib.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_asn1.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_vrf.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_sign.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_err.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_ossl.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_depr.c
+ # $(OPENSSL_PATH)/crypto/dsa/dsa_utl.c
+
$(OPENSSL_PATH)/crypto/dso/dso_dl.c
$(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c
$(OPENSSL_PATH)/crypto/dso/dso_err.c
@@ -223,30 +253,41 @@ $(OPENSSL_PATH)/crypto/dh/dh_check.c
$(OPENSSL_PATH)/crypto/dh/dh_err.c
$(OPENSSL_PATH)/crypto/dh/dh_depr.c
- $(OPENSSL_PATH)/crypto/ec/ec_lib.c
- $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c
- $(OPENSSL_PATH)/crypto/ec/ecp_mont.c
- $(OPENSSL_PATH)/crypto/ec/ecp_nist.c
- $(OPENSSL_PATH)/crypto/ec/ec_cvt.c
- $(OPENSSL_PATH)/crypto/ec/ec_mult.c
- $(OPENSSL_PATH)/crypto/ec/ec_err.c
- $(OPENSSL_PATH)/crypto/ec/ec_curve.c
- $(OPENSSL_PATH)/crypto/ec/ec_check.c
- $(OPENSSL_PATH)/crypto/ec/ec_print.c
- $(OPENSSL_PATH)/crypto/ec/ec_asn1.c
- $(OPENSSL_PATH)/crypto/ec/ec_key.c
- $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c
- $(OPENSSL_PATH)/crypto/ec/ec2_mult.c
- $(OPENSSL_PATH)/crypto/ecdh/ech_lib.c
- $(OPENSSL_PATH)/crypto/ecdh/ech_ossl.c
- $(OPENSSL_PATH)/crypto/ecdh/ech_key.c
- $(OPENSSL_PATH)/crypto/ecdh/ech_err.c
- $(OPENSSL_PATH)/crypto/ecdsa/ecs_lib.c
- $(OPENSSL_PATH)/crypto/ecdsa/ecs_asn1.c
- $(OPENSSL_PATH)/crypto/ecdsa/ecs_ossl.c
- $(OPENSSL_PATH)/crypto/ecdsa/ecs_sign.c
- $(OPENSSL_PATH)/crypto/ecdsa/ecs_vrf.c
- $(OPENSSL_PATH)/crypto/ecdsa/ecs_err.c
+
+ #
+ # Disabled by OPENSSL_NO_EC
+ #
+ # $(OPENSSL_PATH)/crypto/ec/ec_lib.c
+ # $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c
+ # $(OPENSSL_PATH)/crypto/ec/ecp_mont.c
+ # $(OPENSSL_PATH)/crypto/ec/ecp_nist.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_cvt.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_mult.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_err.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_curve.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_check.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_print.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_asn1.c
+ # $(OPENSSL_PATH)/crypto/ec/ec_key.c
+ # $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c
+ # $(OPENSSL_PATH)/crypto/ec/ec2_mult.c
+ #
+ # Disabled by OPENSSL_NO_ECDH
+ #
+ # $(OPENSSL_PATH)/crypto/ecdh/ech_lib.c
+ # $(OPENSSL_PATH)/crypto/ecdh/ech_ossl.c
+ # $(OPENSSL_PATH)/crypto/ecdh/ech_key.c
+ # $(OPENSSL_PATH)/crypto/ecdh/ech_err.c
+ #
+ # Disabled by OPENSSL_NO_ECDSA
+ #
+ # $(OPENSSL_PATH)/crypto/ecdsa/ecs_lib.c
+ # $(OPENSSL_PATH)/crypto/ecdsa/ecs_asn1.c
+ # $(OPENSSL_PATH)/crypto/ecdsa/ecs_ossl.c
+ # $(OPENSSL_PATH)/crypto/ecdsa/ecs_sign.c
+ # $(OPENSSL_PATH)/crypto/ecdsa/ecs_vrf.c
+ # $(OPENSSL_PATH)/crypto/ecdsa/ecs_err.c
+
$(OPENSSL_PATH)/crypto/buffer/buffer.c
$(OPENSSL_PATH)/crypto/buffer/buf_str.c
$(OPENSSL_PATH)/crypto/buffer/buf_err.c
@@ -523,38 +564,47 @@ $(OPENSSL_PATH)/crypto/comp/comp_err.c
$(OPENSSL_PATH)/crypto/comp/c_rle.c
$(OPENSSL_PATH)/crypto/comp/c_zlib.c
- $(OPENSSL_PATH)/crypto/engine/eng_err.c
- $(OPENSSL_PATH)/crypto/engine/eng_lib.c
- $(OPENSSL_PATH)/crypto/engine/eng_list.c
- $(OPENSSL_PATH)/crypto/engine/eng_init.c
- $(OPENSSL_PATH)/crypto/engine/eng_ctrl.c
- $(OPENSSL_PATH)/crypto/engine/eng_table.c
- $(OPENSSL_PATH)/crypto/engine/eng_pkey.c
- $(OPENSSL_PATH)/crypto/engine/eng_fat.c
- $(OPENSSL_PATH)/crypto/engine/eng_all.c
- $(OPENSSL_PATH)/crypto/engine/tb_rsa.c
- $(OPENSSL_PATH)/crypto/engine/tb_dsa.c
- $(OPENSSL_PATH)/crypto/engine/tb_ecdsa.c
- $(OPENSSL_PATH)/crypto/engine/tb_dh.c
- $(OPENSSL_PATH)/crypto/engine/tb_ecdh.c
- $(OPENSSL_PATH)/crypto/engine/tb_rand.c
- $(OPENSSL_PATH)/crypto/engine/tb_store.c
- $(OPENSSL_PATH)/crypto/engine/tb_cipher.c
- $(OPENSSL_PATH)/crypto/engine/tb_digest.c
- $(OPENSSL_PATH)/crypto/engine/eng_openssl.c
- $(OPENSSL_PATH)/crypto/engine/eng_cnf.c
- $(OPENSSL_PATH)/crypto/engine/eng_dyn.c
- $(OPENSSL_PATH)/crypto/engine/eng_cryptodev.c
- $(OPENSSL_PATH)/crypto/engine/eng_padlock.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
- $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
+
+ #
+ # Disabled by OPENSSL_NO_ENGINE
+ #
+ # $(OPENSSL_PATH)/crypto/engine/eng_err.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_lib.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_list.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_init.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_ctrl.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_table.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_pkey.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_fat.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_all.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_rsa.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_dsa.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_ecdsa.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_dh.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_ecdh.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_rand.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_store.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_cipher.c
+ # $(OPENSSL_PATH)/crypto/engine/tb_digest.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_openssl.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_cnf.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_dyn.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_cryptodev.c
+ # $(OPENSSL_PATH)/crypto/engine/eng_padlock.c
+
+ #
+ # Disabled by OPENSSL_NO_OCSP
+ #
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
+ # $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
+
$(OPENSSL_PATH)/crypto/ui/ui_err.c
$(OPENSSL_PATH)/crypto/ui/ui_lib.c
diff --git a/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt b/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt index 7641da8e4a..0d7c37f272 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.8w.
- http://www.openssl.org/source/openssl-0.9.8w.tar.gz
+ Current supported OpenSSL version for UEFI Crypto Library is 0.9.8za.
+ http://www.openssl.org/source/openssl-0.9.8za.tar.gz
================================================================================
HOW to Install Openssl for UEFI Building
================================================================================
-1. Download OpenSSL 0.9.8w from official website:
- http://www.openssl.org/source/openssl-0.9.8w.tar.gz
+1. Download OpenSSL 0.9.8za from official website:
+ http://www.openssl.org/source/openssl-0.9.8za.tar.gz
- NOTE: Some web browsers may rename the downloaded TAR file to openssl-0.9.8w.tar.tar.
- When you do the download, rename the "openssl-0.9.8w.tar.tar" to
- "openssl-0.9.8w.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.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"
extension to ".tar.gz".
-2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-0.9.8w
+2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-0.9.8za
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.8w.patch, and make installation
+3. Apply this patch: EDKII_openssl-0.9.8za.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.8w
- 3) patch -p0 -i ..\EDKII_openssl-0.9.8w.patch
+ 2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-0.9.8za
+ 3) patch -p0 -i ..\EDKII_openssl-0.9.8za.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.8w
- 3) patch -p0 -i ../EDKII_openssl-0.9.8w.patch
+ 2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-0.9.8za
+ 3) patch -p0 -i ../EDKII_openssl-0.9.8za.patch
4) cd ..
5) ./Install.sh
|