From 4bac945fc78121277d3735ffb22ba83a64b91c16 Mon Sep 17 00:00:00 2001 From: Mark Janssen -- Sig-I/O Automatisering Date: Sat, 28 May 2022 15:56:31 +0200 Subject: [PATCH] Apply patch to fix: #57 --- CHANGES | 4 ++++ ptstream.c | 6 ++++-- ptstream.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 204c848..61f94e2 100755 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +Changes to proxytunnel 1.10.20220528 -- Sat 28 May 2022 03:54:20 PM CEST + +- Patch from https://github.com/ZjYwMj fixes https://github.com/proxytunnel/proxytunnel/issues/57 + Changes to proxytunnel 1.10.20210609 -- Wed Jun 9 11:55:54 CEST 2021 - No functional changes diff --git a/ptstream.c b/ptstream.c index 8d46c69..7146862 100644 --- a/ptstream.c +++ b/ptstream.c @@ -341,8 +341,10 @@ int stream_enable_ssl(PTSTREAM *pts, const char *proxy_arg) { message( "Set SNI hostname to %s\n", peer_host); } res = SSL_set_tlsext_host_name(ssl, peer_host); - if (res < 0) { - message( "TLS SNI error, giving up: SSL_set_tlsext_host_name returned error message:\n %u\n", res ); + if (res != SSL_TLSEXT_ERR_OK) { + unsigned long ssl_err = (res == SSL_TLSEXT_ERR_ALERT_WARNING ? SSL_TLSEXT_ERR_ALERT_WARNING : ERR_get_error()); + message( "SSL_set_tlsext_host_name returned: %lu (0x%lx). " + "TLS SNI error, giving up\n", ssl_err, ssl_err ); exit( 1 ); } diff --git a/ptstream.h b/ptstream.h index ee36af2..36610d9 100644 --- a/ptstream.h +++ b/ptstream.h @@ -21,6 +21,7 @@ #ifdef USE_SSL #include +#include #include #include #include