80 lines
3.1 KiB
Diff
80 lines
3.1 KiB
Diff
|
From 57bd3f146590df8757865d8f2cdd1db3cf3f4d40 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Date: Sat, 16 Nov 2019 17:11:27 +0100
|
||
|
|
Subject: CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files in the INFs
|
||
|
|
(RH)
|
||
|
|
|
||
|
|
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
|
||
|
|
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
|
||
|
|
|
||
|
|
- new patch
|
||
|
|
|
||
|
|
The downstream changes in RHEL8's OpenSSL package, for example in
|
||
|
|
"openssl-1.1.1-evp-kdf.patch", introduce new files, and even move some
|
||
|
|
preexistent code into those new files. In order to avoid undefined
|
||
|
|
references in link editing, we have to list the new files.
|
||
|
|
|
||
|
|
Note: "process_files.pl" is not re-run at this time manually, because
|
||
|
|
|
||
|
|
(a) "process_files.pl" would pollute the file list (and some of the
|
||
|
|
auto-generated header files) with RHEL8-specific FIPS artifacts, which
|
||
|
|
are explicitly unwanted in edk2,
|
||
|
|
|
||
|
|
(b) The RHEL OpenSSL maintainer, Tomas Mraz, identified this specific set
|
||
|
|
of files in <https://bugzilla.redhat.com/show_bug.cgi?id=1749693#c10>,
|
||
|
|
and will help with future changes too.
|
||
|
|
|
||
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
---
|
||
|
|
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 11 +++++++++++
|
||
|
|
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 11 +++++++++++
|
||
|
|
2 files changed, 22 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||
|
|
index dd873a0dcd..d1c7602b87 100644
|
||
|
|
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||
|
|
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||
|
|
@@ -598,6 +598,17 @@
|
||
|
|
$(OPENSSL_PATH)/ssl/record/record.h
|
||
|
|
$(OPENSSL_PATH)/ssl/record/record_locl.h
|
||
|
|
# Autogenerated files list ends here
|
||
|
|
+# RHEL8-specific OpenSSL file list starts here
|
||
|
|
+ $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/sskdf.c
|
||
|
|
+# RHEL8-specific OpenSSL file list ends here
|
||
|
|
|
||
|
|
ossl_store.c
|
||
|
|
rand_pool.c
|
||
|
|
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||
|
|
index a1bb560255..0785a421dd 100644
|
||
|
|
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||
|
|
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||
|
|
@@ -546,6 +546,17 @@
|
||
|
|
$(OPENSSL_PATH)/crypto/objects/obj_lcl.h
|
||
|
|
$(OPENSSL_PATH)/crypto/objects/obj_xref.h
|
||
|
|
# Autogenerated files list ends here
|
||
|
|
+# RHEL8-specific OpenSSL file list starts here
|
||
|
|
+ $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
|
||
|
|
+ $(OPENSSL_PATH)/crypto/kdf/sskdf.c
|
||
|
|
+# RHEL8-specific OpenSSL file list ends here
|
||
|
|
buildinf.h
|
||
|
|
rand_pool_noise.h
|
||
|
|
ossl_store.c
|
||
|
|
--
|
||
|
|
2.18.1
|
||
|
|
|