summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lin <glin@suse.com>2016-03-17 14:54:55 +0800
committerPeter Jones <pjones@redhat.com>2016-09-06 15:05:36 -0400
commitafaf0a4205fdb560889e12a6f3cc1f5e3e09ac7b (patch)
treeaa97e7b7ad74ab3ad782a4af39ba1a097d063a41
parente571428e21280c28d0d591b70f13add7d8dbfe81 (diff)
downloadefi-boot-shim-afaf0a4205fdb560889e12a6f3cc1f5e3e09ac7b.tar.gz
efi-boot-shim-afaf0a4205fdb560889e12a6f3cc1f5e3e09ac7b.zip
Amend the CryptLib update scripts for openssl 1.0.2g
Also update the path to the openssl headers. Signed-off-by: Gary Lin <glin@suse.com>
-rwxr-xr-xCryptlib/OpenSSL/update.sh2
-rwxr-xr-xCryptlib/update.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/update.sh b/Cryptlib/OpenSSL/update.sh
index a40f7338..b0fc5afc 100755
--- a/Cryptlib/OpenSSL/update.sh
+++ b/Cryptlib/OpenSSL/update.sh
@@ -1,6 +1,6 @@
#/bin/sh
DIR=$1
-version="1.0.2e"
+version="1.0.2g"
install -D $DIR/CryptoPkg/Library/OpensslLib/openssl-$version/e_os.h e_os.h
install -D $DIR/CryptoPkg/Library/OpensslLib/openssl-$version/crypto/constant_time_locl.h crypto/constant_time_locl.h
diff --git a/Cryptlib/update.sh b/Cryptlib/update.sh
index f05036e4..3724f4d2 100755
--- a/Cryptlib/update.sh
+++ b/Cryptlib/update.sh
@@ -1,6 +1,7 @@
#!/bin/bash
DIR=$1
+OPENSSL_VERSION="1.0.2g"
cp $DIR/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h InternalCryptLib.h
cp $DIR/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c Hash/CryptMd4.c
@@ -26,6 +27,6 @@ cp $DIR/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c SysCall/CrtWrapper.c
cp $DIR/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c SysCall/TimerWrapper.c
cp $DIR/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c SysCall/BaseMemAllocation.c
-cp $DIR/CryptoPkg/Include/openssl/* Include/openssl/
+cp $DIR/CryptoPkg/Library/OpensslLib/openssl-${OPENSSL_VERSION}/include/openssl/* Include/openssl/
patch -p2 <Cryptlib.diff