sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g

Browse Source 
Upgrade openssl to 1.1.1g. the directory have been reorganized,
openssl moved crypto/include/internal to include/crypto folder.
So we change directory to match the re-organization.

The dso_conf.h and opensslconf.h will generated in UNIX format,
change process_files.pl to covent the EOL automatically.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
This commit is contained in:
Guomin Jiang
2020-07-10 09:47:31 +08:00
committed by mergify[bot]
parent 91e4bcb313
commit 8c30327deb
10 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CryptoPkg/Library/OpensslLib/process_files.pl
View File

@@ -111,8 +111,8 @@ BEGIN {
# Generate dso_conf.h per config data
system(
"perl -I. -Mconfigdata util/dofile.pl " .
"crypto/include/internal/dso_conf.h.in " .
"> include/internal/dso_conf.h"
"include/crypto/dso_conf.h.in " .
"> include/crypto/dso_conf.h"
) == 0 ||
die "Failed to generate dso_conf.h!\n";
@@ -263,14 +263,21 @@ print "Done!";
# Copy opensslconf.h and dso_conf.h generated from OpenSSL Configuration
#
print "\n--> Duplicating opensslconf.h into Include/openssl ... ";
copy($OPENSSL_PATH . "/include/openssl/opensslconf.h",
$OPENSSL_PATH . "/../../Include/openssl/") ||
die "Cannot copy opensslconf.h!";
system(
"perl -pe 's/\\n/\\r\\n/' " .
"< " . $OPENSSL_PATH . "/include/openssl/opensslconf.h " .
"> " . $OPENSSL_PATH . "/../../Include/openssl/opensslconf.h"
) == 0 ||
die "Cannot copy opensslconf.h!";
print "Done!";
print "\n--> Duplicating dso_conf.h into Include/internal ... ";
copy($OPENSSL_PATH . "/include/internal/dso_conf.h",
$OPENSSL_PATH . "/../../Include/internal/") ||
die "Cannot copy dso_conf.h!";
print "\n--> Duplicating dso_conf.h into Include/crypto ... ";
system(
"perl -pe 's/\\n/\\r\\n/' " .
"< " . $OPENSSL_PATH . "/include/crypto/dso_conf.h" .
"> " . $OPENSSL_PATH . "/../../Include/crypto/dso_conf.h"
) == 0 ||
die "Cannot copy dso_conf.h!";
print "Done!\n";
print "\nProcessing Files Done!\n";