2023-04-28 11:56:17 -06:00
|
|
|
--- tests/tlsexttest.c.orig Fri Apr 28 11:42:38 2023
|
|
|
|
+++ tests/tlsexttest.c Fri Apr 28 11:55:27 2023
|
|
|
|
@@ -1775,7 +1775,9 @@
|
2017-09-03 00:51:08 +09:00
|
|
|
};
|
|
|
|
|
2022-11-08 10:38:28 +01:00
|
|
|
static const unsigned char tlsext_sni_server[] = {
|
2017-09-03 00:51:08 +09:00
|
|
|
+ 0x00
|
|
|
|
};
|
2019-01-18 18:38:59 -06:00
|
|
|
+const size_t sizeof_tlsext_sni_server = 0;
|
2017-09-03 00:51:08 +09:00
|
|
|
|
|
|
|
static int
|
2019-01-18 18:38:59 -06:00
|
|
|
test_tlsext_sni_client(void)
|
2023-04-28 11:56:17 -06:00
|
|
|
@@ -1973,9 +1975,9 @@
|
2017-09-03 00:51:08 +09:00
|
|
|
if (!CBB_finish(&cbb, &data, &dlen))
|
|
|
|
errx(1, "failed to finish CBB");
|
|
|
|
|
2019-01-18 18:38:59 -06:00
|
|
|
- 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));
|
2019-01-18 18:44:47 -06:00
|
|
|
+ "want length %zu\n", dlen, sizeof_tlsext_sni_server);
|
2017-09-03 00:51:08 +09:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2023-04-28 11:56:17 -06:00
|
|
|
@@ -1984,14 +1986,14 @@
|
2017-09-03 00:51:08 +09:00
|
|
|
fprintf(stderr, "received:\n");
|
|
|
|
hexdump(data, dlen);
|
|
|
|
fprintf(stderr, "test data:\n");
|
2019-01-18 18:38:59 -06:00
|
|
|
- hexdump(tlsext_sni_server, sizeof(tlsext_sni_server));
|
|
|
|
+ hexdump(tlsext_sni_server, sizeof_tlsext_sni_server);
|
2017-09-03 00:51:08 +09:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(ssl->session->tlsext_hostname);
|
|
|
|
ssl->session->tlsext_hostname = NULL;
|
|
|
|
|
2019-01-18 18:38:59 -06:00
|
|
|
- CBS_init(&cbs, tlsext_sni_server, sizeof(tlsext_sni_server));
|
|
|
|
+ CBS_init(&cbs, tlsext_sni_server, sizeof_tlsext_sni_server);
|
2022-08-15 07:59:06 +02:00
|
|
|
if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
|
2019-01-18 18:38:59 -06:00
|
|
|
FAIL("failed to parse server SNI\n");
|
2017-09-03 00:51:08 +09:00
|
|
|
goto err;
|
2023-04-28 11:56:17 -06:00
|
|
|
@@ -3196,7 +3198,10 @@
|
2020-09-04 04:12:49 -05:00
|
|
|
0x04, 0x03, 0x02, 0x01, 0x02, 0x03,
|
2017-12-30 20:15:56 +09:00
|
|
|
};
|
|
|
|
|
|
|
|
-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)
|
2023-04-28 11:56:17 -06:00
|
|
|
@@ -3287,18 +3292,18 @@
|
2022-02-06 21:11:52 -06:00
|
|
|
goto err;
|
|
|
|
}
|
2017-12-30 20:15:56 +09:00
|
|
|
|
|
|
|
- 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;
|
|
|
|
}
|
|
|
|
|