--- tests/tlsexttest.c.orig Sat Aug 22 18:51:52 2020 +++ tests/tlsexttest.c Fri Sep 4 04:04:26 2020 @@ -1658,7 +1658,9 @@ }; static unsigned char tlsext_sni_server[] = { + 0x00 }; +const size_t sizeof_tlsext_sni_server = 0; static int test_tlsext_sni_client(void) @@ -1821,9 +1823,9 @@ if (!CBB_finish(&cbb, &data, &dlen)) errx(1, "failed to finish CBB"); - 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; } @@ -1832,14 +1834,14 @@ fprintf(stderr, "received:\n"); hexdump(data, dlen); fprintf(stderr, "test data:\n"); - 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_server, sizeof(tlsext_sni_server)); + CBS_init(&cbs, tlsext_sni_server, sizeof_tlsext_sni_server); if (!tlsext_sni_client_parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { FAIL("failed to parse server SNI\n"); goto err; @@ -2723,7 +2725,10 @@ 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, }; -unsigned char tlsext_clienthello_disabled[] = {}; +unsigned char tlsext_clienthello_disabled[] = { + 0x00 +}; +const size_t sizeof_tlsext_clienthello_disabled = 0; static int test_tlsext_clienthello_build(void) @@ -2788,18 +2793,18 @@ if (!CBB_finish(&cbb, &data, &dlen)) errx(1, "failed to finish CBB"); - if (dlen != sizeof(tlsext_clienthello_disabled)) { + if (dlen != sizeof_tlsext_clienthello_disabled) { FAIL("got clienthello extensions with length %zu, " "want length %zu\n", dlen, - sizeof(tlsext_clienthello_disabled)); + sizeof_tlsext_clienthello_disabled); compare_data(data, dlen, tlsext_clienthello_disabled, - sizeof(tlsext_clienthello_disabled)); + sizeof_tlsext_clienthello_disabled); goto err; } if (memcmp(data, tlsext_clienthello_disabled, dlen) != 0) { FAIL("clienthello extensions differs:\n"); compare_data(data, dlen, tlsext_clienthello_disabled, - sizeof(tlsext_clienthello_disabled)); + sizeof_tlsext_clienthello_disabled); goto err; }