Blame SOURCES/0025-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch

1d2c45
From 56c4bb81b311dfcee6a34c81d3e4feeda7f88995 Mon Sep 17 00:00:00 2001
1dc609
From: Laszlo Ersek <lersek@redhat.com>
1dc609
Date: Sat, 16 Nov 2019 17:11:27 +0100
1dc609
Subject: CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files in the INFs
1dc609
 (RH)
1dc609
1d2c45
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
1d2c45
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
1d2c45
1d2c45
- "OpensslLib.inf":
1d2c45
1d2c45
  - Automatic leading context refresh against upstream commit c72ca4666886
1d2c45
    ("CryptoPkg/OpensslLib: Add "sort" keyword to header file parsing
1d2c45
    loop", 2020-03-10).
1d2c45
1d2c45
  - Manual trailing context refresh against upstream commit b49a6c8f80d9
1d2c45
    ("CryptoPkg/OpensslLib: improve INF file consistency", 2019-12-02).
1d2c45
1d2c45
- "OpensslLibCrypto.inf":
1d2c45
1d2c45
  - Automatic leading context refresh against upstream commits
1d2c45
    8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in INF
1d2c45
    file", 2019-08-16) and 9f4fbd56d430 ("CryptoPkg/OpensslLib: Update
1d2c45
    process_files.pl to generate .h files", 2019-10-30).
1d2c45
1dc609
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
1dc609
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
1dc609
1dc609
- new patch
1dc609
1dc609
The downstream changes in RHEL8's OpenSSL package, for example in
1dc609
"openssl-1.1.1-evp-kdf.patch", introduce new files, and even move some
1dc609
preexistent code into those new files. In order to avoid undefined
1dc609
references in link editing, we have to list the new files.
1dc609
1dc609
Note: "process_files.pl" is not re-run at this time manually, because
1dc609
1dc609
(a) "process_files.pl" would pollute the file list (and some of the
1dc609
    auto-generated header files) with RHEL8-specific FIPS artifacts, which
1dc609
    are explicitly unwanted in edk2,
1dc609
1dc609
(b) The RHEL OpenSSL maintainer, Tomas Mraz, identified this specific set
1dc609
    of files in <https://bugzilla.redhat.com/show_bug.cgi?id=1749693#c10>,
1dc609
    and will help with future changes too.
1dc609
1dc609
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
1d2c45
(cherry picked from commit 57bd3f146590df8757865d8f2cdd1db3cf3f4d40)
1dc609
---
1dc609
 CryptoPkg/Library/OpensslLib/OpensslLib.inf       | 11 +++++++++++
1dc609
 CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 11 +++++++++++
1dc609
 2 files changed, 22 insertions(+)
1dc609
1dc609
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
1d2c45
index c8ec9454bd..24e790b538 100644
1dc609
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
1dc609
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
1d2c45
@@ -570,6 +570,17 @@
1d2c45
   $(OPENSSL_PATH)/ssl/statem/statem.h
1d2c45
   $(OPENSSL_PATH)/ssl/statem/statem_locl.h
1dc609
 # Autogenerated files list ends here
1dc609
+# RHEL8-specific OpenSSL file list starts here
1dc609
+  $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
1dc609
+  $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/sskdf.c
1dc609
+# RHEL8-specific OpenSSL file list ends here
1d2c45
   buildinf.h
1d2c45
   rand_pool_noise.h
1dc609
   ossl_store.c
1dc609
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
1d2c45
index 2f232e3e12..52e70a2d03 100644
1dc609
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
1dc609
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
1d2c45
@@ -519,6 +519,17 @@
1d2c45
   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h
1d2c45
   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h
1dc609
 # Autogenerated files list ends here
1dc609
+# RHEL8-specific OpenSSL file list starts here
1dc609
+  $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
1dc609
+  $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
1dc609
+  $(OPENSSL_PATH)/crypto/kdf/sskdf.c
1dc609
+# RHEL8-specific OpenSSL file list ends here
1dc609
   buildinf.h
1dc609
   rand_pool_noise.h
1dc609
   ossl_store.c
1dc609
-- 
1dc609
2.18.1
1dc609