Daniel Roethlisberger
6cc01ec32b
Update NEWS.md for -i
2014-11-14 16:22:46 +01:00
Daniel Roethlisberger
150650c7e9
Make local procinfo run-time optional (-i) and use src host:port
2014-11-14 16:20:07 +01:00
Daniel Roethlisberger
42497693d1
Rename define for consistency
2014-11-14 15:36:16 +01:00
Daniel Roethlisberger
0237fe34dc
Only build local process info code where supported
2014-11-14 15:31:30 +01:00
Daniel Roethlisberger
3c7fe37583
Mark params as unused if Darwin libproc unavailable
2014-11-14 01:26:37 +01:00
Daniel Roethlisberger
a906147943
Fix memory leak and handle failure of pathspec formatting
2014-11-14 01:18:43 +01:00
Daniel Roethlisberger
86f509d2ea
Skip realloc and elem access for elem_len == 0
...
Besides obvious benefits, this prevents passing NULL to strncat().
2014-11-14 01:10:47 +01:00
Daniel Roethlisberger
1ce0ee8b12
Safeguard against elem == NULL
...
This should not normally happen but in theory it can (if match wraps
around in the match++ instruction).
2014-11-14 01:06:51 +01:00
Daniel Roethlisberger
966fe80c0c
Move process information code from sys to proc
2014-11-14 01:01:14 +01:00
Daniel Roethlisberger
6adaf00540
Fix pid_t removal for non-pf engines
2014-11-14 01:00:12 +01:00
Daniel Roethlisberger
c3922d9852
Refactor process lookup out of NAT engine code
...
Local process lookup is independent of the NAT engine used, it depends
only on the operating system's process enumeration API. Moving the code
out of NAT lookup also makes it work for static and SNI proxyspecs.
2014-11-14 00:41:27 +01:00
Daniel Roethlisberger
18aca24a2c
Return 0 with pid -1 if no process matches
2014-11-13 23:59:18 +01:00
Daniel Roethlisberger
8c21170cd3
Break lines to 80 cols
2014-11-13 23:58:58 +01:00
Daniel Roethlisberger
dc7a3ee9e3
Break line to 80 cols
2014-11-13 23:50:59 +01:00
Daniel Roethlisberger
f656bcabb7
Update NEWS.md
2014-11-13 23:45:49 +01:00
Daniel Roethlisberger
ff8ef9528d
Merge branch 'issue/55'
2014-11-13 23:40:50 +01:00
Daniel Roethlisberger
0d07aeff7e
Don't automatically drop to nobody if logspec is used
2014-11-13 23:38:59 +01:00
Daniel Roethlisberger
38314ea16d
Formatting changes
2014-11-13 23:38:46 +01:00
Daniel Roethlisberger
81241139c7
Merge branch 'logspec_path_support' of git://github.com/fix-macosx/sslsplit into issue/55
2014-11-13 22:26:38 +01:00
Daniel Roethlisberger
767f02aadb
Merge branch 'issue/54'
2014-11-13 22:19:21 +01:00
Daniel Roethlisberger
2cc353f274
Check malloc retval and mark ptr arguments non-null
2014-11-13 22:17:13 +01:00
Daniel Roethlisberger
a5ccfa3d4b
Remove SSLv2 bug section and add contributors
2014-11-13 19:45:43 +01:00
Daniel Roethlisberger
6a072e48e3
Make contribution section more clear and refer to NEWS.md
2014-11-11 20:20:40 +01:00
Daniel Roethlisberger
c8ba26f60d
Update documentation after merging #56
2014-11-11 20:08:16 +01:00
Daniel Roethlisberger
ed4134487c
Merge pull request #56 from wjjensen/master
...
Fix memory leaks in ssl_x509_load() and ssl_key_load()
2014-11-11 19:54:27 +01:00
wjensen
cc0b57d341
Fix memory leaks in ssl_x509_load() and ssl_key_load(), remove unnecessary condition in ssl_x509chain_load()
2014-11-11 09:46:29 -08:00
Daniel Roethlisberger
3579fb6891
Merge branch 'sys_proc_info' of git://github.com/fix-macosx/sslsplit into issue/54
2014-11-10 23:29:16 +01:00
Daniel Roethlisberger
40a2b7c2c3
Merge branch 'issue/53'
2014-11-10 20:45:31 +01:00
Daniel Roethlisberger
d9d8674792
Fix memory leak in libproc lookup code
2014-11-10 20:44:26 +01:00
Daniel Roethlisberger
f8867368ee
Detect presence of Darwin libproc.h
2014-11-10 19:59:56 +01:00
Landon Fuller
afd32151d8
Merge branch 'sys_proc_info' into logspec_path_support
2014-11-07 17:20:12 -07:00
Landon Fuller
5225ec50b7
Merge branch 'nat_local_pid' into sys_proc_info
2014-11-07 17:19:59 -07:00
Landon Fuller
6e860472d1
Remove debugging statement.
2014-11-07 17:19:14 -07:00
Landon Fuller
bea605d7ca
Update the man page to include the -F option and its logspec directives.
2014-11-07 17:03:55 -07:00
Landon Fuller
7ce301a60f
Fix incorrect format specifiers used in the -F usage example.
2014-11-07 16:49:00 -07:00
Landon Fuller
6b8ac51653
Merge branch 'master' into fix-macosx
2014-11-07 16:47:37 -07:00
Landon Fuller
be4be4a054
Merge branch 'sys_proc_info' into logspec_path_support
2014-11-07 16:46:33 -07:00
Landon Fuller
afe6b87d80
Merge branch 'nat_local_pid' into sys_proc_info
2014-11-07 16:46:20 -07:00
Landon Fuller
137d10aa6e
Define HAVE_DARWIN_LIBPROC on Darwin.
2014-11-07 16:46:07 -07:00
Landon Fuller
02c6e6e605
Adopt the new oom_die() usage.
2014-11-07 16:44:47 -07:00
Landon Fuller
a4c518c8a0
Merge remote-tracking branch 'origin/fix-macosx' into logspec_path_support
2014-11-07 16:43:09 -07:00
Landon Fuller
efca8d73c9
Remove debugging statement.
2014-11-07 16:38:50 -07:00
Landon Fuller
81bf954c17
Merge commit '5ed49c498596995c79a5b7fda3d1ee1eb09ce8ec' into sys_proc_info
2014-11-07 16:37:50 -07:00
Landon Fuller
fe5eb66b53
Merge commit '9204418c806fc85ba04c3650dc4002bd440083ca' into nat_local_pid
2014-11-07 16:33:39 -07:00
Daniel Roethlisberger
2de17692f0
Avoid casting !NULL to ptr types to silence clang
2014-11-06 21:17:41 +01:00
Daniel Roethlisberger
375bf2a13c
Clarify comment about logging
2014-11-06 18:12:49 +01:00
Daniel Roethlisberger
206c688219
Refactor SSL/TLS debug code
2014-11-05 21:18:53 +01:00
Daniel Roethlisberger
601cdf5b52
Add SSL/TLS protocol selection debug code
2014-11-05 20:41:41 +01:00
Daniel Roethlisberger
6b0e47dc89
Allow more control over used SSL/TLS versions
...
Add -r to force a specific SSL/TLS protocol version.
Add -R to disable one or several SSL/TLS protocol versions.
Replace WANT_SSLV2_CLIENT and WANT_SSLV2_SERVER to WITH_SSLV2.
Issue: #30
Reported by: @Apollo2342
2014-11-05 20:06:11 +01:00
Daniel Roethlisberger
53e3d593c8
Move build status into h1
2014-11-04 20:41:48 +01:00
