From b6f94dbeacfc6f0a507413096189304c58dbe66c Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Wed, 13 Sep 2017 12:09:40 -0700
Subject: New upstream version 13~git1505328970.9c1c35c5

---
 Cryptlib/update.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'Cryptlib/update.sh')

diff --git a/Cryptlib/update.sh b/Cryptlib/update.sh
index 392e21a1..31a082d4 100755
--- a/Cryptlib/update.sh
+++ b/Cryptlib/update.sh
@@ -1,6 +1,7 @@
 #!/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
@@ -23,16 +24,12 @@ 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/CryptPemNull.c Pem/CryptPemNull.c
+cp $DIR/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c Pem/CryptPem.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/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/
+cp $DIR/CryptoPkg/Library/OpensslLib/openssl-${OPENSSL_VERSION}/include/openssl/* Include/openssl/
 
 patch -p2 <Cryptlib.diff
 patch -p2 <opensslconf-diff.patch
-- 
cgit v1.2.3