Add basic TLSv1.3 cookie support

[openssl.git] / include / openssl / opensslconf.h.in

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index 54a13545e272dda54c2543616964605e55bb2f0c..bec5bd09d2d4899b4d0b591221a33a6bbf535c44 100644 (file)
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -1,5 +1,12 @@
 /*
  * {- 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
@@ -21,31 +28,17 @@ extern "C" {
        $OUT .= "#endif\n";
       }
     }
-    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";
+        $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";
       }
     }
-    "";
--}
-
-{-
     if (@{$config{openssl_thread_defines}}) {
       foreach (@{$config{openssl_thread_defines}}) {
        $OUT .= "#ifndef $_\n";
@@ -84,13 +77,13 @@ extern "C" {
 #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