Commit Graph

65 Commits (e8054deed3ede0cd000f8bfb4c86d68dcfe50ad4)

Author SHA1 Message Date
Soner Tari 27650fab69 Support all command line options in the conf file as well
Update with the latest sslsplit-devel changes
6 years ago
Soner Tari 027b6e3a95 Update with sslsplit develop changes 6 years ago
Soner Tari ae69b21908 Fix build on Linux, need to implement getdtablecount(2) of OpenBSD 6 years ago
Soner Tari d76a9a52ad Fix examples 6 years ago
Soner Tari 4c8831bd90 Update with SSLsplit 0.5.1 changes, fix LibreSSL version issues
Add VerifyPeer and AllowWrongHost options
7 years ago
Soner Tari b064ffa668 Use llu int as unique conn id, much simpler than uuid 7 years ago
Soner Tari a79cf4e0d1 Add sslproxy.conf man page and example sslproxy.conf, and related make changes 7 years ago
Soner Tari 1a6eab50a5 Tidy and clean logs up
Add DEBUG_PROXY directive around all log_dbg_level_printf() and related lines
Log stats to syslog, similar to error logs, so that it is simpler to rotate and parse
-O w/o -g is failing bufferevent_socket_connect for parent dst, so either enable -O w/ -g, or disable -O w/o -g (-O2 is failing too)
Refactoring
7 years ago
Soner Tari 36c89a0314 Fix crash if no logging enabled
Disable debug, the default now
7 years ago
Soner Tari ea6dc07248 Rename to sslproxy
Reduce http headers to just one SSLproxy line
7 years ago
Soner Tari 5a136b7ce7 Add extra stats
Rearrange, clean-up
7 years ago
Soner Tari cea873e6f2 Set the OPENBSD directive at compile time 7 years ago
Soner Tari 67ddee1585 Import sslsplit-devel changes
Add stats logs, initial
Add SSLproxy_SrcAddr header field
Clean-up
7 years ago
Soner Tari 0b0f6b21dc Add uuid to all conn mctxs, otherwise we cannot uniquely identify them, causing trouble especially while deleting conns
Fix issues, clean-up
7 years ago
Soner Tari d033ea68dd Plain TCP version is running good enough, next will try to switch the SSL on 7 years ago
Daniel Roethlisberger e67978f4dd Merge branch 'develop' into feature/autossl 8 years ago
Daniel Roethlisberger 1c9aa249a9 Fix Travis build by disabling tests using IPv6
TravisCI has removed IPv6 support in 2016.  To cope with this regression
in the testing infrastructure, disable all tests on Travis that depend
on the system being able to handle ::1 as an IP address.  Normal unit
testing still uses the full test suite.
8 years ago
Daniel Roethlisberger b3b7a7ab17 Merge branch 'develop' into feature/autossl 8 years ago
Daniel Roethlisberger 57a2ab8588 Rewrite protocol version macros and refactoring
Introduce HAVE_SSLV2, HAVE_SSLV3, HAVE_TLSV10, HAVE_TLSV11 and
HAVE_TLSV12 to indicate that support for the respective protocol is
available in OpenSSL.  This was necessary due to the increased
complexity of testing version support following the phasing out of SSLv2
and SSLv3 from OpenSSL implementations.  This fixes the build with
OpenSSL versions which have SSLv3 support removed.

While here, de-duplicate code for setting SSL_CTX options and do not set
SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION anymore; it has no benefit
in the context of splitting SSL/TLS for analysis.

Reported by:	Jérémie Courrèges-Anglas
9 years ago
Daniel Roethlisberger 74f62c3e5e Refactor and unify ClientHello parsers
Refactor and unify ssl_tls_clienthello_identify() and the earlier
ssl_tls_clienthello_parse_sni() into a single
ssl_tls_clienthello_parse() function that handles parsing ClientHello
messages for different purposes.  As a result, rename the debug knob
DEBUG_SNI_PARSER into DEBUG_CLIENTHELLO_PARSER.
9 years ago
Daniel Roethlisberger 64cc8ffcde Fix lib search w/o pkg-config w/multiple instances
Fix automatic search for dependencies when multiple instances of the
same library are installed in different prefixes that we search, by
using the first one found.  Automatic search is only used when
pkg-config was not found.  This fixes compiler errors caused by spurious
path names within compiler or linker flags, such as

    ld: can't map file, errno=22 file '/usr/lib' for architecture x86_64
    clang: error: linker command failed with exit code 1 (use -v to see
    invocation)

While here, also make XNU header version fallback more robust and add
(diabled) version mappings for 10.10.2 and 10.10.3 which are not
published by Apple yet.

Issue:		#96
Reported by:	Jan Vilhuber
9 years ago
Daniel Roethlisberger dd0d3238ca Add sha1(NEWS.md) to BUILD_INFO when VERSION from dir
Issue:		#85
9 years ago
Daniel Roethlisberger 9b5006d6f7 Add PCFLAGS for additional pkg-config flags
Allow for additional flags to pkg-config by means of a PCFLAGS variable.
This e.g. allows to set PCFLAGS='--static' for static builds in
combination with CFLAGS='-static' and LDFLAGS='-static'.

Issue:		#82
Reported by:	@kickwindbg
9 years ago
Daniel Roethlisberger a14354d18b Allow uid, gid and mode of installed files to be tuned
Introducing the overridable variables INSTALLUID, INSTALLGID, BINUID,
BINGID, BINMODE, MANUID, MANGID, MANMODE that allow overriding of uid,
gid and mode of installed files.  Note that this solution still has the
limitation that uid, gid and mode of created directories cannot be set.

Issue:		#81
Reported by:	Shiloh Heurich
9 years ago
Daniel Roethlisberger da47cd3fe1 Improve documentation of build process 9 years ago
Daniel Roethlisberger 3231c9c031 Record the actual XNU version detected 9 years ago
Daniel Roethlisberger 20ea783cf7 Add XNU header selection fallback
If the proper headers matching either the reported XNU version or OS X
version exactly cannot be found, use the latest headers that SSLsplit
knows about.  This fixes build on new releases of OS X that have no
source code published by Apple yet.
9 years ago
Daniel Roethlisberger bb071336e0 Escape # in shell invocation
This fixes the following make error on Mac OS X versions that we don't
explicitly support yet due to missing sources:

    GNUmakefile:55: *** unterminated call to function `shell': missing `)'.
    Stop.

Reported by:	Justin Garrick
10 years ago
Daniel Roethlisberger c9aa840214 Quote dollar signs in shell invocation
Reported by:	Justin Garrick
10 years ago
Daniel Roethlisberger 47abb0030d Update clean target for newer clang build artefacts 10 years ago
Daniel Roethlisberger e1156a3482 Make awk regexp more robust 10 years ago
Daniel Roethlisberger ec9cc5fb23 Fix usr/grp test with Linux `id` 10 years ago
Daniel Roethlisberger 6f2f0af0c3 Fix usr/grp formatting unit test when id fails 10 years ago
Daniel Roethlisberger 8c71970f33 Add unit test for sys_user_str and sys_group_str 10 years ago
Daniel Roethlisberger f8867368ee Detect presence of Darwin libproc.h 10 years ago
Landon Fuller 137d10aa6e
Define HAVE_DARWIN_LIBPROC on Darwin. 10 years ago
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
10 years ago
Daniel Roethlisberger 259d470498 Use -I instead of -isystem with clang-analyzer 10 years ago
Daniel Roethlisberger d0665377ee Remove WGET_FLAGS from developer targets 10 years ago
Daniel Roethlisberger c210641783 Don't add XNU includes to cppcheck invocation 10 years ago
Daniel Roethlisberger 78a573121d Add some CPPFLAGS to cppcheck arguments 10 years ago
Daniel Roethlisberger fcb64e85e7 Make SSLv2 support opt-in instead of opt-out
Migrate knobs from DISABLE_SSLV2_CLIENT and DISABLE_SSLV2_SERVER to
WANT_SSLV2_CLIENT and WANT_SSLV2_SERVER and remove the
DISABLE_SSLV2_SESSION_CACHE knob entirely, automatically including the
respective code if SSLv2 support is compiled into SSLsplit.
10 years ago
Daniel Roethlisberger cc6cb59485 Rewrite Mac OS X support to use proper XNU headers
Move from one set of headers per major OS X release to one set of
headers per XNU release.  Fetch the header files from Apple's official
Open Source site instead of GitHub in the fetchdeps developer target.
As a side effect, 10.6.x is now supported as well (untested), and proper
headers are used for 10.10.

Issue:		#39
10 years ago
Daniel Roethlisberger d85e5ddbe2 Disable SSLv2 support by default 10 years ago
Daniel Roethlisberger 79c67ebed7 Merge pull request #32 from fix-macosx/macosx-yosemite
Support Mac OS X 10.10 by using 10.9 headers
10 years ago
Steve Wills b8c8cb73ed add DESTDIR, MANDIR to install target
DESTDIR to allow installing in chroot
MANDIR to allow specifying different dir for man pages
10 years ago
Landon Fuller 8ef5011fcb Enable Mac OS X 10.10 feature detection
This is pointed at the 10.9 pf headers for testing, as
the 10.10 kernel sources are unavailable.
10 years ago
Daniel Roethlisberger fe558af0a3 Remove duplicates from FEATURES 11 years ago
Daniel Roethlisberger 6b99bde4fb Only use -pthread on non-Darwin systems 11 years ago
Daniel Roethlisberger ba991dcdf8 Minor overhaul of the Mac OS X hacks 11 years ago