From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.8859.1651487686649346031 for ; Mon, 02 May 2022 03:34:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Y8RBV2V1; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651487685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+148zitgdwpUwJOgltESCH5gKRRIL1b25IxwQv7zxdM=; b=Y8RBV2V1oqck6odpKEGY+VaZX63oOGRB3wt9q8PMz3lO3/YGodFsSJvD6HmbfgV0BYNGBY qWUOoFICrzTHu9QWAr8klENNuIfvq8Ml00pS5cDcONWQ0FerkaE6i2zj5NHT52fXVOHSrZ Fa4iOyuBJv6d7kGJcU8KMUwt9KqAplQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-_yQ14_FTODqg9o9Yy7fIng-1; Mon, 02 May 2022 06:34:42 -0400 X-MC-Unique: _yQ14_FTODqg9o9Yy7fIng-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1394185A79C; Mon, 2 May 2022 10:34:41 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 822F5C202D1; Mon, 2 May 2022 10:34:41 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9CFCA180063A; Mon, 2 May 2022 12:34:36 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Pawel Polawski , yi1.li@intel.com, Jiewen Yao , Oliver Steffen , Jian J Wang , Ard Biesheuvel , Guomin Jiang , Xiaoyu Lu , Jordan Justen , Gerd Hoffmann Subject: [PATCH 4/5] CryptoPkg/openssl: update generated files Date: Mon, 2 May 2022 12:34:35 +0200 Message-Id: <20220502103436.3274412-5-kraxel@redhat.com> In-Reply-To: <20220502103436.3274412-1-kraxel@redhat.com> References: <20220502103436.3274412-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Run process_files.pl with the current openssl submodule version. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 4 + .../Library/OpensslLib/OpensslLibCrypto.inf | 4 + CryptoPkg/Library/Include/crypto/dso_conf.h | 7 +- .../Library/Include/openssl/opensslconf.h | 233 +++++++++--------- 4 files changed, 122 insertions(+), 126 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index 1d67ed55e1b1..bd3d9cc90f99 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -421,6 +421,10 @@ [Sources] $(OPENSSL_PATH)/crypto/siphash/siphash.c $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c $(OPENSSL_PATH)/crypto/sm3/m_sm3.c $(OPENSSL_PATH)/crypto/sm3/sm3.c $(OPENSSL_PATH)/crypto/sm4/sm4.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf index 66ca5b1250c1..38ccf1a5b6ec 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -421,6 +421,10 @@ [Sources] $(OPENSSL_PATH)/crypto/siphash/siphash.c $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c $(OPENSSL_PATH)/crypto/sm3/m_sm3.c $(OPENSSL_PATH)/crypto/sm3/sm3.c $(OPENSSL_PATH)/crypto/sm4/sm4.c diff --git a/CryptoPkg/Library/Include/crypto/dso_conf.h b/CryptoPkg/Library/Include/crypto/dso_conf.h index b9c38b416697..95f4db2b1586 100644 --- a/CryptoPkg/Library/Include/crypto/dso_conf.h +++ b/CryptoPkg/Library/Include/crypto/dso_conf.h @@ -1,6 +1,5 @@ /* WARNING: do not edit! */ /* Generated from include/crypto/dso_conf.h.in */ - /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -11,7 +10,7 @@ */ #ifndef OSSL_CRYPTO_DSO_CONF_H -#define OSSL_CRYPTO_DSO_CONF_H -#define DSO_NONE -#define DSO_EXTENSION ".so" +# define OSSL_CRYPTO_DSO_CONF_H +# define DSO_NONE +# define DSO_EXTENSION ".so" #endif diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h index 7ea976b2252e..09a6641ffcf9 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -17,7 +17,7 @@ extern "C" { #endif #ifdef OPENSSL_ALGORITHM_DEFINES - #error OPENSSL_ALGORITHM_DEFINES no longer supported +# error OPENSSL_ALGORITHM_DEFINES no longer supported #endif /* @@ -25,228 +25,217 @@ extern "C" { */ #ifndef OPENSSL_SYS_UEFI -#define OPENSSL_SYS_UEFI 1 +# define OPENSSL_SYS_UEFI 1 #endif -#define OPENSSL_MIN_API 0x10100000L +#define OPENSSL_MIN_API 0x10100000L #ifndef OPENSSL_NO_BF -#define OPENSSL_NO_BF +# define OPENSSL_NO_BF #endif #ifndef OPENSSL_NO_BLAKE2 -#define OPENSSL_NO_BLAKE2 +# define OPENSSL_NO_BLAKE2 #endif #ifndef OPENSSL_NO_CAMELLIA -#define OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA #endif #ifndef OPENSSL_NO_CAST -#define OPENSSL_NO_CAST +# define OPENSSL_NO_CAST #endif #ifndef OPENSSL_NO_CHACHA -#define OPENSSL_NO_CHACHA +# define OPENSSL_NO_CHACHA #endif #ifndef OPENSSL_NO_CMS -#define OPENSSL_NO_CMS +# define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_CT -#define OPENSSL_NO_CT +# define OPENSSL_NO_CT #endif #ifndef OPENSSL_NO_DES -#define OPENSSL_NO_DES +# define OPENSSL_NO_DES #endif #ifndef OPENSSL_NO_DSA -#define OPENSSL_NO_DSA +# define OPENSSL_NO_DSA #endif #ifndef OPENSSL_NO_IDEA -#define OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA #endif #ifndef OPENSSL_NO_MD2 -#define OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 #endif #ifndef OPENSSL_NO_MD4 -#define OPENSSL_NO_MD4 +# define OPENSSL_NO_MD4 #endif #ifndef OPENSSL_NO_MDC2 -#define OPENSSL_NO_MDC2 +# define OPENSSL_NO_MDC2 #endif #ifndef OPENSSL_NO_POLY1305 -#define OPENSSL_NO_POLY1305 +# define OPENSSL_NO_POLY1305 #endif #ifndef OPENSSL_NO_RC2 -#define OPENSSL_NO_RC2 +# define OPENSSL_NO_RC2 #endif #ifndef OPENSSL_NO_RC4 -#define OPENSSL_NO_RC4 +# define OPENSSL_NO_RC4 #endif #ifndef OPENSSL_NO_RC5 -#define OPENSSL_NO_RC5 +# define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RMD160 -#define OPENSSL_NO_RMD160 +# define OPENSSL_NO_RMD160 #endif #ifndef OPENSSL_NO_SEED -#define OPENSSL_NO_SEED -#endif -#ifndef OPENSSL_NO_SM2 -#define OPENSSL_NO_SM2 +# define OPENSSL_NO_SEED #endif #ifndef OPENSSL_NO_SRP -#define OPENSSL_NO_SRP +# define OPENSSL_NO_SRP #endif #ifndef OPENSSL_NO_TS -#define OPENSSL_NO_TS +# define OPENSSL_NO_TS #endif #ifndef OPENSSL_NO_WHIRLPOOL -#define OPENSSL_NO_WHIRLPOOL +# define OPENSSL_NO_WHIRLPOOL #endif #ifndef OPENSSL_RAND_SEED_NONE -#define OPENSSL_RAND_SEED_NONE +# define OPENSSL_RAND_SEED_NONE #endif #ifndef OPENSSL_NO_AFALGENG -#define OPENSSL_NO_AFALGENG +# define OPENSSL_NO_AFALGENG #endif #ifndef OPENSSL_NO_APPS -#define OPENSSL_NO_APPS +# define OPENSSL_NO_APPS #endif #ifndef OPENSSL_NO_ASAN -#define OPENSSL_NO_ASAN +# define OPENSSL_NO_ASAN #endif #ifndef OPENSSL_NO_ASYNC -#define OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC #endif #ifndef OPENSSL_NO_AUTOERRINIT -#define OPENSSL_NO_AUTOERRINIT +# define OPENSSL_NO_AUTOERRINIT #endif #ifndef OPENSSL_NO_AUTOLOAD_CONFIG -#define OPENSSL_NO_AUTOLOAD_CONFIG +# define OPENSSL_NO_AUTOLOAD_CONFIG #endif #ifndef OPENSSL_NO_CAPIENG -#define OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG #endif #ifndef OPENSSL_NO_CRYPTO_MDEBUG -#define OPENSSL_NO_CRYPTO_MDEBUG +# define OPENSSL_NO_CRYPTO_MDEBUG #endif #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE -#define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE #endif #ifndef OPENSSL_NO_DEPRECATED -#define OPENSSL_NO_DEPRECATED +# define OPENSSL_NO_DEPRECATED #endif #ifndef OPENSSL_NO_DEVCRYPTOENG -#define OPENSSL_NO_DEVCRYPTOENG +# define OPENSSL_NO_DEVCRYPTOENG #endif #ifndef OPENSSL_NO_DGRAM -#define OPENSSL_NO_DGRAM +# define OPENSSL_NO_DGRAM #endif #ifndef OPENSSL_NO_DTLS -#define OPENSSL_NO_DTLS +# define OPENSSL_NO_DTLS #endif #ifndef OPENSSL_NO_DTLS1 -#define OPENSSL_NO_DTLS1 +# define OPENSSL_NO_DTLS1 #endif #ifndef OPENSSL_NO_DTLS1_2 -#define OPENSSL_NO_DTLS1_2 +# define OPENSSL_NO_DTLS1_2 #endif #ifndef OPENSSL_NO_EC2M -#define OPENSSL_NO_EC2M +# define OPENSSL_NO_EC2M #endif #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#define OPENSSL_NO_EC_NISTP_64_GCC_128 -#endif -#ifndef OPENSSL_NO_ECDH -#define OPENSSL_NO_ECDH -#endif -#ifndef OPENSSL_NO_ECDSA -#define OPENSSL_NO_ECDSA +# define OPENSSL_NO_EC_NISTP_64_GCC_128 #endif #ifndef OPENSSL_NO_EGD -#define OPENSSL_NO_EGD +# define OPENSSL_NO_EGD #endif #ifndef OPENSSL_NO_ENGINE -#define OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE #endif #ifndef OPENSSL_NO_ERR -#define OPENSSL_NO_ERR +# define OPENSSL_NO_ERR #endif #ifndef OPENSSL_NO_EXTERNAL_TESTS -#define OPENSSL_NO_EXTERNAL_TESTS +# define OPENSSL_NO_EXTERNAL_TESTS #endif #ifndef OPENSSL_NO_FILENAMES -#define OPENSSL_NO_FILENAMES +# define OPENSSL_NO_FILENAMES #endif #ifndef OPENSSL_NO_FUZZ_AFL -#define OPENSSL_NO_FUZZ_AFL +# define OPENSSL_NO_FUZZ_AFL #endif #ifndef OPENSSL_NO_FUZZ_LIBFUZZER -#define OPENSSL_NO_FUZZ_LIBFUZZER +# define OPENSSL_NO_FUZZ_LIBFUZZER #endif #ifndef OPENSSL_NO_GOST -#define OPENSSL_NO_GOST +# define OPENSSL_NO_GOST #endif #ifndef OPENSSL_NO_HEARTBEATS -#define OPENSSL_NO_HEARTBEATS +# define OPENSSL_NO_HEARTBEATS #endif #ifndef OPENSSL_NO_HW -#define OPENSSL_NO_HW +# define OPENSSL_NO_HW #endif #ifndef OPENSSL_NO_MSAN -#define OPENSSL_NO_MSAN +# define OPENSSL_NO_MSAN #endif #ifndef OPENSSL_NO_OCB -#define OPENSSL_NO_OCB +# define OPENSSL_NO_OCB #endif #ifndef OPENSSL_NO_POSIX_IO -#define OPENSSL_NO_POSIX_IO +# define OPENSSL_NO_POSIX_IO #endif #ifndef OPENSSL_NO_RFC3779 -#define OPENSSL_NO_RFC3779 +# define OPENSSL_NO_RFC3779 #endif #ifndef OPENSSL_NO_SCRYPT -#define OPENSSL_NO_SCRYPT +# define OPENSSL_NO_SCRYPT #endif #ifndef OPENSSL_NO_SCTP -#define OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP #endif #ifndef OPENSSL_NO_SOCK -#define OPENSSL_NO_SOCK +# define OPENSSL_NO_SOCK #endif #ifndef OPENSSL_NO_SSL_TRACE -#define OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE #endif #ifndef OPENSSL_NO_SSL3 -#define OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 #endif #ifndef OPENSSL_NO_SSL3_METHOD -#define OPENSSL_NO_SSL3_METHOD +# define OPENSSL_NO_SSL3_METHOD #endif #ifndef OPENSSL_NO_STDIO -#define OPENSSL_NO_STDIO +# define OPENSSL_NO_STDIO #endif #ifndef OPENSSL_NO_TESTS -#define OPENSSL_NO_TESTS -#endif -#ifndef OPENSSL_NO_TLS1_3 -#define OPENSSL_NO_TLS1_3 +# define OPENSSL_NO_TESTS #endif #ifndef OPENSSL_NO_UBSAN -#define OPENSSL_NO_UBSAN +# define OPENSSL_NO_UBSAN #endif #ifndef OPENSSL_NO_UI_CONSOLE -#define OPENSSL_NO_UI_CONSOLE +# define OPENSSL_NO_UI_CONSOLE #endif #ifndef OPENSSL_NO_UNIT_TEST -#define OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST #endif #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS -#define OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS #endif #ifndef OPENSSL_NO_DYNAMIC_ENGINE -#define OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE #endif + /* * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers * don't like that. This will hopefully silence them. */ -#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy; +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy; /* * Applications should use -DOPENSSL_API_COMPAT= to suppress the @@ -255,37 +244,37 @@ extern "C" { * functions. */ #ifndef DECLARE_DEPRECATED -#define DECLARE_DEPRECATED(f) f; - #ifdef __GNUC__ - #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) - #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 +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# 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 #ifndef OPENSSL_FILE - #ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 - #else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ - #endif +# ifdef OPENSSL_NO_FILENAMES +# define OPENSSL_FILE "" +# define OPENSSL_LINE 0 +# else +# define OPENSSL_FILE __FILE__ +# define OPENSSL_LINE __LINE__ +# endif #endif #ifndef OPENSSL_MIN_API -#define OPENSSL_MIN_API 0 +# define OPENSSL_MIN_API 0 #endif -#if !defined (OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API - #undef OPENSSL_API_COMPAT -#define OPENSSL_API_COMPAT OPENSSL_MIN_API +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API +# undef OPENSSL_API_COMPAT +# define OPENSSL_API_COMPAT OPENSSL_MIN_API #endif /* @@ -293,51 +282,51 @@ extern "C" { * OpenSSL version number matches. */ #if OPENSSL_VERSION_NUMBER < 0x10200000L -#define DEPRECATEDIN_1_2_0(f) f; +# define DEPRECATEDIN_1_2_0(f) f; #elif OPENSSL_API_COMPAT < 0x10200000L -#define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_1_2_0(f) +# define DEPRECATEDIN_1_2_0(f) #endif #if OPENSSL_API_COMPAT < 0x10100000L -#define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_1_1_0(f) +# define DEPRECATEDIN_1_1_0(f) #endif #if OPENSSL_API_COMPAT < 0x10000000L -#define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_1_0_0(f) +# define DEPRECATEDIN_1_0_0(f) #endif #if OPENSSL_API_COMPAT < 0x00908000L -#define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_0_9_8(f) +# define DEPRECATEDIN_0_9_8(f) #endif /* Generate 80386 code? */ #undef I386_ONLY #undef OPENSSL_UNISTD -#define OPENSSL_UNISTD +#define OPENSSL_UNISTD #undef OPENSSL_EXPORT_VAR_AS_FUNCTION /* * The following are cipher-specific, but are part of the public API. */ -#if !defined (OPENSSL_SYS_UEFI) - #undef BN_LLONG +#if !defined(OPENSSL_SYS_UEFI) +# undef BN_LLONG /* Only one for the following should be defined */ - #undef SIXTY_FOUR_BIT_LONG - #undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT +# undef SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# define THIRTY_TWO_BIT #endif -#define RC4_INT unsigned int +#define RC4_INT unsigned int #ifdef __cplusplus } -- 2.35.1