tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

CryptoPkg/OpensslLib: Upgrade OpenSSL version to 1.0.2f

Browse Source 
OpenSSL has released version 1.0.2f with two security fixes
(http://www.openssl.org/news/secadv/20160128.txt) at 28-Jan-2016.
Upgrade the supported OpenSSL version in CryptoPkg/OpensslLib
to catch the latest release 1.0.2f.
(NOTE: The patch file was just re-generated, and no new source
       changes was introduced for 1.0.2f enabling)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qin Long <qin.long@intel.com>
Reviewed-by: Ting Ye <ting.ye@intel.com>
This commit is contained in:
Qin Long 2016-02-23 11:12:51 +08:00
parent e3b76f3b5e
commit e6b2c99121
5 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2e.patch → CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch
View File

@ -1,7 +1,7 @@
diff U3 crypto/bio/bio.h crypto/bio/bio.h diff U3 crypto/bio/bio.h crypto/bio/bio.h
--- crypto/bio/bio.h Thu Jun 11 21:50:12 2015 --- crypto/bio/bio.h Thu Jan 28 21:56:08 2016
+++ crypto/bio/bio.h Fri Jun 12 11:00:52 2015 +++ crypto/bio/bio.h Wed Feb 17 16:43:40 2016
@@ -646,10 +646,10 @@ @@ -650,10 +650,10 @@
int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix, int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
asn1_ps_func **psuffix_free); asn1_ps_func **psuffix_free);
@ -14,8 +14,8 @@ diff U3 crypto/bio/bio.h crypto/bio/bio.h
# endif # endif
BIO *BIO_new(BIO_METHOD *type); BIO *BIO_new(BIO_METHOD *type);
diff U3 crypto/bio/bss_file.c crypto/bio/bss_file.c diff U3 crypto/bio/bss_file.c crypto/bio/bss_file.c
--- crypto/bio/bss_file.c Thu Jun 11 21:01:06 2015 --- crypto/bio/bss_file.c Thu Jan 28 21:38:30 2016
+++ crypto/bio/bss_file.c Fri Jun 12 11:01:28 2015 +++ crypto/bio/bss_file.c Wed Feb 17 16:01:02 2016
@@ -467,6 +467,23 @@ @@ -467,6 +467,23 @@
return (ret); return (ret);
} }
@ -41,8 +41,8 @@ diff U3 crypto/bio/bss_file.c crypto/bio/bss_file.c
#endif /* HEADER_BSS_FILE_C */ #endif /* HEADER_BSS_FILE_C */
diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c
--- crypto/dh/dh_pmeth.c Thu Jun 11 21:50:12 2015 --- crypto/dh/dh_pmeth.c Thu Jan 28 21:56:08 2016
+++ crypto/dh/dh_pmeth.c Fri Jun 12 11:08:48 2015 +++ crypto/dh/dh_pmeth.c Wed Feb 17 16:15:58 2016
@@ -449,6 +449,9 @@ @@ -449,6 +449,9 @@
*keylen = ret; *keylen = ret;
return 1; return 1;
@ -62,8 +62,8 @@ diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c
return 1; return 1;
} }
diff U3 crypto/pem/pem.h crypto/pem/pem.h diff U3 crypto/pem/pem.h crypto/pem/pem.h
--- crypto/pem/pem.h Thu Jun 11 21:50:12 2015 --- crypto/pem/pem.h Thu Jan 28 21:56:08 2016
+++ crypto/pem/pem.h Fri Jun 12 10:58:18 2015 +++ crypto/pem/pem.h Wed Feb 17 15:56:26 2016
@@ -324,6 +324,7 @@ @@ -324,6 +324,7 @@
# define DECLARE_PEM_read_fp(name, type) /**/ # define DECLARE_PEM_read_fp(name, type) /**/
@ -73,8 +73,8 @@ diff U3 crypto/pem/pem.h crypto/pem/pem.h
# else # else
diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c
--- crypto/pkcs7/pk7_smime.c Thu Jun 11 21:01:06 2015 --- crypto/pkcs7/pk7_smime.c Thu Jan 28 21:56:08 2016
+++ crypto/pkcs7/pk7_smime.c Fri Jun 12 11:23:38 2015 +++ crypto/pkcs7/pk7_smime.c Wed Feb 17 16:22:45 2016
@@ -254,7 +254,8 @@ @@ -254,7 +254,8 @@
STACK_OF(PKCS7_SIGNER_INFO) *sinfos; STACK_OF(PKCS7_SIGNER_INFO) *sinfos;
PKCS7_SIGNER_INFO *si; PKCS7_SIGNER_INFO *si;
@ -114,11 +114,10 @@ diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c
if (i <= 0) if (i <= 0)
break; break;
if (tmpout) if (tmpout)
@@ -394,6 +394,10 @@ @@ -394,6 +394,9 @@
} }
BIO_free_all(p7bio); BIO_free_all(p7bio);
sk_X509_free(signers); sk_X509_free(signers);
+
+ if (buf != NULL) { + if (buf != NULL) {
+ OPENSSL_free(buf); + OPENSSL_free(buf);
+ } + }
@ -126,8 +125,8 @@ diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c
} }
diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c
--- crypto/rand/rand_unix.c Thu Jun 11 21:01:06 2015 --- crypto/rand/rand_unix.c Thu Jan 28 21:38:32 2016
+++ crypto/rand/rand_unix.c Fri Jun 12 10:51:21 2015 +++ crypto/rand/rand_unix.c Wed Feb 17 15:40:02 2016
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
#include <openssl/rand.h> #include <openssl/rand.h>
#include "rand_lcl.h" #include "rand_lcl.h"
@ -147,8 +146,8 @@ diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c
{ {
return 0; return 0;
diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
--- crypto/rsa/rsa_ameth.c Thu Jun 11 21:50:12 2015 --- crypto/rsa/rsa_ameth.c Thu Jan 28 21:56:08 2016
+++ crypto/rsa/rsa_ameth.c Fri Jun 12 10:45:38 2015 +++ crypto/rsa/rsa_ameth.c Wed Feb 17 15:09:46 2016
@@ -68,10 +68,12 @@ @@ -68,10 +68,12 @@
#endif #endif
#include "asn1_locl.h" #include "asn1_locl.h"
@ -221,8 +220,8 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = { const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = {
{ {
diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c
--- crypto/x509/x509_vfy.c Thu Jun 11 21:52:58 2015 --- crypto/x509/x509_vfy.c Thu Jan 28 21:56:08 2016
+++ crypto/x509/x509_vfy.c Fri Jun 12 11:29:37 2015 +++ crypto/x509/x509_vfy.c Wed Feb 17 16:09:58 2016
@@ -940,6 +940,8 @@ @@ -940,6 +940,8 @@
ctx->current_crl = crl; ctx->current_crl = crl;
if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME) if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)
@ -242,8 +241,8 @@ diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c
ptime = NULL; ptime = NULL;
diff U3 crypto/x509/x509_vfy.h crypto/x509/x509_vfy.h diff U3 crypto/x509/x509_vfy.h crypto/x509/x509_vfy.h
--- crypto/x509/x509_vfy.h Thu Jul 09 19:57:16 2015 --- crypto/x509/x509_vfy.h Thu Jan 28 21:56:08 2016
+++ crypto/x509/x509_vfy.h Thu Oct 29 14:05:57 2015 +++ crypto/x509/x509_vfy.h Wed Feb 17 16:08:18 2016
@@ -438,6 +438,8 @@ @@ -438,6 +438,8 @@
* will force the behaviour to match that of previous versions. * will force the behaviour to match that of previous versions.
*/ */
@ -254,8 +253,8 @@ diff U3 crypto/x509/x509_vfy.h crypto/x509/x509_vfy.h
# define X509_VP_FLAG_DEFAULT 0x1 # define X509_VP_FLAG_DEFAULT 0x1
# define X509_VP_FLAG_OVERWRITE 0x2 # define X509_VP_FLAG_OVERWRITE 0x2
diff U3 crypto/x509v3/ext_dat.h crypto/x509v3/ext_dat.h diff U3 crypto/x509v3/ext_dat.h crypto/x509v3/ext_dat.h
--- crypto/x509v3/ext_dat.h Thu Jun 11 21:50:12 2015 --- crypto/x509v3/ext_dat.h Thu Jan 28 21:56:08 2016
+++ crypto/x509v3/ext_dat.h Fri Jun 12 11:11:03 2015 +++ crypto/x509v3/ext_dat.h Wed Feb 17 16:13:30 2016
@@ -127,8 +127,10 @@ @@ -127,8 +127,10 @@
&v3_idp, &v3_idp,
&v3_alt[2], &v3_alt[2],
@ -268,8 +267,8 @@ diff U3 crypto/x509v3/ext_dat.h crypto/x509v3/ext_dat.h
/* Number of standard extensions */ /* Number of standard extensions */
diff U3 crypto/crypto.h crypto/crypto.h diff U3 crypto/crypto.h crypto/crypto.h
--- crypto/crypto.h Thu Jun 11 21:01:06 2015 --- crypto/crypto.h Thu Jan 28 21:38:30 2016
+++ crypto/crypto.h Fri Jun 12 11:33:27 2015 +++ crypto/crypto.h Wed Feb 17 16:33:00 2016
@@ -235,15 +235,15 @@ @@ -235,15 +235,15 @@
# ifndef OPENSSL_NO_LOCKING # ifndef OPENSSL_NO_LOCKING
# ifndef CRYPTO_w_lock # ifndef CRYPTO_w_lock
@ -353,8 +352,8 @@ diff U3 crypto/crypto.h crypto/crypto.h
# else # else
diff U3 crypto/opensslconf.h crypto/opensslconf.h diff U3 crypto/opensslconf.h crypto/opensslconf.h
--- crypto/opensslconf.h Thu Jun 11 21:55:38 2015 --- crypto/opensslconf.h Thu Jan 28 21:57:22 2016
+++ crypto/opensslconf.h Fri Jun 12 10:28:27 2015 +++ crypto/opensslconf.h Wed Feb 17 14:58:26 2016
@@ -5,15 +5,72 @@ @@ -5,15 +5,72 @@
extern "C" { extern "C" {
#endif #endif
@ -675,8 +674,8 @@ diff U3 crypto/opensslconf.h crypto/opensslconf.h
#undef BN_LLONG #undef BN_LLONG
diff U3 e_os.h e_os.h diff U3 e_os.h e_os.h
--- e_os.h Thu Jul 09 19:57:16 2015 --- e_os.h Thu Jan 28 21:56:08 2016
+++ e_os.h Thu Oct 29 16:54:10 2015 +++ e_os.h Wed Feb 17 15:52:08 2016
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
# define MSDOS # define MSDOS
# endif # endif
@ -687,8 +686,8 @@ diff U3 e_os.h e_os.h
# endif # endif
diff U3 e_os2.h e_os2.h diff U3 e_os2.h e_os2.h
--- e_os2.h Thu Jul 09 19:57:16 2015 --- e_os2.h Thu Jan 28 21:56:08 2016
+++ e_os2.h Thu Oct 29 15:08:19 2015 +++ e_os2.h Wed Feb 17 15:53:08 2016
@@ -97,7 +97,14 @@ @@ -97,7 +97,14 @@
* For 32 bit environment, there seems to be the CygWin environment and then * For 32 bit environment, there seems to be the CygWin environment and then
* all the others that try to do the same thing Microsoft does... * all the others that try to do the same thing Microsoft does...

2
CryptoPkg/Library/OpensslLib/Install.cmd
View File

@ -1,4 +1,4 @@
cd openssl-1.0.2e cd openssl-1.0.2f
copy e_os2.h ..\..\..\Include\openssl copy e_os2.h ..\..\..\Include\openssl
copy crypto\crypto.h ..\..\..\Include\openssl copy crypto\crypto.h ..\..\..\Include\openssl
copy crypto\opensslv.h ..\..\..\Include\openssl copy crypto\opensslv.h ..\..\..\Include\openssl

2
CryptoPkg/Library/OpensslLib/Install.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
cd openssl-1.0.2e cd openssl-1.0.2f
cp e_os2.h ../../../Include/openssl cp e_os2.h ../../../Include/openssl
cp crypto/crypto.h ../../../Include/openssl cp crypto/crypto.h ../../../Include/openssl
cp crypto/opensslv.h ../../../Include/openssl cp crypto/opensslv.h ../../../Include/openssl

4
CryptoPkg/Library/OpensslLib/OpensslLib.inf
View File

@ -1,7 +1,7 @@
## @file ## @file
# This module provides openSSL Library implementation. # This module provides openSSL Library implementation.
# #
# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
@ -20,7 +20,7 @@
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = OpensslLib LIBRARY_CLASS = OpensslLib
DEFINE OPENSSL_PATH = openssl-1.0.2e DEFINE OPENSSL_PATH = openssl-1.0.2f
DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
# #

26
CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt
View File

@ -17,36 +17,36 @@ cryptography. This patch will enable openssl building under UEFI environment.
================================================================================ ================================================================================
OpenSSL-Version OpenSSL-Version
================================================================================ ================================================================================
Current supported OpenSSL version for UEFI Crypto Library is 1.0.2e. Current supported OpenSSL version for UEFI Crypto Library is 1.0.2f.
http://www.openssl.org/source/openssl-1.0.2e.tar.gz http://www.openssl.org/source/openssl-1.0.2f.tar.gz
================================================================================ ================================================================================
HOW to Install Openssl for UEFI Building HOW to Install Openssl for UEFI Building
================================================================================ ================================================================================
1. Download OpenSSL 1.0.2e from official website: 1. Download OpenSSL 1.0.2f from official website:
http://www.openssl.org/source/openssl-1.0.2e.tar.gz http://www.openssl.org/source/openssl-1.0.2f.tar.gz
NOTE: Some web browsers may rename the downloaded TAR file to openssl-1.0.2e.tar.tar. NOTE: Some web browsers may rename the downloaded TAR file to openssl-1.0.2f.tar.tar.
When you do the download, rename the "openssl-1.0.2e.tar.tar" to When you do the download, rename the "openssl-1.0.2f.tar.tar" to
"openssl-1.0.2e.tar.gz" or rename the local downloaded file with ".tar.tar" "openssl-1.0.2f.tar.gz" or rename the local downloaded file with ".tar.tar"
extension to ".tar.gz". extension to ".tar.gz".
2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-1.0.2e 2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-1.0.2f
NOTE: If you use WinZip to unpack the openssl source in Windows, please NOTE: If you use WinZip to unpack the openssl source in Windows, please
uncheck the WinZip smart CR/LF conversion option (WINZIP: Options --> uncheck the WinZip smart CR/LF conversion option (WINZIP: Options -->
Configuration --> Miscellaneous --> "TAR file smart CR/LF conversion"). Configuration --> Miscellaneous --> "TAR file smart CR/LF conversion").
3. Apply this patch: EDKII_openssl-1.0.2e.patch, and make installation 3. Apply this patch: EDKII_openssl-1.0.2f.patch, and make installation
For Windows Environment: For Windows Environment:
------------------------ ------------------------
1) Make sure the patch utility has been installed in your machine. 1) Make sure the patch utility has been installed in your machine.
Install Cygwin or get the patch utility binary from Install Cygwin or get the patch utility binary from
http://gnuwin32.sourceforge.net/packages/patch.htm http://gnuwin32.sourceforge.net/packages/patch.htm
2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-1.0.2e 2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-1.0.2f
3) patch -p0 -i ..\EDKII_openssl-1.0.2e.patch 3) patch -p0 -i ..\EDKII_openssl-1.0.2f.patch
4) cd .. 4) cd ..
5) Install.cmd 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. 1) Make sure the patch utility has been installed in your machine.
Patch utility is available from http://directory.fsf.org/project/patch/ Patch utility is available from http://directory.fsf.org/project/patch/
2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-1.0.2e 2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-1.0.2f
3) patch -p0 -i ../EDKII_openssl-1.0.2e.patch 3) patch -p0 -i ../EDKII_openssl-1.0.2f.patch
4) cd .. 4) cd ..
5) ./Install.sh 5) ./Install.sh