The branch master has been updated
via 104a733df65dfd8c3dd110de9bd56f6ebfc8f2f6 (commit)
from 5ce87e11de21835255ea11cc330ebf9931e21329 (commit)
- Log -----------------------------------------------------------------
commit 104a733df65dfd8c3dd110de9bd56f6ebfc8f2f6
Author: Matt Caswell <m...@openssl.org>
Date: Tue Feb 4 17:11:07 2020 +0000
Fix no-tls1_3
The hostname_cb in sslapitest.c was originally only defined if TLSv1.3
was enabled. A recently added test now uses this unconditionally, so we
move the function implementation earlier in the file, and always compile
it in.
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11014)
-----------------------------------------------------------------------
Summary of changes:
test/sslapitest.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 0f90db92ba..94719b23ac 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -110,6 +110,17 @@ static unsigned char serverinfov2[] = {
0xff /* Dummy extension data */
};
+static int hostname_cb(SSL *s, int *al, void *arg)
+{
+ const char *hostname = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
+
+ if (hostname != NULL && (strcmp(hostname, "goodhost") == 0
+ || strcmp(hostname, "altgoodhost") == 0))
+ return SSL_TLSEXT_ERR_OK;
+
+ return SSL_TLSEXT_ERR_NOACK;
+}
+
static void client_keylog_callback(const SSL *ssl, const char *line)
{
int line_length = strlen(line);
@@ -3196,17 +3207,6 @@ static int test_early_data_not_sent(int idx)
return testresult;
}
-static int hostname_cb(SSL *s, int *al, void *arg)
-{
- const char *hostname = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
-
- if (hostname != NULL && (strcmp(hostname, "goodhost") == 0
- || strcmp(hostname, "altgoodhost") == 0))
- return SSL_TLSEXT_ERR_OK;
-
- return SSL_TLSEXT_ERR_NOACK;
-}
-
static const char *servalpn;
static int alpn_select_cb(SSL *ssl, const unsigned char **out,
