Changeset a939015 in mod_gnutls

Timestamp:

Nov 6, 2018, 2:58:56 PM (4 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master

Children:

0bed0a0

Parents:

64470ce

Message:

Test early SNI in HTTP/2 test (if enabled)

Files:

• configure.ac (modified) (2 diffs)
• include/mod_gnutls.h.in (modified) (1 diff)
• test/apache-conf/.gitignore (modified) (1 diff)
• test/apache-conf/early_sni.conf.in (added)
• test/tests/28_HTTP2_support/apache.conf (modified) (1 diff)

configure.ac

@@ -76 +76 @@
         [early_sni="no"])
 if test "$early_sni" != "no"; then
-        GNUTLS_FEAT_CFLAGS="${GNUTLS_FEAT_CFLAGS} -DENABLE_EARLY_SNI"
-fi
+        ENABLE_EARLY_SNI=1
+        # This is for the test server configuration
+        EXPECT_EARLY_SNI="Define EXPECT_EARLY_SNI"
+else
+        ENABLE_EARLY_SNI=0
+        EXPECT_EARLY_SNI=""
+fi
+AC_SUBST(ENABLE_EARLY_SNI)
+AC_SUBST(EXPECT_EARLY_SNI)
+AM_SUBST_NOTMAKE(EXPECT_EARLY_SNI)
 
 AC_ARG_ENABLE(strict,
@@ -308 +316 @@
                         doc/Makefile doc/doxygen.conf include/mod_gnutls.h \
                         test/proxy_backend.conf test/ocsp_server.conf \
+                        test/apache-conf/early_sni.conf \
                         test/apache-conf/listen.conf \
                         test/apache-conf/netns.conf])

include/mod_gnutls.h.in

@@ -50 +50 @@
 /* Module Debug Mode */
 #define MOD_GNUTLS_DEBUG @OOO_MAINTAIN@
+
+/* Compile support for early SNI? */
+#if @ENABLE_EARLY_SNI@ == 1
+#define ENABLE_EARLY_SNI
+#endif
 
 /** Name of the module-wide singleton watchdog */

test/apache-conf/.gitignore

@@ -1 +1 @@
 netns.conf
 listen.conf
+early_sni.conf

test/tests/28_HTTP2_support/apache.conf

@@ -9 +9 @@
 </Location>
 
+<IfDefine EXPECT_EARLY_SNI>
+# Different ALPN settings on the same port work only with early SNI
+<VirtualHost _default_:${TEST_PORT}>
+        # No "Protocols" directive, HTTP/1.1 only
+        ServerName              vhost.example.com
+        GnuTLSEnable            On
+        GnuTLSCertificateFile   server/x509.pem
+        GnuTLSKeyFile           server/secret.key
+        GnuTLSPriorities        NORMAL
+</VirtualHost>
+</IfDefine>
+
 <VirtualHost _default_:${TEST_PORT}>
         Protocols               h2 http/1.1