Pushed at 90e8f13d51278791e9534fc736a5319f9b4f9f0a Regards, Jian
> -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Wang, > Jian J > Sent: Thursday, June 20, 2019 8:35 AM > To: Lu, XiaoyuX <xiaoyux...@intel.com>; devel@edk2.groups.io > Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg/OpensslLib: Fix CR/LF issue > > Reviewed-by: Jian J Wang <jian.j.w...@intel.com> > > > -----Original Message----- > > From: Lu, XiaoyuX > > Sent: Wednesday, June 19, 2019 3:21 PM > > To: devel@edk2.groups.io > > Cc: Lu, XiaoyuX <xiaoyux...@intel.com>; Wang, Jian J <jian.j.w...@intel.com> > > 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 <jian.j.w...@intel.com> > > Signed-off-by: Xiaoyu Lu <xiaoyux...@intel.com> > > --- > > 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 <openssl/opensslv.h> > > - > > +#include <openssl/opensslv.h> > > + > > #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__ == 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__ == 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 the > > - * 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 the > > + * 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 > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42692): https://edk2.groups.io/g/devel/message/42692 Mute This Topic: https://groups.io/mt/32120640/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
