X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=include%2Fopenssl%2Fopensslconf.h.in;h=bec5bd09d2d4899b4d0b591221a33a6bbf535c44;hp=f54043acddbaf0a05138e5da68bb7ec03235b1e5;hb=e61ec2d9babf30da3a4d94554e576bf10c1fc92c;hpb=9ab6fc5936be62f6fee1c433938eae4c89aa23da

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index f54043acdd..bec5bd09d2 100644
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -1,56 +1,44 @@
-/* opensslconf.h */
-{- join("\n",map { "/* $_ */" } @autowarntext) -}
+/*
+ * {- join("\n * ", @autowarntext) -}
+ *
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #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 .= "# endif\n";
-	$OUT .= "#endif\n";
-      }
-    }
-    "";
--}
-{-
     foreach (@{$config{openssl_api_defines}}) {
         (my $macro, my $value) = $_ =~ /^(.*?)=(.*?)$/;
         $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";
       }
-    } else {
-      "   /* no ciphers excluded */\n";
     }
--}
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-
-{-
     if (@{$config{openssl_thread_defines}}) {
       foreach (@{$config{openssl_thread_defines}}) {
 	$OUT .= "#ifndef $_\n";
@@ -58,9 +46,6 @@ extern "C" {
 	$OUT .= "#endif\n";
       }
     }
-    "";
--}
-{-
     if (@{$config{openssl_other_defines}}) {
       foreach (@{$config{openssl_other_defines}}) {
 	$OUT .= "#ifndef $_\n";
@@ -71,25 +56,11 @@ 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" : "" -}
+/*
+ * 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;
 
 /*
  * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
@@ -105,13 +76,23 @@ extern "C" {
 # define DECLARE_DEPRECATED(f)   f;
 #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
+#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
@@ -132,41 +113,28 @@ 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
-#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.
  */
-
-#define OSSL_DES_LONG {- $config{des_int} -}
-
 #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 RC2_INT {- $config{rc2_int} -}
-# define IDEA_INT {- $config{idea_int} -}
-# define MD2_INT {- $config{md2_int} -}
-# define RC4_INT {- $config{rc4_int} -}
+#define RC4_INT {- $config{rc4_int} -}
 
 #ifdef  __cplusplus
 }