From dc4edd0cd92a2f076f9b1ded21431225cf403696 Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Wed, 21 Feb 2018 22:24:42 +1000 Subject: [PATCH] SNI fix for nginx --- src/tls.c | 2 +- src/tls13.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tls.c b/src/tls.c index dbb737f18..7c97f240b 100644 --- a/src/tls.c +++ b/src/tls.c @@ -8062,7 +8062,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) } #if defined(HAVE_SESSION_TICKET) - if (ssl->options.resuming && ssl->ctx->ticketEncCb != NULL) { + if (ssl->options.resuming && ssl->session.ticketLen > 0) { WOLFSSL_SESSION* sess = &ssl->session; word32 milli; diff --git a/src/tls13.c b/src/tls13.c index bf16be20a..58f4ecc22 100644 --- a/src/tls13.c +++ b/src/tls13.c @@ -3570,10 +3570,11 @@ int DoTls13ClientHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx, return ret; } -#ifdef HAVE_STUNNEL +#if defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) if ((ret = SNI_Callback(ssl)) != 0) return ret; -#endif /*HAVE_STUNNEL*/ + ssl->options.side = WOLFSSL_SERVER_END; +#endif /* HAVE_STUNNELi || WOLFSSL_NGINX || WOLFSSL_HAPROXY */ if (TLSX_Find(ssl->extensions, TLSX_SUPPORTED_VERSIONS) == NULL) { if (!ssl->options.downgrade) {