99 lines
3.0 KiB
Diff
99 lines
3.0 KiB
Diff
<<<<<<< HEAD
|
|
--- tests/tlsexttest.c.orig Mon Aug 15 07:54:28 2022
|
|
+++ tests/tlsexttest.c Mon Aug 15 07:57:01 2022
|
|
@@ -1773,7 +1773,9 @@ static unsigned char tlsext_sni_client[] = {
|
|
=======
|
|
--- tests/tlsexttest.c.orig Mon Aug 29 06:02:26 2022
|
|
+++ tests/tlsexttest.c Mon Aug 29 06:18:01 2022
|
|
@@ -1773,7 +1773,9 @@
|
|
>>>>>>> 051c15d (build updates for latest upstream)
|
|
};
|
|
|
|
static unsigned char tlsext_sni_server[] = {
|
|
+ 0x00
|
|
};
|
|
+const size_t sizeof_tlsext_sni_server = 0;
|
|
|
|
static int
|
|
test_tlsext_sni_client(void)
|
|
<<<<<<< HEAD
|
|
@@ -1971,9 +1973,9 @@ test_tlsext_sni_server(void)
|
|
=======
|
|
@@ -1971,9 +1973,9 @@
|
|
>>>>>>> 051c15d (build updates for latest upstream)
|
|
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;
|
|
}
|
|
|
|
<<<<<<< HEAD
|
|
@@ -1982,14 +1984,14 @@ test_tlsext_sni_server(void)
|
|
=======
|
|
@@ -1982,14 +1984,14 @@
|
|
>>>>>>> 051c15d (build updates for latest upstream)
|
|
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 (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) {
|
|
FAIL("failed to parse server SNI\n");
|
|
goto err;
|
|
<<<<<<< HEAD
|
|
@@ -3194,7 +3196,10 @@ unsigned char tlsext_clienthello_default[] = {
|
|
=======
|
|
@@ -3196,7 +3198,10 @@
|
|
>>>>>>> 051c15d (build updates for latest upstream)
|
|
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)
|
|
<<<<<<< HEAD
|
|
@@ -3280,18 +3285,18 @@ test_tlsext_clienthello_build(void)
|
|
=======
|
|
@@ -3282,18 +3287,18 @@
|
|
>>>>>>> 051c15d (build updates for latest upstream)
|
|
goto err;
|
|
}
|
|
|
|
- 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;
|
|
}
|
|
|