Mirrors/proxytunnel
1
0
Fork 0
mirror of https://github.com/proxytunnel/proxytunnel.git synced 2026-07-18 00:44:51 +00:00
Code Issues Projects Releases Wiki Activity

Allow to disable SNI.

Browse source
This commit is contained in:
Denis Chancogne 2026-01-30 23:42:50 +01:00 • committed by Denis Chancogne
parent e2239ab35c
commit 387c2087b2
6 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -17,7 +17,7 @@ OPTFLAGS += -DUSE_SSL
# MSYS
# The current version of gcc from MSYS defines __MSYS__ and __CYGWIN__.
# To avoid to change the code, simply define CYGWIN additionally.
ifneq ($(filter $(MSYSTEM),MSYS MINGW32 MINGW64 UCRT64),)
ifneq ($(filter $(shell uname -o),Msys Cygwin),)
CFLAGS += -DCYGWIN
else
# Most systems, MSYS definitely not

14
cmdline.c
View file

@ -98,6 +98,7 @@ void cmdline_parser_print_help (void) {
#ifdef SETPROCTITLE
" -x, --proctitle=STRING Use a different process title\n"
#endif
" -I, --no-sni Disable SNI\n"
"\n"
"Miscellaneous options:\n"
" -v, --verbose Turn on verbosity\n"
@ -164,6 +165,7 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
/* args_info->enforcetls1_given = 0; */
args_info->host_given = 0;
args_info->cacert_given = 0;
args_info->no_sni_flag = 0;
/* No... we can't make this a function... -- Maniac */
#define clear_args() \
@ -202,6 +204,7 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
args_info->cacert_arg = NULL; \
args_info->enforceipv4_flag = 0; \
args_info->enforceipv6_flag = 0; \
args_info->no_sni_flag = 0; \
}
clear_args();
@ -250,12 +253,13 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
{ "cacert", 1, NULL, 'C' },
{ "ipv4", 0, NULL, '4' },
{ "ipv6", 0, NULL, '6' },
{ "no-sni", 0, NULL, 'I' },
{ NULL, 0, NULL, 0 }
};
c = getopt_long (argc, argv, "hVia:u:s:t:F:p:P:r:R:d:H:x:c:k:vNeEXWBqLo:TzC:46", long_options, &option_index);
c = getopt_long (argc, argv, "hVia:u:s:t:F:p:P:r:R:d:H:x:c:k:vNeEXWBqLo:TzC:46I", long_options, &option_index);
#else
c = getopt( argc, argv, "hVia:u:s:t:F:p:P:r:R:d:H:x:c:k:vNeEXWBqLo:TzC:46" );
c = getopt( argc, argv, "hVia:u:s:t:F:p:P:r:R:d:H:x:c:k:vNeEXWBqLo:TzC:46I" );
#endif
if (c == -1)
@ -524,6 +528,12 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
message("IPv6 enforced\n");
break;
case 'I': /* Disable SNI */
args_info->no_sni_flag = 1;
if( args_info->verbose_flag )
message("Disable SNI\n");
break;
case 0: /* Long option with no short option */
case '?': /* Invalid option. */

1
cmdline.h
View file

@ -93,6 +93,7 @@ struct gengetopt_args_info {
/* int enforcetls1_given; Wheter to enforce TLSv1 */
int host_given; /* Wheter we override the Host Header */
int cacert_given; /* Whether cacert was given */
int no_sni_flag; /* Disable SNI */
};
int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *args_info );

3
docs/proxytunnel.1.adoc
View file

@ -135,6 +135,9 @@ also be used for other proxy-traversing purposes like proxy bouncing.
*-x*, *--proctitle*=_STRING_::
Use a different process title.
*-I*, *--no-sni*::
Disable SNI.
== MISCELLANEOUS OPTIONS

9
io.c
View file

@ -57,10 +57,11 @@ int readline(PTSTREAM *pts) {
if( args_info.verbose_flag ) {
/* Copy line of data into dstr without trailing newline */
char *dstr = calloc(1, strlen(buf) + 1);
strncpy( dstr, buf, strlen(buf));
if (strcmp(dstr, ""))
message( " <- %s\n", dstr );
int len = strlen(buf);
buf[len - 2] = 0;
if (strcmp(buf, ""))
message( " <- %s\n", buf );
buf[len - 2] = '\r';
}
return strlen( buf );
}

22
ptstream.c
View file

@ -340,17 +340,19 @@ int stream_enable_ssl(PTSTREAM *pts, const char *proxy_arg) {
goto fail;
}
/* SNI support */
if ( args_info.verbose_flag ) {
message( "Set SNI hostname to %s\n", peer_host);
if(!args_info.no_sni_flag) {
/* SNI support */
if ( args_info.verbose_flag ) {
message( "Set SNI hostname to %s\n", peer_host);
}
res = SSL_set_tlsext_host_name(ssl, peer_host);
if ( res != 1 ) {
message( "SSL_set_tlsext_host_name() failed for host name '%s'. "
"TLS SNI error, giving up\n", peer_host);
goto fail;
}
}
res = SSL_set_tlsext_host_name(ssl, peer_host);
if ( res != 1 ) {
message( "SSL_set_tlsext_host_name() failed for host name '%s'. "
"TLS SNI error, giving up\n", peer_host);
goto fail;
}
if ( SSL_connect (ssl) <= 0) {
message( "SSL_connect failed\n");
goto fail;