 yrutschle
|
8ffcf5ab03
|
Merge pull request #233 from FlexMcMurphy/patch-1
Delete tproxy.jpg
|
2019-07-03 22:26:59 +02:00 |
|
|
yrutschle
|
a917149e14
|
Merge pull request #234 from FlexMcMurphy/patch-2
Update tproxy.md
|
2019-07-03 22:26:43 +02:00 |
|
|
yrutschle
|
6e9f24153f
|
Merge pull request #232 from jmccrohan/master
Update Let's Encrypt entry in example.cfg
|
2019-06-17 20:57:06 +02:00 |
|
|
yrutschle
|
c1369910c9
|
Merge pull request #229 from rugbylug/evening_of_docs
Fix a typo
|
2019-05-20 21:28:53 +02:00 |
|
|
yrutschle
|
5684959dd6
|
Merge pull request #225 from ffontaine/master
fix version extraction when building in a larger git tree
|
2019-04-06 22:12:30 +02:00 |
|
|
yrutschle
|
d2b64c7f38
|
Merge pull request #211 from licaon-kter/patch-1
Update verbose option in examples
|
2019-01-19 08:22:10 +01:00 |
|
|
yrutschle
|
71265a8477
|
Merge pull request #201 from astiob/probe-strlen
Fix incorrect strncmp length in HTTP method probing
|
2018-09-23 21:56:51 +02:00 |
|
|
yrutschle
|
a5d00568b5
|
Merge pull request #199 from rom1dep/sni_alpn_errmatching
tls: proposed fix for incorrect SNI/ALPN matching
|
2018-08-30 23:16:28 +02:00 |
|
|
yrutschle
|
10fb0bce6f
|
Merge pull request #192 from candrews/patch-5
Include common.h in systemd-sslh-generator.c
|
2018-07-11 13:18:50 +02:00 |
|
|
yrutschle
|
108a9780d8
|
Merge pull request #187 from msantos/segfault
Fix potential segfaults (unverified malloc() returns) and other robustness issues
|
2018-06-18 16:45:51 +02:00 |
|
|
yrutschle
|
336e8bb9d1
|
Merge pull request #186 from Revertron/patch-1
Fixed a typo
|
2018-06-14 16:36:13 +02:00 |
|
|
yrutschle
|
552723cc5f
|
Merge pull request #180 from sanmai/patch-1
Update README.md
|
2018-06-01 10:31:34 +02:00 |
|
|
yrutschle
|
f451cc8bed
|
Merge pull request #172 from WeirdCarrotMonster/master
Added support for socks5 protocol
|
2018-04-16 22:38:06 +02:00 |
|
|
yrutschle
|
3a61c8b0b1
|
Merge pull request #167 from HighwindsHipsApp/master
Fixed parent/child usage after initial fork in sslh-fork.c
|
2018-02-11 18:42:21 +01:00 |
|
|
yrutschle
|
141e4b4f83
|
Merge pull request #105 from vapier/master
add chroot support
|
2018-01-03 20:34:05 +01:00 |
|
|
yrutschle
|
d9541392f8
|
Merge pull request #139 from tmolitor-stud-tu/master
Better documentation of transparent proxy support with more features
|
2018-01-02 23:24:46 +01:00 |
|
|
yrutschle
|
24cd3d0974
|
Merge pull request #161 from pali/master
Ensure that IPv6 socket would listen only for IPv6 connections
|
2018-01-02 23:19:00 +01:00 |
|
|
yrutschle
|
d26eab728c
|
Merge pull request #143 from astiob/select-fork
sslh-select: support forking for particular protocols
|
2018-01-02 22:26:58 +01:00 |
|
|
yrutschle
|
53e00c27ff
|
Merge pull request #159 from rdebath/patch-5
Translate systemd C99 and C++ code to old C
|
2018-01-02 22:23:19 +01:00 |
|
|
yrutschle
|
063169c167
|
Merge pull request #162 from vapier/adb
adb: update protocol sniffer
|
2018-01-02 22:21:19 +01:00 |
|
|
yrutschle
|
7808a3a766
|
Merge pull request #142 from astiob/select-bugs
Fix several bugs in sslh-select
|
2017-12-16 19:51:23 +01:00 |
|
|
yrutschle
|
f5b1b881a4
|
Merge pull request #145 from ariera/master
Doc update about Transparent proxy support
|
2017-12-16 19:11:34 +01:00 |
|
|
yrutschle
|
f8a16c7a29
|
Merge pull request #146 from guusdk/SSLv2-clienthello
Allow SSLv2 CLIENT-HELLO (without SSL 2.0)
|
2017-12-16 19:09:25 +01:00 |
|
|
yrutschle
|
b33c65ed53
|
Merge pull request #96 from candrews/patch-1
Harden the systemd service
|
2017-12-16 19:04:52 +01:00 |
|
|
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 |
|
|
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 |
|
|
yrutschle
|
2a7bafdd7f
|
Merge pull request #147 from jmccrohan/master
tls: ensure hostname is always null-terminated
|
2017-11-13 23:03:12 +01: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 |
|