summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang, Jian J <jian.j.wang@intel.com>2019-06-05 05:18:44 +0800
committerLiming Gao <liming.gao@intel.com>2019-06-05 16:21:35 +0800
commit0a1b13fd4d2210e2c379ace4fd961fb80126b7e9 (patch)
tree56841a7b4b84c7b9025175f57d4ed18bd5d5d073
parentcbfdc1b2df65dee011cf33add1dff88de3d9c46d (diff)
downloadedk2-0a1b13fd4d2210e2c379ace4fd961fb80126b7e9.tar.gz
edk2-0a1b13fd4d2210e2c379ace4fd961fb80126b7e9.tar.bz2
edk2-0a1b13fd4d2210e2c379ace4fd961fb80126b7e9.zip
CryptoPkg/OpensslLib: fix VS2017 build failure
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1878 This issue is specific to VS2017 which tries to resolve symbol referenced by a symbol not really referenced eventually. ossl_init_load_crypto_strings -> err_load_crypto_strings_int (not really referenced) -> ERR_load_OSSL_STORE_strings Because OPENSSL_NO_ERR and OPENSSL_NO_AUTOERRINIT are not defined by default, err_load_crypto_strings_int() will not be actually referenced by ossl_init_load_crypto_strings(). Since err_load_crypto_strings_int() is not actually referenced at all, the fix can be done simply by removing crypto/err/err_all.c from build. Cc: Dandan Bi <dandan.bi@intel.com> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com> Signed-off-by: Jian J Wang <jian.j.wang@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--CryptoPkg/Library/OpensslLib/OpensslLib.inf1
-rw-r--r--CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf1
2 files changed, 0 insertions, 2 deletions
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 378fa6588e..5a2424fc16 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -218,7 +218,6 @@
$(OPENSSL_PATH)/crypto/dso/dso_win32.c
$(OPENSSL_PATH)/crypto/ebcdic.c
$(OPENSSL_PATH)/crypto/err/err.c
- $(OPENSSL_PATH)/crypto/err/err_all.c
$(OPENSSL_PATH)/crypto/err/err_prn.c
$(OPENSSL_PATH)/crypto/evp/bio_b64.c
$(OPENSSL_PATH)/crypto/evp/bio_enc.c
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 24d3d96459..588da4c040 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -218,7 +218,6 @@
$(OPENSSL_PATH)/crypto/dso/dso_win32.c
$(OPENSSL_PATH)/crypto/ebcdic.c
$(OPENSSL_PATH)/crypto/err/err.c
- $(OPENSSL_PATH)/crypto/err/err_all.c
$(OPENSSL_PATH)/crypto/err/err_prn.c
$(OPENSSL_PATH)/crypto/evp/bio_b64.c
$(OPENSSL_PATH)/crypto/evp/bio_enc.c