adjust for latest upstream changes

3 files changed, 17 insertions, 19 deletions

diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch
index cdec053..9fc3777 100644
--- a/patches/tlsexttest.c.patch
+++ b/patches/tlsexttest.c.patch
@@ -1,24 +1,24 @@
---- tests/tlsexttest.c.orig     Wed Nov  7 20:01:26 2018
-+++ tests/tlsexttest.c  Wed Nov  7 20:01:35 2018
+--- tests/tlsexttest.c.orig     Fri Jan 18 18:12:03 2019
++++ tests/tlsexttest.c  Fri Jan 18 18:38:20 2019
 @@ -1676,7 +1676,9 @@
  };
  
- static unsigned char tlsext_sni_serverhello[] = {
+ static unsigned char tlsext_sni_server[] = {
 +       0x00
  };
-+const size_t sizeof_tlsext_sni_serverhello = 0;
++const size_t sizeof_tlsext_sni_server = 0;
  
  static int
- test_tlsext_sni_clienthello(void)
+ test_tlsext_sni_client(void)
 @@ -1839,9 +1841,9 @@
         if (!CBB_finish(&cbb, &data, &dlen))
                 errx(1, "failed to finish CBB");
  
--       if (dlen != sizeof(tlsext_sni_serverhello)) {
-+       if (dlen != sizeof_tlsext_sni_serverhello) {
-                FAIL("got serverhello SNI with length %zu, "
--                   "want length %zu\n", dlen, sizeof(tlsext_sni_serverhello));
-+                   "want length %zu\n", dlen, sizeof_tlsext_sni_serverhello);
+-       if (dlen != sizeof(tlsext_sni_server)) {
++       if (dlen != sizeof_tlsext_sni_server) {
+                FAIL("got server SNI with length %zu, "
+-                   "want length %zu\n", dlen, sizeof(tlsext_sni_server));
++                   "want length %zu\n", dlen, sizeof_tlsext_sni_server)
                 goto err;
         }
  
@@ -26,18 +26,18 @@
                 fprintf(stderr, "received:\n");
                 hexdump(data, dlen);
                 fprintf(stderr, "test data:\n");
--               hexdump(tlsext_sni_serverhello, sizeof(tlsext_sni_serverhello));
-+               hexdump(tlsext_sni_serverhello, sizeof_tlsext_sni_serverhello);
+-               hexdump(tlsext_sni_server, sizeof(tlsext_sni_server));
++               hexdump(tlsext_sni_server, sizeof_tlsext_sni_server);
                 goto err;
         }
  
         free(ssl->session->tlsext_hostname);
         ssl->session->tlsext_hostname = NULL;
  
--       CBS_init(&cbs, tlsext_sni_serverhello, sizeof(tlsext_sni_serverhello));
-+       CBS_init(&cbs, tlsext_sni_serverhello, sizeof_tlsext_sni_serverhello);
-        if (!tlsext_sni_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse serverhello SNI\n");
+-       CBS_init(&cbs, tlsext_sni_server, sizeof(tlsext_sni_server));
++       CBS_init(&cbs, tlsext_sni_server, sizeof_tlsext_sni_server);
+        if (!tlsext_sni_client_parse(ssl, &cbs, &alert)) {
+                FAIL("failed to parse server SNI\n");
                 goto err;
 @@ -2741,7 +2743,10 @@
         0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 219d081..7e992d0 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -40,7 +40,6 @@ set(
         tls13_buffer.c
         tls13_handshake.c
         tls13_key_schedule.c
-        tls13_tlsext.c
 )
 
 add_library(ssl ${SSL_SRC})
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index ffbfc2f..9122a72 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -49,7 +49,6 @@ libssl_la_SOURCES += t1_lib.c
 libssl_la_SOURCES += tls13_buffer.c
 libssl_la_SOURCES += tls13_handshake.c
 libssl_la_SOURCES += tls13_key_schedule.c
-libssl_la_SOURCES += tls13_tlsext.c
 
 noinst_HEADERS = bytestring.h
 noinst_HEADERS += srtp.h
@@ -57,4 +56,4 @@ noinst_HEADERS += ssl_locl.h
 noinst_HEADERS += ssl_sigalgs.h
 noinst_HEADERS += ssl_tlsext.h
 noinst_HEADERS += tls13_internal.h
-noinst_HEADERS += tls13_tlsext.h
+noinst_HEADERS += tls13_handshake.h