CryptoPkg/openssl: update generated files

Run process_files.pl with the current openssl submodule version.

Signed-off-by: Yi Li <yi1.li@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/CryptoPkg/Library/Include/crypto/dso_conf.h b/CryptoPkg/Library/Include/crypto/dso_conf.h
index b9c38b4166972e4f315e0c8cfebc9df9c66f3364..95f4db2b158666e2f2d0330f65510b94a3c276f1 100644 (file)
--- a/CryptoPkg/Library/Include/crypto/dso_conf.h
+++ b/CryptoPkg/Library/Include/crypto/dso_conf.h
@@ -1,6 +1,5 @@
 /* WARNING: do not edit! */\r
 /* Generated from include/crypto/dso_conf.h.in */\r
-\r
 /*\r
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.\r
  *\r
@@ -11,7 +10,7 @@
  */\r
 \r
 #ifndef OSSL_CRYPTO_DSO_CONF_H\r
-#define OSSL_CRYPTO_DSO_CONF_H\r
-#define DSO_NONE\r
-#define DSO_EXTENSION  ".so"\r
+# define OSSL_CRYPTO_DSO_CONF_H\r
+# define DSO_NONE\r
+# define DSO_EXTENSION ".so"\r
 #endif\r

diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h
index 98962e0fe378eda674d823603e0a2c4dee957bf3..53dd8c3efbe677cbf46353869d2c8d2fd947e4e3 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
@@ -17,6 +17,23 @@ extern "C" {
 #endif\r
 \r
 /* Autogenerated conditional openssl feature list starts here */\r
+#if !FixedPcdGetBool (PcdOpensslEcEnabled)\r
+# ifndef OPENSSL_NO_EC\r
+#  define OPENSSL_NO_EC\r
+# endif\r
+# ifndef OPENSSL_NO_ECDH\r
+#  define OPENSSL_NO_ECDH\r
+# endif\r
+# ifndef OPENSSL_NO_ECDSA\r
+#  define OPENSSL_NO_ECDSA\r
+# endif\r
+# ifndef OPENSSL_NO_TLS1_3\r
+#  define OPENSSL_NO_TLS1_3\r
+# endif\r
+# ifndef OPENSSL_NO_SM2\r
+#  define OPENSSL_NO_SM2\r
+# endif\r
+#endif\r
 /* Autogenerated conditional openssl feature list ends here */\r
 \r
 #ifdef  __cplusplus\r

diff --git a/CryptoPkg/Library/Include/openssl/opensslconf_generated.h b/CryptoPkg/Library/Include/openssl/opensslconf_generated.h
index 22a7216cc46c95bb5cd99545fc636b73b96e836d..09a6641ffcf971a32abcc591a9db71f66950ca07 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf_generated.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf_generated.h
@@ -9,7 +9,7 @@
  * in the file LICENSE in the source distribution or at\r
  * https://www.openssl.org/source/license.html\r
  */\r
-#include <Library/PcdLib.h>\r
+\r
 #include <openssl/opensslv.h>\r
 \r
 #ifdef  __cplusplus\r
@@ -17,7 +17,7 @@ extern "C" {
 #endif\r
 \r
 #ifdef OPENSSL_ALGORITHM_DEFINES\r
-  #error OPENSSL_ALGORITHM_DEFINES no longer supported\r
+# error OPENSSL_ALGORITHM_DEFINES no longer supported\r
 #endif\r
 \r
 /*\r
@@ -25,233 +25,217 @@ extern "C" {
  */\r
 \r
 #ifndef OPENSSL_SYS_UEFI\r
-#define OPENSSL_SYS_UEFI  1\r
+# define OPENSSL_SYS_UEFI 1\r
 #endif\r
-#define OPENSSL_MIN_API  0x10100000L\r
+#define OPENSSL_MIN_API 0x10100000L\r
 #ifndef OPENSSL_NO_BF\r
-#define OPENSSL_NO_BF\r
+# define OPENSSL_NO_BF\r
 #endif\r
 #ifndef OPENSSL_NO_BLAKE2\r
-#define OPENSSL_NO_BLAKE2\r
+# define OPENSSL_NO_BLAKE2\r
 #endif\r
 #ifndef OPENSSL_NO_CAMELLIA\r
-#define OPENSSL_NO_CAMELLIA\r
+# define OPENSSL_NO_CAMELLIA\r
 #endif\r
 #ifndef OPENSSL_NO_CAST\r
-#define OPENSSL_NO_CAST\r
+# define OPENSSL_NO_CAST\r
 #endif\r
 #ifndef OPENSSL_NO_CHACHA\r
-#define OPENSSL_NO_CHACHA\r
+# define OPENSSL_NO_CHACHA\r
 #endif\r
 #ifndef OPENSSL_NO_CMS\r
-#define OPENSSL_NO_CMS\r
+# define OPENSSL_NO_CMS\r
 #endif\r
 #ifndef OPENSSL_NO_CT\r
-#define OPENSSL_NO_CT\r
+# define OPENSSL_NO_CT\r
 #endif\r
 #ifndef OPENSSL_NO_DES\r
-#define OPENSSL_NO_DES\r
+# define OPENSSL_NO_DES\r
 #endif\r
 #ifndef OPENSSL_NO_DSA\r
-#define OPENSSL_NO_DSA\r
-#endif\r
-#if !FixedPcdGetBool (PcdOpensslEcEnabled)\r
-  #ifndef OPENSSL_NO_EC\r
-#define OPENSSL_NO_EC\r
-  #endif\r
+# define OPENSSL_NO_DSA\r
 #endif\r
 #ifndef OPENSSL_NO_IDEA\r
-#define OPENSSL_NO_IDEA\r
+# define OPENSSL_NO_IDEA\r
 #endif\r
 #ifndef OPENSSL_NO_MD2\r
-#define OPENSSL_NO_MD2\r
+# define OPENSSL_NO_MD2\r
 #endif\r
 #ifndef OPENSSL_NO_MD4\r
-#define OPENSSL_NO_MD4\r
+# define OPENSSL_NO_MD4\r
 #endif\r
 #ifndef OPENSSL_NO_MDC2\r
-#define OPENSSL_NO_MDC2\r
+# define OPENSSL_NO_MDC2\r
 #endif\r
 #ifndef OPENSSL_NO_POLY1305\r
-#define OPENSSL_NO_POLY1305\r
+# define OPENSSL_NO_POLY1305\r
 #endif\r
 #ifndef OPENSSL_NO_RC2\r
-#define OPENSSL_NO_RC2\r
+# define OPENSSL_NO_RC2\r
 #endif\r
 #ifndef OPENSSL_NO_RC4\r
-#define OPENSSL_NO_RC4\r
+# define OPENSSL_NO_RC4\r
 #endif\r
 #ifndef OPENSSL_NO_RC5\r
-#define OPENSSL_NO_RC5\r
+# define OPENSSL_NO_RC5\r
 #endif\r
 #ifndef OPENSSL_NO_RMD160\r
-#define OPENSSL_NO_RMD160\r
+# define OPENSSL_NO_RMD160\r
 #endif\r
 #ifndef OPENSSL_NO_SEED\r
-#define OPENSSL_NO_SEED\r
-#endif\r
-#ifndef OPENSSL_NO_SM2\r
-#define OPENSSL_NO_SM2\r
+# define OPENSSL_NO_SEED\r
 #endif\r
 #ifndef OPENSSL_NO_SRP\r
-#define OPENSSL_NO_SRP\r
+# define OPENSSL_NO_SRP\r
 #endif\r
 #ifndef OPENSSL_NO_TS\r
-#define OPENSSL_NO_TS\r
+# define OPENSSL_NO_TS\r
 #endif\r
 #ifndef OPENSSL_NO_WHIRLPOOL\r
-#define OPENSSL_NO_WHIRLPOOL\r
+# define OPENSSL_NO_WHIRLPOOL\r
 #endif\r
 #ifndef OPENSSL_RAND_SEED_NONE\r
-#define OPENSSL_RAND_SEED_NONE\r
+# define OPENSSL_RAND_SEED_NONE\r
 #endif\r
 #ifndef OPENSSL_NO_AFALGENG\r
-#define OPENSSL_NO_AFALGENG\r
+# define OPENSSL_NO_AFALGENG\r
 #endif\r
 #ifndef OPENSSL_NO_APPS\r
-#define OPENSSL_NO_APPS\r
+# define OPENSSL_NO_APPS\r
 #endif\r
 #ifndef OPENSSL_NO_ASAN\r
-#define OPENSSL_NO_ASAN\r
+# define OPENSSL_NO_ASAN\r
 #endif\r
 #ifndef OPENSSL_NO_ASYNC\r
-#define OPENSSL_NO_ASYNC\r
+# define OPENSSL_NO_ASYNC\r
 #endif\r
 #ifndef OPENSSL_NO_AUTOERRINIT\r
-#define OPENSSL_NO_AUTOERRINIT\r
+# define OPENSSL_NO_AUTOERRINIT\r
 #endif\r
 #ifndef OPENSSL_NO_AUTOLOAD_CONFIG\r
-#define OPENSSL_NO_AUTOLOAD_CONFIG\r
+# define OPENSSL_NO_AUTOLOAD_CONFIG\r
 #endif\r
 #ifndef OPENSSL_NO_CAPIENG\r
-#define OPENSSL_NO_CAPIENG\r
+# define OPENSSL_NO_CAPIENG\r
 #endif\r
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG\r
-#define OPENSSL_NO_CRYPTO_MDEBUG\r
+# define OPENSSL_NO_CRYPTO_MDEBUG\r
 #endif\r
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE\r
-#define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE\r
+# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE\r
 #endif\r
 #ifndef OPENSSL_NO_DEPRECATED\r
-#define OPENSSL_NO_DEPRECATED\r
+# define OPENSSL_NO_DEPRECATED\r
 #endif\r
 #ifndef OPENSSL_NO_DEVCRYPTOENG\r
-#define OPENSSL_NO_DEVCRYPTOENG\r
+# define OPENSSL_NO_DEVCRYPTOENG\r
 #endif\r
 #ifndef OPENSSL_NO_DGRAM\r
-#define OPENSSL_NO_DGRAM\r
+# define OPENSSL_NO_DGRAM\r
 #endif\r
 #ifndef OPENSSL_NO_DTLS\r
-#define OPENSSL_NO_DTLS\r
+# define OPENSSL_NO_DTLS\r
 #endif\r
 #ifndef OPENSSL_NO_DTLS1\r
-#define OPENSSL_NO_DTLS1\r
+# define OPENSSL_NO_DTLS1\r
 #endif\r
 #ifndef OPENSSL_NO_DTLS1_2\r
-#define OPENSSL_NO_DTLS1_2\r
+# define OPENSSL_NO_DTLS1_2\r
 #endif\r
 #ifndef OPENSSL_NO_EC2M\r
-#define OPENSSL_NO_EC2M\r
+# define OPENSSL_NO_EC2M\r
 #endif\r
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128\r
-#define OPENSSL_NO_EC_NISTP_64_GCC_128\r
-#endif\r
-#ifndef OPENSSL_NO_ECDH\r
-#define OPENSSL_NO_ECDH\r
-#endif\r
-#ifndef OPENSSL_NO_ECDSA\r
-#define OPENSSL_NO_ECDSA\r
+# define OPENSSL_NO_EC_NISTP_64_GCC_128\r
 #endif\r
 #ifndef OPENSSL_NO_EGD\r
-#define OPENSSL_NO_EGD\r
+# define OPENSSL_NO_EGD\r
 #endif\r
 #ifndef OPENSSL_NO_ENGINE\r
-#define OPENSSL_NO_ENGINE\r
+# define OPENSSL_NO_ENGINE\r
 #endif\r
 #ifndef OPENSSL_NO_ERR\r
-#define OPENSSL_NO_ERR\r
+# define OPENSSL_NO_ERR\r
 #endif\r
 #ifndef OPENSSL_NO_EXTERNAL_TESTS\r
-#define OPENSSL_NO_EXTERNAL_TESTS\r
+# define OPENSSL_NO_EXTERNAL_TESTS\r
 #endif\r
 #ifndef OPENSSL_NO_FILENAMES\r
-#define OPENSSL_NO_FILENAMES\r
+# define OPENSSL_NO_FILENAMES\r
 #endif\r
 #ifndef OPENSSL_NO_FUZZ_AFL\r
-#define OPENSSL_NO_FUZZ_AFL\r
+# define OPENSSL_NO_FUZZ_AFL\r
 #endif\r
 #ifndef OPENSSL_NO_FUZZ_LIBFUZZER\r
-#define OPENSSL_NO_FUZZ_LIBFUZZER\r
+# define OPENSSL_NO_FUZZ_LIBFUZZER\r
 #endif\r
 #ifndef OPENSSL_NO_GOST\r
-#define OPENSSL_NO_GOST\r
+# define OPENSSL_NO_GOST\r
 #endif\r
 #ifndef OPENSSL_NO_HEARTBEATS\r
-#define OPENSSL_NO_HEARTBEATS\r
+# define OPENSSL_NO_HEARTBEATS\r
 #endif\r
 #ifndef OPENSSL_NO_HW\r
-#define OPENSSL_NO_HW\r
+# define OPENSSL_NO_HW\r
 #endif\r
 #ifndef OPENSSL_NO_MSAN\r
-#define OPENSSL_NO_MSAN\r
+# define OPENSSL_NO_MSAN\r
 #endif\r
 #ifndef OPENSSL_NO_OCB\r
-#define OPENSSL_NO_OCB\r
+# define OPENSSL_NO_OCB\r
 #endif\r
 #ifndef OPENSSL_NO_POSIX_IO\r
-#define OPENSSL_NO_POSIX_IO\r
+# define OPENSSL_NO_POSIX_IO\r
 #endif\r
 #ifndef OPENSSL_NO_RFC3779\r
-#define OPENSSL_NO_RFC3779\r
+# define OPENSSL_NO_RFC3779\r
 #endif\r
 #ifndef OPENSSL_NO_SCRYPT\r
-#define OPENSSL_NO_SCRYPT\r
+# define OPENSSL_NO_SCRYPT\r
 #endif\r
 #ifndef OPENSSL_NO_SCTP\r
-#define OPENSSL_NO_SCTP\r
+# define OPENSSL_NO_SCTP\r
 #endif\r
 #ifndef OPENSSL_NO_SOCK\r
-#define OPENSSL_NO_SOCK\r
+# define OPENSSL_NO_SOCK\r
 #endif\r
 #ifndef OPENSSL_NO_SSL_TRACE\r
-#define OPENSSL_NO_SSL_TRACE\r
+# define OPENSSL_NO_SSL_TRACE\r
 #endif\r
 #ifndef OPENSSL_NO_SSL3\r
-#define OPENSSL_NO_SSL3\r
+# define OPENSSL_NO_SSL3\r
 #endif\r
 #ifndef OPENSSL_NO_SSL3_METHOD\r
-#define OPENSSL_NO_SSL3_METHOD\r
+# define OPENSSL_NO_SSL3_METHOD\r
 #endif\r
 #ifndef OPENSSL_NO_STDIO\r
-#define OPENSSL_NO_STDIO\r
+# define OPENSSL_NO_STDIO\r
 #endif\r
 #ifndef OPENSSL_NO_TESTS\r
-#define OPENSSL_NO_TESTS\r
-#endif\r
-#ifndef OPENSSL_NO_TLS1_3\r
-#define OPENSSL_NO_TLS1_3\r
+# define OPENSSL_NO_TESTS\r
 #endif\r
 #ifndef OPENSSL_NO_UBSAN\r
-#define OPENSSL_NO_UBSAN\r
+# define OPENSSL_NO_UBSAN\r
 #endif\r
 #ifndef OPENSSL_NO_UI_CONSOLE\r
-#define OPENSSL_NO_UI_CONSOLE\r
+# define OPENSSL_NO_UI_CONSOLE\r
 #endif\r
 #ifndef OPENSSL_NO_UNIT_TEST\r
-#define OPENSSL_NO_UNIT_TEST\r
+# define OPENSSL_NO_UNIT_TEST\r
 #endif\r
 #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS\r
-#define OPENSSL_NO_WEAK_SSL_CIPHERS\r
+# define OPENSSL_NO_WEAK_SSL_CIPHERS\r
 #endif\r
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE\r
-#define OPENSSL_NO_DYNAMIC_ENGINE\r
+# define OPENSSL_NO_DYNAMIC_ENGINE\r
 #endif\r
 \r
+\r
 /*\r
  * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers\r
  * don't like that.  This will hopefully silence them.\r
  */\r
-#define NON_EMPTY_TRANSLATION_UNIT  static void *dummy = &dummy;\r
+#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;\r
 \r
 /*\r
  * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the\r
@@ -260,37 +244,37 @@ extern "C" {
  * functions.\r
  */\r
 #ifndef DECLARE_DEPRECATED\r
-#define DECLARE_DEPRECATED(f)  f;\r
-  #ifdef __GNUC__\r
-    #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)\r
-      #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
+# define DECLARE_DEPRECATED(f)   f;\r
+# ifdef __GNUC__\r
+#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)\r
+#   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
 #ifndef OPENSSL_FILE\r
-  #ifdef OPENSSL_NO_FILENAMES\r
-#define OPENSSL_FILE  ""\r
-#define OPENSSL_LINE  0\r
-  #else\r
-#define OPENSSL_FILE  __FILE__\r
-#define OPENSSL_LINE  __LINE__\r
-  #endif\r
+# ifdef OPENSSL_NO_FILENAMES\r
+#  define OPENSSL_FILE ""\r
+#  define OPENSSL_LINE 0\r
+# else\r
+#  define OPENSSL_FILE __FILE__\r
+#  define OPENSSL_LINE __LINE__\r
+# endif\r
 #endif\r
 \r
 #ifndef OPENSSL_MIN_API\r
-#define OPENSSL_MIN_API  0\r
+# define OPENSSL_MIN_API 0\r
 #endif\r
 \r
-#if !defined (OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API\r
-  #undef OPENSSL_API_COMPAT\r
-#define OPENSSL_API_COMPAT  OPENSSL_MIN_API\r
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API\r
+# undef OPENSSL_API_COMPAT\r
+# define OPENSSL_API_COMPAT OPENSSL_MIN_API\r
 #endif\r
 \r
 /*\r
@@ -298,51 +282,51 @@ extern "C" {
  * OpenSSL version number matches.\r
  */\r
 #if OPENSSL_VERSION_NUMBER < 0x10200000L\r
-#define DEPRECATEDIN_1_2_0(f)  f;\r
+# define DEPRECATEDIN_1_2_0(f)   f;\r
 #elif OPENSSL_API_COMPAT < 0x10200000L\r
-#define DEPRECATEDIN_1_2_0(f)  DECLARE_DEPRECATED(f)\r
+# define DEPRECATEDIN_1_2_0(f)   DECLARE_DEPRECATED(f)\r
 #else\r
-#define DEPRECATEDIN_1_2_0(f)\r
+# define DEPRECATEDIN_1_2_0(f)\r
 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x10100000L\r
-#define DEPRECATEDIN_1_1_0(f)  DECLARE_DEPRECATED(f)\r
+# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f)\r
 #else\r
-#define DEPRECATEDIN_1_1_0(f)\r
+# define DEPRECATEDIN_1_1_0(f)\r
 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x10000000L\r
-#define DEPRECATEDIN_1_0_0(f)  DECLARE_DEPRECATED(f)\r
+# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f)\r
 #else\r
-#define DEPRECATEDIN_1_0_0(f)\r
+# define DEPRECATEDIN_1_0_0(f)\r
 #endif\r
 \r
 #if OPENSSL_API_COMPAT < 0x00908000L\r
-#define DEPRECATEDIN_0_9_8(f)  DECLARE_DEPRECATED(f)\r
+# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f)\r
 #else\r
-#define DEPRECATEDIN_0_9_8(f)\r
+# define DEPRECATEDIN_0_9_8(f)\r
 #endif\r
 \r
 /* Generate 80386 code? */\r
 #undef I386_ONLY\r
 \r
 #undef OPENSSL_UNISTD\r
-#define OPENSSL_UNISTD  <unistd.h>\r
+#define OPENSSL_UNISTD <unistd.h>\r
 \r
 #undef OPENSSL_EXPORT_VAR_AS_FUNCTION\r
 \r
 /*\r
  * The following are cipher-specific, but are part of the public API.\r
  */\r
-#if !defined (OPENSSL_SYS_UEFI)\r
-  #undef BN_LLONG\r
+#if !defined(OPENSSL_SYS_UEFI)\r
+# undef BN_LLONG\r
 /* Only one for the following should be defined */\r
-  #undef SIXTY_FOUR_BIT_LONG\r
-  #undef SIXTY_FOUR_BIT\r
-#define THIRTY_TWO_BIT\r
+# undef SIXTY_FOUR_BIT_LONG\r
+# undef SIXTY_FOUR_BIT\r
+# define THIRTY_TWO_BIT\r
 #endif\r
 \r
-#define RC4_INT  unsigned int\r
+#define RC4_INT unsigned int\r
 \r
 #ifdef  __cplusplus\r
 }\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index a92eefcc9466885e08cd46b30086eb231f1e68f6..c7ceb5b9df1eec4b5be1b09c7c44278fb441a319 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -200,40 +200,40 @@
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c\r
   $(OPENSSL_PATH)/crypto/ebcdic.c\r
   $(OPENSSL_PATH)/crypto/ec/curve25519.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_ameth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_check.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_curve.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_cvt.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_err.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_key.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_lib.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_mult.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_lib.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_mult.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ec_print.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/eck_prn.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/eck_prn.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecp_mont.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecp_nist.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/ecx_meth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/err/err.c\r
@@ -421,6 +421,10 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
@@ -534,14 +538,14 @@
   $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
   $(OPENSSL_PATH)/crypto/ec/ec_local.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/field.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/word.h     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/word.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h     |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
   $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
   $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 63f550f626dbc87ac184fdd6a13068f715ff5cce..63b4a8f3d83df51b7ea3016f47b92026422dcae1 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -199,43 +199,43 @@
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c\r
   $(OPENSSL_PATH)/crypto/ebcdic.c\r
-  $(OPENSSL_PATH)/crypto/ec/curve25519.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_ameth.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_check.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_curve.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_cvt.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_err.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_key.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_lib.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_mult.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_oct.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ec_print.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/eck_prn.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_mont.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_nist.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/ecx_meth.c    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve25519.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_ameth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_check.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_curve.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_cvt.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_err.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_key.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_lib.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_mult.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_print.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/eck_prn.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_mont.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nist.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ecx_meth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/err/err.c\r
   $(OPENSSL_PATH)/crypto/err/err_prn.c\r
   $(OPENSSL_PATH)/crypto/evp/bio_b64.c\r
@@ -421,6 +421,10 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
@@ -533,15 +537,15 @@
   $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
   $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
-  $(OPENSSL_PATH)/crypto/ec/ec_local.h    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/field.h    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/word.h   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h    |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h   |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/ec_local.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/field.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/word.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled\r
   $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
   $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
   $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r