third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-16 00:50:36 +03:00
Code Issues Packages Projects Releases Wiki Activity
197 Commits 3 Branches 42 Tags
Commit Graph

197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yrutschle
2f8e635b67
Merge pull request #97 from candrews/patch-2 
make sure the files using version.h depend on it being generated first
 2017-12-16 19:01:28 +01:00
yrutschle
b8851d6714
Merge pull request #98 from candrews/patch-3 
Build systemd-sslh-generator if USESYSTEMD is set
 2017-12-16 18:59:36 +01:00
yrutschle
85b94c3259
Merge pull request #153 from rdebath/master 
Move hexdump to verbose level 2
 2017-11-28 21:05:50 +01:00
Robert de Bath
4e790e074f Move hexdump to verbose level 2 
From the command line you use two "-v" options or in the configuration
file you replace the boolean "verbose:true" with an integer "verbose:2".
 2017-11-27 21:05:07 +00:00
Yves Rutschle
6ca1ee7bfd remove leftover debug messages 2017-11-26 20:10:05 +01:00
yrutschle
e66e443d5e
Merge pull request #151 from rdebath/patch-3 
Hexdump for verbose mode.
 2017-11-24 13:55:53 +01:00
yrutschle
faa928b75a
Merge pull request #150 from rdebath/patch-2 
Get libpcre working (and by default)
 2017-11-24 13:53:52 +01:00
yrutschle
2ad99fd36f
Merge pull request #149 from rdebath/patch-1 
Fixup compile using -std=c90
 2017-11-24 13:52:22 +01:00
Robert de Bath
64485d7a58 Send hexdump to stderr like other verbose logs. 2017-11-23 20:52:54 +00:00
orbitarm
5b756ebd0a verbose: dump hex value of packet 
uses the hexdump() function to display the hex value of each probed
packet, making it easy to create regex rules for unsupported connections
 2017-11-23 20:52:54 +00:00
Robert de Bath
021eb836e4 Adjust linking so that wrapper libraries are static. 2017-11-23 20:51:57 +00:00
Robert de Bath
cb90cc97ae Default to using libpcre and actually use it 
as libpcre has to better binary support.

Note, just linking libpcre only has no effect, the posix functions are
provided by libpcreposix.

Use "make USELIBPCRE=" to turn libpcre off and link POSIX library.
 2017-11-23 20:51:57 +00:00
Robert de Bath
338daafe87 Use REG_EXTENDED for regex matching 
The "7 regex" manual page called 'Basic' regular expressions "Obsolete".

It also matches the pcre expressions slightly better.
 2017-11-23 20:51:57 +00:00
Robert de Bath
9fcbe8c7ea Fixup compile using -std=c90 2017-11-23 20:50:49 +00:00
yrutschle
2a7bafdd7f
Merge pull request #147 from jmccrohan/master 
tls: ensure hostname is always null-terminated
 2017-11-13 23:03:12 +01:00
Jonathan McCrohan
3f5d9a4168 tls: ensure hostname is always null-terminated 
6cc3382 introduced a potential buffer overflow. Ensure that hostname is
always null-terminated. (Issue #135)

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
 2017-11-13 00:15:41 +00:00
Yves Rutschlé
0929d39a34 move Let's encrypt config before TLS catchall 2017-09-24 19:55:38 +00:00
Yves Rutschle
f4d2a8d2ad fix logging to specified facility 2017-07-22 17:20:45 +02:00
Yves Rutschle
aa06261d70 added syslog_facility option 2017-07-21 22:46:24 +02:00
Yves Rutschle
dd900ebf3e fail gracefully if target protocol decription is incomplete 2017-07-09 20:51:53 +02:00
Yves Rutschlé
21f524f711 Add support for wildcard ALPN/SNI values 2017-06-12 21:05:12 +00:00
Jonathan McCrohan
1e65088b7e example.cfg: Add Let's Encrypt support to config 
Provides a sample config for Let's Encrypt using the tls-sni-*
challenges. Requires wildcard support added in 6cc3382.

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
 2017-06-06 01:37:07 +01:00
Jonathan McCrohan
6cc33820d1 tls: permit wildcard ALPN/SNI values 
Use fnmatch(3) to provide support for glob style wildcard values in the
ALPN and SNI parameters of the TLS probe.

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
 2017-06-06 01:11:29 +01:00
Yves Rutschle
00d5872aa1 ignore brackets in hostname in config files 2017-04-21 22:33:02 +02:00
Yves Rutschle
7d561af423 allocate listen[] before writing to it... 2017-04-18 21:04:30 +02:00
Yves Rutschle
cce42c6882 re-indent 2017-04-18 20:53:19 +02:00
Yves Rutschle
b0f4e24ce0 IP_FREEBIND: real fix, ignore catastrophic previous checkin 2017-04-06 17:13:11 +02:00
Yves Rutschle
078827ad3f Some systems define IP_FREEBIND but don't implement it which result in setsockopt() failing. No need to die in that case, just ignore the error. 2017-04-06 16:26:27 +02:00
yrutschle
4413284420 Merge pull request #120 from yann-morin-1998/yem/parallel-make 
Makefile: fix parallel build
 2017-02-23 22:54:55 +01:00
Yann E. MORIN
70a2ea926e Makefile: fix parallel build 
version.h is included by some .o files, but it is generated. As such, it
must be a dependency of those .o files.

Rather than filter exactly which .o file needs it, just add a generic
dependency for all .o files on version.h.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 2017-02-23 22:49:31 +01:00
Yves Rutschle
e4a4e04bf8 Clarify no space after -F (Issue 108, take 2) 2017-01-08 13:00:19 +01:00
Yves Rutschle
067f5d7646 Revert "clarify no space after -F (issue 108)" 
This reverts commit f02ce3821c018719536971dbb1bc1ed1517530a2.

That commit accidently imported code that broke transparent
proxying.
 2017-01-08 12:54:34 +01:00
yrutschle
718fe0e2e9 Merge pull request #106 from nckx/man-trivialities 
Fix a few typos in the man page
 2016-12-19 21:55:03 +01:00
yrutschle
864b7badd2 Merge pull request #115 from jimt/patch-1 
Fix README typos.
 2016-12-19 21:39:09 +01:00
Jim Tittsler
234c088324 Fix README typos. 2016-12-19 10:24:31 +09:00
Yves Rutschlé
f02ce3821c clarify no space after -F (issue 108) 2016-11-06 19:44:47 +00:00
Tobias Geerinckx-Rice
e492c2808c
Fix a few typos in the man page 2016-10-19 02:41:12 +02:00
Craig Andrews
a4d2a53a47 Build systemd-sslh-generator if USESYSTEMD is set 2016-06-24 20:30:15 -04:00
Craig Andrews
efba558967 make sure the files using version.h depend on it being generated first 2016-06-24 20:11:13 -04:00
yrutschle
b4cb910438 Merge pull request #92 from mscherer/complete_man 
Add more options in the synopsis
 2016-06-05 18:37:22 +02:00
Michael Scherer
975560aa4a Add more options in the synopsis 2016-06-04 11:57:08 +02:00
Yves Rutschlé
63a83cf041 fix SNI/ALPN option parsing (issue 90) 2016-05-20 07:52:24 +00:00
Yves Rutschlé
245fd26459 fix compiler warnings 2016-05-03 08:37:23 +00:00
yrutschle
9cc47a157d Merge pull request #69 from ViKingIX/fix_local_conn 
Fix the connection problem in transparent mode.
 2016-04-28 11:55:56 +02:00
yrutschle
09b5c84d34 Merge pull request #86 from hogarthj/fix_readme 
Merge error in README.md mixing sections
 2016-03-31 16:28:32 +02:00
James Hogarth
e6cb3596d1 Merge error in README.md mixing sections 2016-03-30 11:48:45 +01:00
Yves Rutschle
38447c8158 v1.18 v1.18 2016-03-29 21:19:05 +02:00
yrutschle
8f39c106e1 Merge pull request #56 from hogarthj/master 
Initial addition of systemd socket based activiation
 2016-02-05 16:46:47 +01:00
Yves Rutschle
414ed7de11 Support keepalive for connections on the connecting side 2016-02-04 09:19:54 +01:00
Yves Rutschle
1b9937b293 Support keepalive for connections on the listening side 2016-02-02 21:07:47 +01:00