CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1j

Update openssl from 1.1.1g to 1.1.1j. Current OpenSSL version
1.1.1g contains the vulnerabilities of CVE-2021-23841 and
CVE-2021-23840. The related vulnerable API EVP_DecryptUpdate
are used in drivers.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3266

Besides, the opensslconf.h automatically generated by process_files.pl.
Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Liu Wei <weix.c.liu@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h
index 3a2544ea5ccc15e6190e253186774c6c92d48f53..e5652be5ca00ecd91be0a9db38ec75b5f4e0b909 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!\r
  * Generated from include/openssl/opensslconf.h.in\r
  *\r
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.\r
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.\r
  *\r
  * Licensed under the OpenSSL license (the "License").  You may not use\r
  * this file except in compliance with the License.  You can obtain a copy\r
@@ -268,6 +268,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED\r
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));\r
 #  endif\r
+#elif defined(__SUNPRO_C)\r
+#if (__SUNPRO_C >= 0x5130)\r
+#undef DECLARE_DEPRECATED\r
+#define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));\r
+#endif\r
 # endif\r
 #endif\r
 \r

diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/OpensslLib/openssl
index e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72..52c587d60be67c337364b830dd3fdc15404a2f04 160000 (submodule)
--- a/CryptoPkg/Library/OpensslLib/openssl
+++ b/CryptoPkg/Library/OpensslLib/openssl
@@ -1 +1 @@
-Subproject commit e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72
+Subproject commit 52c587d60be67c337364b830dd3fdc15404a2f04