|
 |
7fdf80 |
From d382b66affafe06c7e470e0a2dffbd3634b363f1 Mon Sep 17 00:00:00 2001
|
|
|
7fdf80 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
7fdf80 |
Date: Tue, 19 Mar 2019 15:48:34 +0100
|
|
|
7fdf80 |
Subject: Downgrade CryptoPkg INF files to OpenSSL 1.1.0i (RH only)
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Notes about the RHEL-8.0/20180508-ee3198e672e2 ->
|
|
|
7fdf80 |
RHEL-8.1/20190308-89910a39dcfd rebase:
|
|
|
7fdf80 |
|
|
|
7fdf80 |
- new patch, due to upstream commit a18f784cfdbe ("Upgrade OpenSSL to
|
|
|
7fdf80 |
1.1.0j", 2018-12-21)
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Upstream commit a18f784cfdbe (see above) advanced the OpenSSL git
|
|
|
7fdf80 |
submodule from upstream OpenSSL commit d4e4bd2a8163 ("Prepare for 1.1.0h
|
|
|
7fdf80 |
release", 2018-03-27) to upstream OpenSSL commit 74f2d9c1ec5f ("Prepare
|
|
|
7fdf80 |
for 1.1.0j release", 2018-11-20). Meaning, upstream edk2 skipped 1.1.0i.
|
|
|
7fdf80 |
|
|
|
7fdf80 |
However, Fedora 28 only offers 1.1.0i at this point (and it will not be
|
|
|
7fdf80 |
rebased again until 1.1.0k is released). Therefore hunks in the upstream
|
|
|
7fdf80 |
CryptoPkg commit that relate specifically to 1.1.0j have to be backed out.
|
|
|
7fdf80 |
|
|
|
7fdf80 |
The only such hunks are the "crypto/getenv.c" additions to the INF files.
|
|
|
7fdf80 |
The related upstream OpenSSL change was commit 1abdf08284af ("Use
|
|
|
7fdf80 |
secure_getenv(3) when available.", 2018-09-24), part of tag
|
|
|
7fdf80 |
"OpenSSL_1_1_0j".
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
7fdf80 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
7fdf80 |
---
|
|
|
7fdf80 |
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 -
|
|
|
7fdf80 |
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 1 -
|
|
|
7fdf80 |
2 files changed, 2 deletions(-)
|
|
|
7fdf80 |
|
|
|
7fdf80 |
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
|
|
7fdf80 |
index 6162d29143..fcb8bfddde 100644
|
|
|
7fdf80 |
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
|
|
7fdf80 |
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
|
|
7fdf80 |
@@ -282,7 +282,6 @@
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/evp/scrypt.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/ex_data.c
|
|
|
7fdf80 |
- $(OPENSSL_PATH)/crypto/getenv.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/hmac/hmac.c
|
|
|
7fdf80 |
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
|
|
7fdf80 |
index b04bf62b4e..99ff89da0e 100644
|
|
|
7fdf80 |
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
|
|
7fdf80 |
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
|
|
7fdf80 |
@@ -282,7 +282,6 @@
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/evp/scrypt.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/ex_data.c
|
|
|
7fdf80 |
- $(OPENSSL_PATH)/crypto/getenv.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
|
|
|
7fdf80 |
$(OPENSSL_PATH)/crypto/hmac/hmac.c
|
|
|
7fdf80 |
--
|
|
|
7fdf80 |
2.18.1
|
|
|
7fdf80 |
|