From: Rich Salz Date: Mon, 1 Feb 2016 01:31:00 +0000 (-0500) Subject: Tweak opensslconf.h.in for style X-Git-Tag: OpenSSL_1_1_0-pre3~295 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=cde052f59c903af0097ec06c873ab9a6eda05f2b;hp=6339ece1d80054ebb27dc1fafbe57a18d294b2c3 Tweak opensslconf.h.in for style Reviewed-by: Richard Levitte --- diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 2c60050bc9..a0d0d678b8 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -58,18 +58,9 @@ #ifndef HEADER_ENVELOPE_H # define HEADER_ENVELOPE_H -# ifdef OPENSSL_ALGORITHM_DEFINES -# include -# else -# define OPENSSL_ALGORITHM_DEFINES -# include -# undef OPENSSL_ALGORITHM_DEFINES -# endif - +# include # include - # include - # include # define EVP_MAX_MD_SIZE 64/* longest known is SHA512 */ diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index 22dc0c9bfe..2ba1599cd0 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -1,53 +1,57 @@ -{- join("\n",map { "/* $_ */" } @autowarntext) -} +/* + * {- join("\n * ", @autowarntext) -} + */ #ifdef __cplusplus extern "C" { #endif -/* OpenSSL was configured with the following options: */ -{- - if (@{$config{openssl_sys_defines}}) { + +#ifdef OPENSSL_ALGORITHM_DEFINES +# error OPENSSL_ALGORITHM_DEFINES no longer supported +#endif + +/* + * OpenSSL was configured with the following options: + */ + +{- if (@{$config{openssl_sys_defines}}) { foreach (@{$config{openssl_sys_defines}}) { $OUT .= "#ifndef $_\n"; $OUT .= "# define $_ 1\n"; $OUT .= "#endif\n"; } } - ""; --} -#ifndef OPENSSL_DOING_MAKEDEPEND - -{- if (@{$config{openssl_experimental_defines}}) { foreach (@{$config{openssl_experimental_defines}}) { (my $ex = $_) =~ s/_NO_/_EXPERIMENTAL_/; - $OUT .= "#ifndef $ex\n"; - $OUT .= "# ifndef $_\n"; - $OUT .= "# define $_\n"; + $OUT .= "# ifndef $ex\n"; + $OUT .= "# ifndef $_\n"; + $OUT .= "# define $_\n"; + $OUT .= "# endif\n"; $OUT .= "# endif\n"; - $OUT .= "#endif\n"; } } - ""; --} -{- foreach (@{$config{openssl_api_defines}}) { (my $macro, my $value) = $_ =~ /^(.*?)=(.*?)$/; - $OUT .= "#define OPENSSL_MIN_API $value\n"; + $OUT .= "# define OPENSSL_MIN_API $value\n"; } --} -{- if (@{$config{openssl_algorithm_defines}}) { foreach (@{$config{openssl_algorithm_defines}}) { - $OUT .= "#ifndef $_\n"; - $OUT .= "# define $_\n"; - $OUT .= "#endif\n"; + $OUT .= "# ifndef $_\n"; + $OUT .= "# define $_\n"; + $OUT .= "# endif\n"; } - } else { - " /* no ciphers excluded */\n"; } --} + if ($OUT) { + $OUT = <<"EOF"; +#ifndef OPENSSL_DOING_MAKEDEPEND +$OUT #endif /* OPENSSL_DOING_MAKEDEPEND */ +EOF + } + ""; +-} {- if (@{$config{openssl_thread_defines}}) { @@ -57,9 +61,6 @@ extern "C" { $OUT .= "#endif\n"; } } - ""; --} -{- if (@{$config{openssl_other_defines}}) { foreach (@{$config{openssl_other_defines}}) { $OUT .= "#ifndef $_\n"; @@ -70,26 +71,6 @@ extern "C" { ""; -} -/* The OPENSSL_NO_* macros are also defined as NO_* if the application - asks for it. This is a transient feature that is provided for those - who haven't had the time to do the appropriate changes in their - applications. */ -#ifdef OPENSSL_ALGORITHM_DEFINES -{- - if (@{$config{openssl_algorithm_defines}}) { - foreach (@{$config{openssl_algorithm_defines}}) { - (my $ex = $_) =~ s/^OPENSSL_//; - $OUT .= "# if defined($_) \&\& !defined($ex)\n"; - $OUT .= "# define $ex\n"; - $OUT .= "# endif\n"; - } - } - ""; --} -#endif - -{- $target{cpuid_obj} ne "mem_clr.o" ? "#define OPENSSL_CPUID_OBJ" : "" -} - /* * Applications should use -DOPENSSL_API_COMPAT= to suppress the * declarations of functions deprecated in or before . Otherwise, they @@ -105,12 +86,12 @@ extern "C" { #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 +# undef OPENSSL_API_COMPAT +# define OPENSSL_API_COMPAT OPENSSL_MIN_API #endif #if OPENSSL_API_COMPAT < 0x10100000L @@ -131,36 +112,35 @@ extern "C" { # define DEPRECATEDIN_0_9_8(f) #endif +{- $target{cpuid_obj} ne "mem_clr.o" ? "#define OPENSSL_CPUID_OBJ" : "" -} + /* Generate 80386 code? */ {- $config{processor} eq "386" ? "#define" : "#undef" -} I386_ONLY -#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define ENGINESDIR {- quotify1($config{enginesdir}) -} -#define OPENSSLDIR {- quotify1($config{openssldir}) -} -#endif +#if !defined(VMS) && !defined(__VMS) /* VMS uses logical names instead */ +# if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +# define ENGINESDIR {- quotify1($config{enginesdir}) -} +# define OPENSSLDIR {- quotify1($config{openssldir}) -} +# endif #endif #undef OPENSSL_UNISTD #define OPENSSL_UNISTD {- $target{unistd} -} -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION -{- $config{export_var_as_fn} ? "#define OPENSSL_EXPORT_VAR_AS_FUNCTION" : "" -} +{- $config{export_var_as_fn} ? "#define" : "#undef" -} OPENSSL_EXPORT_VAR_AS_FUNCTION /* * The following are cipher-specific, but are part of the public API. */ - #if !defined(OPENSSL_SYS_UEFI) -{- $config{bn_ll} ? "#define" : "#undef" -} BN_LLONG - +{- $config{bn_ll} ? "# define" : "# undef" -} BN_LLONG /* Only one for the following should be defined */ -{- $config{b64l} ? "#define" : "#undef" -} SIXTY_FOUR_BIT_LONG -{- $config{b64} ? "#define" : "#undef" -} SIXTY_FOUR_BIT -{- $config{b32} ? "#define" : "#undef" -} THIRTY_TWO_BIT +{- $config{b64l} ? "# define" : "# undef" -} SIXTY_FOUR_BIT_LONG +{- $config{b64} ? "# define" : "# undef" -} SIXTY_FOUR_BIT +{- $config{b32} ? "# define" : "# undef" -} THIRTY_TWO_BIT #endif -# define RC4_INT {- $config{rc4_int} -} +#define RC4_INT {- $config{rc4_int} -} #ifdef __cplusplus }