summaryrefslogtreecommitdiff
path: root/Cryptlib/update.sh
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2018-08-21 14:22:44 -0400
committerMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2018-08-21 14:22:44 -0400
commit7bf7a6d0852382bb645119b18df3ff461aaba247 (patch)
tree74089c9a1e552dfb9e5efa57468c8d7afda7e415 /Cryptlib/update.sh
parentf892ac66084ab0315adb0c52e4a39b518730d023 (diff)
downloadefi-boot-shim-upstream/15+1533136590.3beb971.tar.gz
efi-boot-shim-upstream/15+1533136590.3beb971.zip
New upstream version 15+1533136590.3beb971upstream/15+1533136590.3beb971
Diffstat (limited to 'Cryptlib/update.sh')
-rwxr-xr-xCryptlib/update.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/Cryptlib/update.sh b/Cryptlib/update.sh
index 31a082d4..8983ad0b 100755
--- a/Cryptlib/update.sh
+++ b/Cryptlib/update.sh
@@ -1,7 +1,6 @@
#!/bin/bash
DIR=$1
-OPENSSL_VERSION="1.0.2k"
cp $DIR/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h InternalCryptLib.h
cp $DIR/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c Hash/CryptMd4Null.c
@@ -24,12 +23,17 @@ cp $DIR/CryptoPkg/Library/BaseCryptLib/Pk/CryptDhNull.c Pk/CryptDhNull.c
cp $DIR/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c Pk/CryptTs.c
cp $DIR/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c Pk/CryptX509.c
cp $DIR/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c Pk/CryptAuthenticode.c
-cp $DIR/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c Pem/CryptPem.c
+cp $DIR/CryptoPkg/Library/BaseCryptLib/Pem/CryptPemNull.c Pem/CryptPemNull.c
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/Library/OpensslLib/openssl-${OPENSSL_VERSION}/include/openssl/* Include/openssl/
+cp $DIR/CryptoPkg/Library/OpensslLib/openssl/include/openssl/*.h Include/openssl/
+cp $DIR/CryptoPkg/Library/OpensslLib/openssl/include/internal/*.h Include/internal/
+cp $DIR/CryptoPkg/Library/Include/internal/dso_conf.h Include/internal/
+
+cp $DIR/CryptoPkg/Library/Include/openssl/opensslconf.h Include/openssl/
patch -p2 <Cryptlib.diff
patch -p2 <opensslconf-diff.patch
+patch -p2 <ca-check-workaround.patch