From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: jian.j.wang@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Fri, 21 Jun 2019 02:27:33 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jun 2019 02:27:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,399,1557212400"; d="scan'208";a="359239160" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga006.fm.intel.com with ESMTP; 21 Jun 2019 02:27:32 -0700 Received: from fmsmsx163.amr.corp.intel.com (10.18.125.72) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 21 Jun 2019 02:27:32 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx163.amr.corp.intel.com (10.18.125.72) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 21 Jun 2019 02:27:31 -0700 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.173]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.246]) with mapi id 14.03.0439.000; Fri, 21 Jun 2019 17:27:30 +0800 From: "Wang, Jian J" To: "devel@edk2.groups.io" , "Wang, Jian J" , "Lu, XiaoyuX" Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg/OpensslLib: Fix CR/LF issue Thread-Topic: [edk2-devel] [PATCH 1/1] CryptoPkg/OpensslLib: Fix CR/LF issue Thread-Index: AQHVJm/k0S0KUN6D1k21V7rARkL886ajsu/wgAInO0A= Date: Fri, 21 Jun 2019 09:27:29 +0000 Message-ID: References: <1560928854-1967-1-git-send-email-xiaoyux.lu@intel.com> <15A9C0EE99510DFE.30228@groups.io> In-Reply-To: <15A9C0EE99510DFE.30228@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMGM1OTM2MzAtOGExMy00NTFjLWE4NTMtOGEzYmFkZjgzOTA0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNW1LRmZkeFByb0V0MDhKR3ZMYjRoWUVScXhZZjRVVkNPM2tkUjFJTGkzNnRCWUVmdGhnNmJ0NEJKZG9IVVZKdiJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: jian.j.wang@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed at 90e8f13d51278791e9534fc736a5319f9b4f9f0a Regards, Jian > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Wa= ng, > Jian J > Sent: Thursday, June 20, 2019 8:35 AM > To: Lu, XiaoyuX ; devel@edk2.groups.io > Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg/OpensslLib: Fix CR/LF is= sue >=20 > Reviewed-by: Jian J Wang >=20 > > -----Original Message----- > > From: Lu, XiaoyuX > > Sent: Wednesday, June 19, 2019 3:21 PM > > To: devel@edk2.groups.io > > Cc: Lu, XiaoyuX ; Wang, Jian J > > Subject: [PATCH 1/1] CryptoPkg/OpensslLib: Fix CR/LF issue > > > > Re-run process_files.py to generate OpensslLib[Crypto].inf. > > CryptoPkg/Library/Include/openssl/opensslconf.h is coped from OpenSSL, > > So keep the CR/LF style like OpenSSL source file. > > > > Cc: Jian J Wang > > Signed-off-by: Xiaoyu Lu > > --- > > CryptoPkg/Library/Include/openssl/opensslconf.h | 80 ++++++++++++----= ------ > -- > > - > > 1 file changed, 40 insertions(+), 40 deletions(-) > > > > diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h > > b/CryptoPkg/Library/Include/openssl/opensslconf.h > > index 9ce99705d80f..07fa2d3ce280 100644 > > --- a/CryptoPkg/Library/Include/openssl/opensslconf.h > > +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h > > @@ -10,8 +10,8 @@ > > * https://www.openssl.org/source/license.html > > */ > > > > -#include > > - > > +#include > > + > > #ifdef __cplusplus > > extern "C" { > > #endif > > @@ -79,9 +79,9 @@ extern "C" { > > #ifndef OPENSSL_NO_SEED > > # define OPENSSL_NO_SEED > > #endif > > -#ifndef OPENSSL_NO_SM2 > > -# define OPENSSL_NO_SM2 > > -#endif > > +#ifndef OPENSSL_NO_SM2 > > +# define OPENSSL_NO_SM2 > > +#endif > > #ifndef OPENSSL_NO_SRP > > # define OPENSSL_NO_SRP > > #endif > > @@ -91,9 +91,9 @@ extern "C" { > > #ifndef OPENSSL_NO_WHIRLPOOL > > # define OPENSSL_NO_WHIRLPOOL > > #endif > > -#ifndef OPENSSL_RAND_SEED_NONE > > -# define OPENSSL_RAND_SEED_NONE > > -#endif > > +#ifndef OPENSSL_RAND_SEED_NONE > > +# define OPENSSL_RAND_SEED_NONE > > +#endif > > #ifndef OPENSSL_NO_AFALGENG > > # define OPENSSL_NO_AFALGENG > > #endif > > @@ -127,9 +127,9 @@ extern "C" { > > #ifndef OPENSSL_NO_DEPRECATED > > # define OPENSSL_NO_DEPRECATED > > #endif > > -#ifndef OPENSSL_NO_DEVCRYPTOENG > > -# define OPENSSL_NO_DEVCRYPTOENG > > -#endif > > +#ifndef OPENSSL_NO_DEVCRYPTOENG > > +# define OPENSSL_NO_DEVCRYPTOENG > > +#endif > > #ifndef OPENSSL_NO_DGRAM > > # define OPENSSL_NO_DGRAM > > #endif > > @@ -163,9 +163,9 @@ extern "C" { > > #ifndef OPENSSL_NO_ERR > > # define OPENSSL_NO_ERR > > #endif > > -#ifndef OPENSSL_NO_EXTERNAL_TESTS > > -# define OPENSSL_NO_EXTERNAL_TESTS > > -#endif > > +#ifndef OPENSSL_NO_EXTERNAL_TESTS > > +# define OPENSSL_NO_EXTERNAL_TESTS > > +#endif > > #ifndef OPENSSL_NO_FILENAMES > > # define OPENSSL_NO_FILENAMES > > #endif > > @@ -220,24 +220,24 @@ extern "C" { > > #ifndef OPENSSL_NO_TESTS > > # define OPENSSL_NO_TESTS > > #endif > > -#ifndef OPENSSL_NO_TLS1_3 > > -# define OPENSSL_NO_TLS1_3 > > -#endif > > +#ifndef OPENSSL_NO_TLS1_3 > > +# define OPENSSL_NO_TLS1_3 > > +#endif > > #ifndef OPENSSL_NO_UBSAN > > # define OPENSSL_NO_UBSAN > > #endif > > -#ifndef OPENSSL_NO_UI_CONSOLE > > -# define OPENSSL_NO_UI_CONSOLE > > -#endif > > +#ifndef OPENSSL_NO_UI_CONSOLE > > +# define OPENSSL_NO_UI_CONSOLE > > +#endif > > #ifndef OPENSSL_NO_UNIT_TEST > > # define OPENSSL_NO_UNIT_TEST > > #endif > > #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS > > # define OPENSSL_NO_WEAK_SSL_CIPHERS > > #endif > > -#ifndef OPENSSL_NO_DYNAMIC_ENGINE > > -# define OPENSSL_NO_DYNAMIC_ENGINE > > -#endif > > +#ifndef OPENSSL_NO_DYNAMIC_ENGINE > > +# define OPENSSL_NO_DYNAMIC_ENGINE > > +#endif > > #ifndef OPENSSL_NO_AFALGENG > > # define OPENSSL_NO_AFALGENG > > #endif > > @@ -256,11 +256,11 @@ extern "C" { > > * functions. > > */ > > #ifndef DECLARE_DEPRECATED > > -# define DECLARE_DEPRECATED(f) f; > > -# ifdef __GNUC__ > > -# if __GNUC__ > 3 || (__GNUC__ =3D=3D 3 && __GNUC_MINOR__ > 0) > > -# undef DECLARE_DEPRECATED > > -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); > > +# define DECLARE_DEPRECATED(f) f; > > +# ifdef __GNUC__ > > +# if __GNUC__ > 3 || (__GNUC__ =3D=3D 3 && __GNUC_MINOR__ > 0) > > +# undef DECLARE_DEPRECATED > > +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); > > # endif > > # endif > > #endif > > @@ -284,18 +284,18 @@ extern "C" { > > # define OPENSSL_API_COMPAT OPENSSL_MIN_API > > #endif > > > > -/* > > - * Do not deprecate things to be deprecated in version 1.2.0 before t= he > > - * OpenSSL version number matches. > > - */ > > -#if OPENSSL_VERSION_NUMBER < 0x10200000L > > -# define DEPRECATEDIN_1_2_0(f) f; > > -#elif OPENSSL_API_COMPAT < 0x10200000L > > -# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) > > -#else > > -# define DEPRECATEDIN_1_2_0(f) > > -#endif > > - > > +/* > > + * Do not deprecate things to be deprecated in version 1.2.0 before t= he > > + * OpenSSL version number matches. > > + */ > > +#if OPENSSL_VERSION_NUMBER < 0x10200000L > > +# define DEPRECATEDIN_1_2_0(f) f; > > +#elif OPENSSL_API_COMPAT < 0x10200000L > > +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) > > +#else > > +# define DEPRECATEDIN_1_2_0(f) > > +#endif > > + > > #if OPENSSL_API_COMPAT < 0x10100000L > > # define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) > > #else > > -- > > 2.7.4 >=20 >=20 >=20