Commit Graph

  • ef8233a839 Fix warnings for format-string-security Jonas Mueller 2019-11-05 20:11:44 +01:00
  • 125458df51 Fix warnings for return-type Jonas Mueller 2019-11-05 20:06:23 +01:00
  • d2cfa3c603
    Merge pull request #242 from ideal/master yrutschle 2019-09-08 20:56:25 +02:00
  • 891bcf9966 fix error message upon regex syntax error yrutschle 2019-09-06 21:05:46 +02:00
  • 544c2b6d2f
    Merge pull request #240 from niobos/feature/descriptive-ps-name yrutschle 2019-09-05 21:49:32 +02:00
  • 0380a4309f Change process name to indicate task of process Niobos 2019-08-31 16:32:10 +02:00
  • 3aa245efa5 separate connection information creationg from log emission yrutschle 2019-09-05 15:48:33 +02:00
  • bc28d6ce19 the remaining size of buffer should minus prefix_len ideal 2019-09-04 23:02:13 +08:00
  • d78c810d84 specify conf2struct version yrutschle 2019-08-30 22:25:38 +02:00
  • ed3cd40e23 adapt config format to conf2struct v1.0 yrutschle 2019-08-29 22:21:00 +02:00
  • 12edc3dbca merged master yrutschle 2019-08-16 10:06:31 +02:00
  • 0931dfdf0b specify c2s commit to be used for building yrutschle 2019-08-16 08:13:34 +02:00
  • 0d5a2f6922
    Merge pull request #236 from Jason-Cooke/patch-1 yrutschle 2019-07-09 21:50:49 +02:00
  • 49e59734cb
    docs: fix typo Jason Cooke 2019-07-09 09:12:39 +12:00
  • 914dc98fb3 added transparent proxy figure Yves Rutschle 2019-07-08 20:18:57 +00:00
  • 1dc0088b74
    Merge pull request #235 from FlexMcMurphy/patch-3 yrutschle 2019-07-08 22:12:31 +02:00
  • 9416617456
    Delete tproxy.svg FlexMcMurphy 2019-07-05 23:52:24 +01:00
  • 7e047e35b3 updated architecture figure to SVG yrutschle 2019-07-03 22:45:04 +02:00
  • 8ffcf5ab03
    Merge pull request #233 from FlexMcMurphy/patch-1 yrutschle 2019-07-03 22:26:59 +02:00
  • a917149e14
    Merge pull request #234 from FlexMcMurphy/patch-2 yrutschle 2019-07-03 22:26:43 +02:00
  • 08a64e99b4
    Update tproxy.md FlexMcMurphy 2019-06-30 12:28:53 +01:00
  • 0ef57f1500
    Delete tproxy.jpg FlexMcMurphy 2019-06-30 11:47:42 +01:00
  • fde86a778d remove contents from README that was added in doc/ yrutschle 2019-06-29 21:51:02 +02:00
  • 5bd0235d38 split documentation into separate files in doc/ yrutschle 2019-06-29 21:50:05 +02:00
  • 177d337ac9 added new tproxy doc yrutschle 2019-06-29 19:23:56 +02:00
  • 8e203c897e added SOCKS5 to README yrutschle 2019-06-24 21:39:18 +02:00
  • 6e9f24153f
    Merge pull request #232 from jmccrohan/master yrutschle 2019-06-17 20:57:06 +02:00
  • f029b4098b Update Let's Encrypt entry in example.cfg Jonathan McCrohan 2019-06-16 23:26:33 +01:00
  • 51f3bdf064 Generated socket changes Matthewacon 2019-05-25 21:36:47 -04:00
  • b570a29ea1 Fixed issue with leading directory creation for drop-in generation Matthewacon 2019-05-25 13:53:04 -04:00
  • c5a1c31a6f Added systemd drop-in configuration support for individual sslh configs Matthewacon 2019-05-25 11:34:33 -04:00
  • 2a7ffec11f Removed verbose logging on systemd unit Matthewacon 2019-05-24 20:05:04 -04:00
  • 3822352016 Fixed global sslh configuration mistake Matthewacon 2019-05-24 12:07:32 -04:00
  • 8a8d9d2856 Added early error logging for the systemd generator Matthewacon 2019-05-23 20:49:23 -04:00
  • a84b4eef04 Changed systemd socket generator and configuration layout Matthewacon 2019-05-23 19:18:08 -04:00
  • c1369910c9
    Merge pull request #229 from rugbylug/evening_of_docs yrutschle 2019-05-20 21:28:53 +02:00
  • d756f7d504 Fix a typo Ondřej Kuzník 2019-05-16 20:52:04 +01:00
  • 6d99f780ef Merge branch 'master' of https://github.com/yrutschle/sslh yrutschle 2019-05-13 15:21:36 +02:00
  • d5baed3f18 Fix fd2fd return value which should not be -1 on error yrutschle 2019-05-13 15:21:22 +02:00
  • 5684959dd6
    Merge pull request #225 from ffontaine/master yrutschle 2019-04-06 22:12:30 +02:00
  • 95a6577cda add Dockerfile Taras Inzyk 2019-04-06 13:40:23 +05:00
  • b5d8b2d199 fix version extraction when building in a larger git tree Fabrice Fontaine 2019-04-05 23:05:25 +02:00
  • e528f519bc relax address matching rule so it matches more than just 'localhost' yrutschle 2019-03-11 22:21:56 +01:00
  • b529069029 print a synthetic test report yrutschle 2019-03-11 21:31:24 +01:00
  • 67eb471c6f Merge branch 'tfo' yrutschle 2019-03-10 10:12:33 +01:00
  • 2705face30 TCP_FASTOPEN changelog yrutschle 2019-03-10 10:11:28 +01:00
  • 4e725e1520 added TFO for listening socket yrutschle 2019-03-10 10:11:06 +01:00
  • b0c3c8fdbc manage TFO already done in connect call yrutschle 2019-03-10 09:53:52 +01:00
  • 15f733e572 add tfo_ok configuration setting yrutschle 2019-03-10 09:46:06 +01:00
  • ff91f94315 Merge client TFO setting yrutschle 2019-03-10 09:39:48 +01:00
  • 0a880ea607
    Use TCP Fast Open for client sockets Craig Andrews 2019-03-09 21:13:12 -05:00
  • e0312b4a9d make ssh fork when on command line as used to be the case before yrutschle 2019-03-09 12:36:57 +01:00
  • 5a213c9650 c2s fix: initialise root config structure even if no config file is specified yrutschle 2019-03-09 11:36:24 +01:00
  • 872178ee12
    TCP_FASTOPEN for incoming connections Craig Andrews 2019-01-24 16:51:02 -05:00
  • 7baf7f724c Move config dump to stderr and verbose > 4 yrutschle 2019-02-08 22:45:16 +01:00
  • 848b107f2b document conf2struct dependency yrutschle 2019-02-03 21:13:37 +01:00
  • a7b4462c6e Added 'minlength' option yrutschle 2019-02-03 14:45:14 +01:00
  • 5b309a9b97 update c2f output yrutschle 2019-01-27 18:53:36 +01:00
  • d2b64c7f38
    Merge pull request #211 from licaon-kter/patch-1 yrutschle 2019-01-19 08:22:10 +01:00
  • d647b4eb55
    And here Licaon_Kter 2019-01-19 00:27:11 +00:00
  • a584348a55
    Update verbose option in examples Licaon_Kter 2019-01-19 00:26:06 +00:00
  • 530acc7c72 Moved command line parsing to conf2struct yrutschle 2019-01-12 21:33:44 +01:00
  • dbc0667ad3 removed obsolete declarations yrutschle 2018-12-08 22:55:03 +01:00
  • e8654da78c Moved configuration file parsing to conf2struct, which abstract all the tedious bits of reading the settings from the file into a structure. yrutschle 2018-12-07 08:41:40 +01:00
  • 343b0a0fbf reactivate tests yrutschle 2018-12-07 08:40:30 +01:00
  • ad0adfb0e1 re-integrate command line support yrutschle 2018-12-07 08:32:36 +01:00
  • 33ab9d535d code cleanup and adaptation of regex probe yrutschle 2018-12-04 23:11:04 +01:00
  • d3d4fd657a moved config parse to c2s code yrutschle 2018-12-03 11:02:20 +01:00
  • e2fddf17fc updated description to better match our maturity yrutschle 2018-11-29 18:31:55 +01:00
  • e7ce929020 config file now read to struct with c2s; command line no longer works yrutschle 2018-11-29 11:56:33 +01:00
  • 7af31c45c9 fix tests so that fragmented tests actually work yrutschle 2018-11-29 11:52:25 +01:00
  • 4ae2e62d25 v1.20 v1.20 Yves Rutschle 2018-11-20 22:58:41 +01:00
  • 8ec9799ca0 fix ssl tests yrutschle 2018-11-04 22:59:01 +01:00
  • 80ad31aec0 refactoring: replace magic constants with symbols yrutschle 2018-11-04 22:25:16 +01:00
  • 4f80066d9e
    Fixed typo in Makefile Guus der Kinderen 2018-10-15 11:09:15 +02:00
  • d6c714166a only try to parse TLS extensions if settings are actually set yrutschle 2018-09-30 21:35:45 +02:00
  • aa77922ffd turn ssl setting from command line to tls (ssl no longer exists) yrutschle 2018-09-30 21:34:22 +02:00
  • 2ee0088c5f turn ssl setting from configuration file to tls (ssl no longer exists) yrutschle 2018-09-30 20:20:06 +02:00
  • f480eb6c7d refactoring: simpler TLS extension parsing algorithm yrutschle 2018-09-28 13:58:33 +02:00
  • 3b70e7f618
    Merge pull request #4 from yrutschle/master Vasya Pupkin 2018-09-25 11:53:55 +03:00
  • 6431bb7e35 refactoring: changed magic numbers for use_alpn to named bitfields yrutschle 2018-09-23 22:29:25 +02:00
  • 6d6ea50066 Merge branch 'master' of https://github.com/yrutschle/sslh yrutschle 2018-09-23 21:57:16 +02:00
  • 71265a8477
    Merge pull request #201 from astiob/probe-strlen yrutschle 2018-09-23 21:56:51 +02:00
  • 0003680137 remove old tls and ssl targets, only use alpn/sni probe also for TLS with no extensions yrutschle 2018-09-23 12:07:06 +02:00
  • e8f0d3ea53 Fix HTTP method probing Oleg Oshmyan 2018-04-11 15:37:25 +03:00
  • 648707c333 misc Aleksei Faians 2018-09-04 23:28:35 +03:00
  • d8325a9fd7
    Merge pull request #3 from yrutschle/master Vasya Pupkin 2018-08-31 14:20:57 +03:00
  • a5d00568b5
    Merge pull request #199 from rom1dep/sni_alpn_errmatching yrutschle 2018-08-30 23:16:28 +02:00
  • ffe9971624 test suite for SNI/ALPN with multiple targets and all combinations covered yrutschle 2018-08-30 19:50:53 +02:00
  • 1693436cc3 automatic test for SNI/ALPN (single target) Yves Rutschle 2018-08-29 19:18:23 +02:00
  • 2ea0d49ede CP866 BBS prompt Aleksei Faians 2018-08-22 21:41:16 +03:00
  • e42f670112 tls: proposed fix for incorrect SNI/ALPN matching Romain DEP. 2018-08-21 22:36:01 +02:00
  • ba66c3421a
    Merge pull request #2 from yrutschle/master Vasya Pupkin 2018-08-15 00:20:57 +03:00
  • 3e4e3f1a34 Revert "100% CPU usage fix" Aleksei Faians 2018-08-15 00:18:23 +03:00
  • 60df92c2b2 prevent repeated reads on broken sockets Yves Rutschle 2018-08-14 23:05:49 +02:00
  • 8ad32816a6 last_p might be used uninitialised if last probe has no probe set (which I don't think might happen, but anyhow...) Yves Rutschle 2018-08-14 22:52:52 +02:00
  • a54c240c4b 100% CPU usage fix Aleksei Faians 2018-08-14 05:46:58 +03:00
  • a58f05ce16 merge upstream commits Aleksei Faians 2018-08-14 03:30:39 +03:00
  • b41cf18cad merge upstream changes Aleksei Faians 2018-08-14 03:27:18 +03:00
  • 677e385fec new probing algorithm Yves Rutschle 2018-08-13 22:29:09 +02:00