edk2/0004-CryptoPkg-OpensslLib.inf-list-OpenSSL-local-header-m.patch
zhanghailiang cc86ef775e edk2: Upgrade openssl to 1.1.1d to fix several bugs
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
2019-12-31 10:02:37 +08:00

50 lines
1.8 KiB
Diff

From e00127a37348e5808d84ce7281bff6ca4db74907 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek@redhat.com>
Date: Thu, 21 Nov 2019 09:01:10 +0100
Subject: [PATCH 4/4] CryptoPkg/OpensslLib.inf: list OpenSSL local header
"ms/uplink.h"
Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in
INF file", 2019-08-16) incorrectly placed "ms/uplink.h" in the
auto-generated part of [Sources], in "OpensslLib.inf".
("ms/uplink.h" was added in the right spot in "OpensslLibCrypto.inf".)
Subsequently, when commit 9f4fbd56d430 ("CryptoPkg/OpensslLib: Update
process_files.pl to generate .h files", 2019-10-30) re-generated that part
of "OpensslLib.inf", the "ms/uplink.h" file reference was lost. This
triggers a warning from the "build" utility now.
Name the header file in the right spot in [Sources].
This change makes "OpensslLib.inf" consistent with "OpensslLibCrypto.inf".
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Shenglei Zhang <shenglei.zhang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Fixes: 8906f076de35b222a7d62bcf6ed1a4a2498a5791
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
1 file changed, 1 insertion(+)
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index f832b53ff5..1743213caa 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -23,6 +23,7 @@
[Sources]
$(OPENSSL_PATH)/e_os.h
+ $(OPENSSL_PATH)/ms/uplink.h
# Autogenerated files list starts here
$(OPENSSL_PATH)/crypto/aes/aes_cbc.c
$(OPENSSL_PATH)/crypto/aes/aes_cfb.c
--
2.19.1