third-party-mirrors/sslh
1
0 Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2026-10-22 18:12:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
763 Commits 4 Branches 47 Tags
780e536aebf5ef26217492bf87fea537a5d257bc
Commit Graph
76 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yves Rutschle 92d2326016 Merge pull request #408 from pcrow/master 
Fix transparent mode in a multi-stage chain
 2023-10-07 21:15:58 +02:00
Yves Rutschle be66848e2d Merge pull request #406 from ffontaine/master 
Makefile: add USE_LIBEV
 2023-10-03 09:32:42 +02:00
Yves Rutschle 93600d1fb1 Merge pull request #299 from amake/patch-1 
Allow supplying additional CFLAGS
 2023-08-31 15:26:42 +02:00
Yves Rutschle 04f258e705 Merge branch 'master' into patch-1 2023-08-31 15:26:22 +02:00
Yves Rutschle 1f0cab2aee Merge pull request #342 from utoni/fix/ovpn-probe-read-overflow 
fix possible buffer overflow
 2023-08-31 15:15:50 +02:00
Yves Rutschle 54fe4b2f47 Merge pull request #401 from rnhmjoj/master 
fix handling of IPv6 UDP connections
 2023-08-26 21:32:22 +02:00
Yves Rutschle 4728730abc Merge pull request #392 from klementng/docker/transparent-patch 
Docker: ipv6 transparent patch
 2023-08-10 08:21:39 +02:00
Yves Rutschle 056c283145 Merge pull request #393 from oliv3r/dev/cleanup 
container: Cleanup some style issues
 2023-08-09 08:25:22 +02:00
Yves Rutschle 4cbff962db Merge pull request #386 from oliv3r/dev/fix_version_tag 
version: Do not put a slash in the version tag
 2023-07-30 23:12:32 +02:00
Yves Rutschle 29c949e051 Merge pull request #389 from jsoref/spelling 
Spelling
 2023-07-30 23:09:03 +02:00
Yves Rutschle e8a84e6c22 Merge pull request #388 from klementng/master 
Enable --transparent mode for docker
 2023-07-30 23:01:38 +02:00
Yves Rutschle bb76bc1d31 Merge pull request #382 from oliv3r/add_default_entrypoint 
docker: Add proper entrypoint
 2023-06-10 19:17:12 +02:00
Yves Rutschle 4a5ccb75b2 Merge pull request #384 from oliv3r/fix/parallel_builds 
CI: Do not parallelized container builds
 2023-06-10 19:15:39 +02:00
Yves Rutschle 7b7c9231b0 Merge pull request #383 from oliv3r/dev/pipeline 
docker: Automatically build and push container
 2023-06-05 20:53:35 +02:00
Yves Rutschle 8a0de7b628 Merge pull request #362 from exussum12/patch-1 
Fix typo
 2022-10-21 18:08:45 +02:00
Yves Rutschle 5154630fe0 Merge pull request #365 from iamdoubz/master 
Update make clean to remove ev builds
 2022-10-21 18:07:11 +02:00
Yves Rutschle 7e3f723699 Merge pull request #356 from utoni/fix/watcher-unitialised-value 
Fixes unitialised memory access as seen in issue #355.
 2022-09-22 21:10:12 +02:00
Yves Rutschle 9a36854ed3 Merge pull request #353 from utoni/fix/possible-format-str-exploit 
fix possible format str vuln
 2022-09-11 21:15:51 +02:00
Yves Rutschle bb685f8467 Merge pull request #344 from utoni/improve/makefile-ar 
Makefile generates libsslh.a useable for other projects e.g. fuzzer.
 2022-09-07 19:11:44 +02:00
Yves Rutschle a6df18527c Merge pull request #345 from utoni/add/wireguard 
add wireguard probe
 2022-09-04 18:30:09 +02:00
Yves Rutschle fb8fe57bd8 Merge pull request #341 from utoni/add/teamspeak-probe 
add teamspeak3 (voice only) probe
 2022-08-19 18:03:12 +02:00
Yves Rutschle 79c8af6ed1 Merge pull request #340 from utoni/fix/sslh-select 
changed `select(nfds, ...)` to `select(nfds + 1, ...)`, see `man 2 select`
 2022-08-19 18:00:25 +02:00
Yves Rutschle c4e7261a51 Merge pull request #339 from utoni/add/config-sanity-checks 
add some config sanity checks, fixes #307
 2022-08-19 17:53:08 +02:00
Yves Rutschle 7e2bb7f01f Merge pull request #338 from utoni/add/openvpn-udp-probe 
add openvpn udp probe
 2022-08-19 17:50:39 +02:00
Yves Rutschle aa14090bcc Merge pull request #329 from utoni/add/log-to-file 
Added support for logging to a file.
 2022-04-30 09:53:07 +02:00
Yves Rutschle 43bd660df2 Merge pull request #328 from jerome992/master 
fixed docker compilation error
 2022-04-10 16:24:50 +02:00
Yves Rutschle 96b1aa86d8 Merge pull request #325 from g1franc/patch-1 
Update README.MacOSX
 2022-03-31 15:27:00 +02:00
Yves Rutschle a71de786d6 Merge pull request #323 from milkpirate/feat/resolve-on-connect 
Feat/resolve on connect
 2022-03-23 21:26:25 +01:00
Yves Rutschle dd167d13a3 Merge pull request #324 from beango1/patch-1 
typo correction
 2022-03-23 21:23:05 +01:00
Yves Rutschle bccb78e1a3 Merge pull request #317 from jeffre/master 
docs: corrections to docker usage
 2022-01-23 16:26:55 +01:00
Yves Rutschle 4e72800f2e Merge pull request #311 from Belisarith/master 
Correct wrong version of pcre in Dockerfile
 2021-11-25 11:02:40 +01:00
Yves Rutschle 5b21375087 Merge pull request #310 from bket/fix_tests 
Fix (some) failing tests
 2021-10-28 15:07:51 +02:00
Yves Rutschle 2f822741b3 Merge pull request #297 from jeremiejig/master 
update doc CAP_NET_RAW, remove CAP_SETUID/SETGID
 2021-08-01 21:25:05 +02:00
Yves Rutschle 82b8ba547e Merge pull request #205 from inztar/master 
add Dockerfile
 2021-07-31 16:28:42 +02:00
Yves Rutschle 8e38d56167 Merge pull request #294 from wltu/fix-unused-result 
Fixed unused result issue with write()
 2021-07-31 16:20:06 +02:00
Yves Rutschle ea3b6794e1 Merge pull request #296 from lnslbrty/improved/example-config-udp 
Added some example regex for UDP forward.
 2021-07-31 16:16:15 +02:00
Yves Rutschle b72baa0622 Merge pull request #280 from ffontaine/master 
Makefile: fix static linking with pcre
 2021-03-16 20:32:46 +01:00
yrutschle cf46cd5bb4 Merge pull request #271 from bket/config_init 
Always initialize config_t structure, fixes #270
 2020-07-15 21:15:49 +02:00
yrutschle d1f782e1fe Merge pull request #255 from jamesmacwhite/cfg-example-tls 
Update SSL example to TLS
 2020-01-02 21:12:18 +01:00
yrutschle 49e8bff01b Merge pull request #248 from muellerj/master 
Fix warnings
 2019-11-14 23:16:24 +01:00
yrutschle d2cfa3c603 Merge pull request #242 from ideal/master 
Fix remaining available size of buffer
 2019-09-08 20:56:25 +02:00
yrutschle 544c2b6d2f Merge pull request #240 from niobos/feature/descriptive-ps-name 
Change process name to indicate task of process
 2019-09-05 21:49:32 +02:00
yrutschle 0d5a2f6922 Merge pull request #236 from Jason-Cooke/patch-1 
docs: fix typo
 2019-07-09 21:50:49 +02:00
yrutschle 1dc0088b74 Merge pull request #235 from FlexMcMurphy/patch-3 
Delete tproxy.svg
 2019-07-08 22:12:31 +02:00
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