diff options
| author | Liu Wei <weix.c.liu@intel.com> | 2021-03-18 21:01:36 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-03-23 05:37:56 +0000 |
| commit | 0ecdcb6142037dd1cdd08660a2349960bcf0270a (patch) | |
| tree | 2900e2e0e689edae91ab80a3c674e01ddfea7dbb /CryptoPkg | |
| parent | 3d0df0f076e120c6faf3c1892fffa21b4f31ed84 (diff) | |
| download | edk2-0ecdcb6142037dd1cdd08660a2349960bcf0270a.tar.gz edk2-0ecdcb6142037dd1cdd08660a2349960bcf0270a.tar.bz2 edk2-0ecdcb6142037dd1cdd08660a2349960bcf0270a.zip | |
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>
Diffstat (limited to 'CryptoPkg')
| -rw-r--r-- | CryptoPkg/Library/Include/openssl/opensslconf.h | 7 | ||||
| m--------- | CryptoPkg/Library/OpensslLib/openssl | 0 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h index 3a2544ea5c..e5652be5ca 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -2,7 +2,7 @@ * WARNING: do not edit!
* Generated from include/openssl/opensslconf.h.in
*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -268,6 +268,11 @@ extern "C" { # undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
+#elif defined(__SUNPRO_C)
+#if (__SUNPRO_C >= 0x5130)
+#undef DECLARE_DEPRECATED
+#define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
+#endif
# endif
#endif
diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/OpensslLib/openssl -Subproject e2e09d9fba1187f8d6aafaa34d4172f56f1ffb7 +Subproject 52c587d60be67c337364b830dd3fdc15404a2f0 |