Skip to content

Commit d47da78

Browse files
Long Qinqlong
Long Qin
authored and
qlong
committed
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 <[email protected]> Reviewed-by: Dong Guo <[email protected]> Reviewed-by: Ye Ting <[email protected]> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16641 6f19259b-4bc3-4df7-8a09-765794883524
1 parent d71c25c commit d47da78

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

CryptoPkg/Library/OpensslLib/Install.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cd openssl-0.9.8zb
1+
cd openssl-0.9.8ze
22
copy e_os2.h ..\..\..\Include\openssl
33
copy crypto\crypto.h ..\..\..\Include\openssl
44
copy crypto\tmdiff.h ..\..\..\Include\openssl

CryptoPkg/Library/OpensslLib/Install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
cd openssl-0.9.8zb
3+
cd openssl-0.9.8ze
44
cp e_os2.h ../../../Include/openssl
55
cp crypto/crypto.h ../../../Include/openssl
66
cp crypto/tmdiff.h ../../../Include/openssl

CryptoPkg/Library/OpensslLib/OpensslLib.inf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## @file
22
# This module provides openSSL Library implementation.
33
#
4-
# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
4+
# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
55
# This program and the accompanying materials
66
# are licensed and made available under the terms and conditions of the BSD License
77
# which accompanies this distribution. The full text of the license may be found at
@@ -20,7 +20,7 @@
2020
MODULE_TYPE = BASE
2121
VERSION_STRING = 1.0
2222
LIBRARY_CLASS = OpensslLib
23-
DEFINE OPENSSL_PATH = openssl-0.9.8zb
23+
DEFINE OPENSSL_PATH = openssl-0.9.8ze
2424
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
2525
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
2626

CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt

+13-13
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,45 @@ cryptography. This patch will enable openssl building under UEFI environment.
1717
================================================================================
1818
OpenSSL-Version
1919
================================================================================
20-
Current supported OpenSSL version for UEFI Crypto Library is 0.9.8zb.
21-
http://www.openssl.org/source/openssl-0.9.8zb.tar.gz
20+
Current supported OpenSSL version for UEFI Crypto Library is 0.9.8ze.
21+
http://www.openssl.org/source/openssl-0.9.8ze.tar.gz
2222

2323

2424
================================================================================
2525
HOW to Install Openssl for UEFI Building
2626
================================================================================
27-
1. Download OpenSSL 0.9.8zb from official website:
28-
http://www.openssl.org/source/openssl-0.9.8zb.tar.gz
27+
1. Download OpenSSL 0.9.8ze from official website:
28+
http://www.openssl.org/source/openssl-0.9.8ze.tar.gz
2929

30-
NOTE: Some web browsers may rename the downloaded TAR file to openssl-0.9.8zb.tar.tar.
31-
When you do the download, rename the "openssl-0.9.8zb.tar.tar" to
32-
"openssl-0.9.8zb.tar.gz" or rename the local downloaded file with ".tar.tar"
30+
NOTE: Some web browsers may rename the downloaded TAR file to openssl-0.9.8ze.tar.tar.
31+
When you do the download, rename the "openssl-0.9.8ze.tar.tar" to
32+
"openssl-0.9.8ze.tar.gz" or rename the local downloaded file with ".tar.tar"
3333
extension to ".tar.gz".
3434

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

3737
NOTE: If you use WinZip to unpack the openssl source in Windows, please
3838
uncheck the WinZip smart CR/LF conversion option (WINZIP: Options -->
3939
Configuration --> Miscellaneous --> "TAR file smart CR/LF conversion").
4040

41-
3. Apply this patch: EDKII_openssl-0.9.8zb.patch, and make installation
41+
3. Apply this patch: EDKII_openssl-0.9.8ze.patch, and make installation
4242

4343
For Windows Environment:
4444
------------------------
4545
1) Make sure the patch utility has been installed in your machine.
4646
Install Cygwin or get the patch utility binary from
4747
http://gnuwin32.sourceforge.net/packages/patch.htm
48-
2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-0.9.8zb
49-
3) patch -p0 -i ..\EDKII_openssl-0.9.8zb.patch
48+
2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-0.9.8ze
49+
3) patch -p0 -i ..\EDKII_openssl-0.9.8ze.patch
5050
4) cd ..
5151
5) Install.cmd
5252

5353
For Linux* Environment:
5454
-----------------------
5555
1) Make sure the patch utility has been installed in your machine.
5656
Patch utility is available from http://directory.fsf.org/project/patch/
57-
2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-0.9.8zb
58-
3) patch -p0 -i ../EDKII_openssl-0.9.8zb.patch
57+
2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-0.9.8ze
58+
3) patch -p0 -i ../EDKII_openssl-0.9.8ze.patch
5959
4) cd ..
6060
5) ./Install.sh
6161

0 commit comments

Comments
 (0)