Commit graph

380 commits

Author SHA1 Message Date
Sven Geuer
7f32a099f9
Makefile: Fix issue #101 by not emitting '-DSETPROCTITLE' with MSYS2. 2025-12-09 16:58:00 +01:00
Sven Geuer
320ad4be83
More corrections to the manual page
- Drop sections "Arguments", it describes the non-existent positional parameter
  in detail.
2025-11-22 19:08:08 +01:00
Sven Geuer
c43ba13e02
Corrections to the manual page
- Drop mentioning of non-existent positional parameter.
- Mark -p (or HTTP_PROXY) and -d as mandatory
2025-11-22 15:52:05 +01:00
Sven Geuer
9203bdfef7
cmdline.c: Fix check of proxy and destination being given. 2025-11-22 15:49:53 +01:00
Mark Janssen
cd358101fb
Merge pull request #93 from zSuperx/nix-flake-basic-support
Nix flake basic support
2025-05-15 00:48:49 +02:00
zsuper
882a22d80d Reverted changes to ntlm.c 2025-05-14 14:41:01 -07:00
zsuper
9db6e3b3d3 Merge remote-tracking branch 'upstream/master' into nix-flake-basic-support 2025-05-14 14:40:18 -07:00
Mark Janssen
b4ddf94b45
Merge pull request #97 from proxytunnel/issue-96
Fix #96
2025-05-14 22:30:20 +02:00
Mark Janssen -- Sig-I/O Automatisering
77b9afda27
Fix #96 2025-05-14 22:24:24 +02:00
zsuper
b4ed20677c Removed use-ssl option as it does not make sense to disable SSL. Also added default overlay
updated INSTALL.md with flake overlay
2025-04-04 10:18:32 -07:00
zsuper
85eeaabe28 Updated INSTALL.md again 2025-04-03 21:29:38 -07:00
zsuper
2e61c609bb Updated INSTALL.md 2025-04-03 21:13:45 -07:00
zsuper
226c45c969 Added one more #ifdef for consistency 2025-04-03 20:00:14 -07:00
zsuper
2ef739f7c2 Fixed formatting issue that caused an error with OPTFLAGS 2025-04-03 19:51:48 -07:00
zsuper
f320f2bf63 Added preprocessor #ifdef USE_SSL around every instance of OPENSSL_VERSION_NUMBER 2025-04-03 19:50:31 -07:00
zsuper
ad8a6a1c7e Added options for gnu-systems & setproctitle to flake 2025-04-03 19:43:15 -07:00
zsuper
5e9a22d035 moved package mkDerivation to ./nix/proxytunnel.nix 2025-04-03 15:17:29 -07:00
zsuper
c4c6caafbb use callPackage 2025-04-03 11:20:21 -07:00
zsuper
4982420160 flake overlay test 2025-04-03 09:46:52 -07:00
Piyush Kumbhare
8ab065fca1
Update flake.nix version to match github Release v1.12.3 version 2025-04-01 23:39:13 -07:00
zsuper
3ec1efe42e Changed flake.nix to use flake-parts for modular arch support. Updated INSTALL.md 2025-04-01 23:09:45 -07:00
zsuper
20be023202 Extended flake so support can easily be added for diff archs in the future 2025-04-01 19:58:45 -07:00
zsuper
c5ab464877 Added basic flake support for x86_64-linux. 2025-04-01 19:27:26 -07:00
Sven Geuer
dc0945afb8
Update CHANGES and config.h for release 1.12.3 2025-03-07 23:04:56 +01:00
Sven Geuer
6b99bb7898
TODO: Drop note about SSL proxy support, it has been added meanwhile. 2025-03-07 22:27:28 +01:00
Sven Geuer
0e202442e5
CHANGES: chmode 755 to 644. 2025-03-07 22:23:12 +01:00
Mark Janssen
c31174f171
Merge pull request #89 from njbraun/increase-max-header-size-4k
Increase MAX_HEADER_SIZE
2025-01-04 19:28:17 +01:00
Nick Braun
fb9b85a40e
Increase MAX_HEADER_SIZE
Increases the MAX_HEADER_SIZE in cmdline to be 4K
2024-12-20 04:56:18 -08:00
Mark Janssen
92bec14931
Merge pull request #86 from e9hack/fix_and_improve_NTLM_authentication
Fix and improve ntlm authentication
2024-11-29 15:17:15 +01:00
e9hack
b6daf27b8f Fixed NTLM authentication
- analyse_HTTP: Read first something from the connection before analyse it
- analyse_HTTP: Accepte a TAB as a second delimiter during parsing an answer from a proxy.
- proxy_protocol(): In case of NTLM authentication, this function is called twice recursively.
  Use variable ntlm_challenge as marker of the state of the authentication to avoid endless
  recursive calls in case of an error and avoid to try to connect to the remote proxy twice.
2024-11-29 12:41:27 +01:00
e9hack
8ff6d58f1b Fixed loading of default and legacy provider
- Verify that the default and legacy provider was loaded successfully. If not bail out.
- On Windows, try to load the legacy.dll from multiple locations before bailing out.
- Added legacy.dll to the proxytunnel.zip archive.
2024-11-29 12:08:56 +01:00
Mark Janssen
8b2661ecd7
Merge pull request #83 from tofurky/unterminated_string_calloc
Avoid printing unterminated string in readline()
2024-09-16 12:53:42 +02:00
Matt Merhar
9df98a6e31 Avoid printing unterminated string in readline()
When running with -v, readline() in io.c uses strncpy() to copy a string
(*without* the terminating NULL) into an uninitialized buffer created by
malloc().

When message() then prints this, it can lead to garbage data being
emitted since it's potentially reading past the intended end of the
string. In practice, this appears to only be an additional byte or 2
before a NULL is encountered.

The issue was hit when readline() encountered "\r\n\r\n", not longer
strings, but I imagine it's dependent on things like compiler / libc /
the weather as to whether the end of the buffer returned by malloc()
will be zeroed or not; I've seen similar issues pop up with "working"
code running on newer distros.
2024-09-13 19:20:50 -04:00
Mark Janssen
84d44b608b
Merge pull request #80 from hoilc/patch-1
Fix typo in package name
2024-03-25 14:50:38 +01:00
hoilc
0d62ae5af3
Fix typo in package name 2024-03-25 21:25:00 +08:00
Mark Janssen
d55d9286a0
Merge pull request #79 from hoilc/enable-github-action
Enable GitHub Action for Windows Binary
2024-03-21 13:40:08 +01:00
hoilc
af80b39f2d enable github action 2024-03-20 13:18:20 +08:00
Sven Geuer
d2c636bef4
Prepare CHANGES and config.h for release. 2024-02-06 17:41:38 +01:00
Sven Geuer
08b84fe054
Update the --help output to the recent version. 2024-02-01 16:33:38 +01:00
Sven Geuer
e999ab0acd
Replace deprecated functions bzero/bcopy by memset/memcpy. 2024-02-01 16:14:56 +01:00
Sven Geuer
abb82a7807
Make sure no deprecated libssl functions are called. 2024-02-01 16:08:09 +01:00
Sven Geuer
351d2dffc3
Use OPENSSL_VERSION_NUMBER to compile code matching the applied libssl version.
This renders Makefile.ssl11 redundant.
2024-01-30 19:47:34 +01:00
Sven Geuer
945f205796
Deprecate -L/--tlsenforce and -T/--no-ssl3. 2024-01-30 19:46:15 +01:00
Sven Geuer
33399b3312
Remove deprecated options.
Remove options -u and -s deprecated since 2008.
Remove also commented remnants of options -U and -S.
2024-01-26 01:44:37 +01:00
Sven Geuer
cef27b8576
As worker, close the unneeded listening socket. 2024-01-21 23:04:33 +01:00
Sven Geuer
4690473fba
In standalone mode, fix logging of IPv6 clients. 2024-01-21 22:52:36 +01:00
Sven Geuer
65562596b7
Use an AF_INET socket when binding to a specified IPv4 address. 2024-01-21 21:06:38 +01:00
Sven Geuer
6adc78ec08 Prepare CHANGES and config.h for release 2023-12-17 19:50:52 +01:00
Sven Geuer
a0b916a177 client SSL * -> SSL client * 2023-12-17 19:49:28 +01:00
Sven Geuer
11f50d20c3 Update manual page regarding -a/--standalone 2023-12-17 01:25:40 +01:00