Commit 68af2eaf authored by Hilko Bengen's avatar Hilko Bengen

Drop patches

parent 4885be93
From: Hilko Bengen <bengen@debian.org>
Date: Mon, 22 Sep 2014 18:51:07 +0200
Subject: Fix Lintian warnings about manpage
manpage-has-errors-from-man usr/share/man/man1/sslsplit.1.gz 397: warning: macro `HS' not defined
---
sslsplit.1 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sslsplit.1 b/sslsplit.1
index c4f20dd..7e6d907 100644
--- a/sslsplit.1
+++ b/sslsplit.1
@@ -608,7 +608,6 @@ connection data into separate files under \fB/tmp\fP (add \fB-e\fP
\fInat-engine\fP to select the appropriate engine if multiple engines are
available on your system):
.LP
-.HS
.nf
\fBsslsplit -k ca.key -c ca.crt -l connect.log -L /tmp \\
https ::1 10443 https 127.0.0.1 10443 \\
@@ -623,7 +622,6 @@ connections.
.LP
Intercepting IMAP/IMAPS using the same settings:
.LP
-.HS
.nf
\fBsslsplit -k ca.key -c ca.crt -l connect.log -L /tmp \\
ssl ::1 10993 ssl 127.0.0.1 10993 \\
@@ -635,7 +633,6 @@ A more targetted setup, HTTPS only, using certificate/chain/key files from
\fB/path/to/cert.d\fP and statically redirecting to \fBwww.example.org\fP
instead of querying a NAT engine:
.LP
-.HS
.nf
\fBsslsplit -t /path/to/cert.d -l connect.log -L /tmp \\
https ::1 10443 www.example.org 443 \\
@@ -652,7 +649,6 @@ algorithm performance on your system. Note that clients may not support all
algorithms and key sizes. Also, some clients warn their users about cipher
suites they consider weak.
.LP
-.HS
.nf
\fBsslsplit -Z -s NULL:RC4:AES128:-DHE -K leaf.key \\
-k ca.key -c ca.crt -l connect.log -L /tmp \\
@@ -664,7 +660,6 @@ suites they consider weak.
The original example, but running as a daemon under user \fBsslsplit\fP and
writing a PID file:
.LP
-.HS
.nf
\fBsslsplit -d -p /var/run/sslsplit.pid -u sslsplit \\
-k ca.key -c ca.crt -l connect.log -L /tmp \\
@@ -676,7 +671,6 @@ writing a PID file:
To generate a CA private key \fBca.key\fP and certificate \fBca.crt\fP using
OpenSSL:
.LP
-.HS
.nf
\fBcat >x509v3ca.cnf <<'EOF'\fP
[ req ]
......@@ -7,10 +7,10 @@ Subject: Use pkg-config to determine linker flags for test programs
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GNUmakefile b/GNUmakefile
index 0c3a4b0..904537e 100644
index 17aa1df..6b07e60 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -304,7 +304,7 @@ endif
@@ -320,7 +320,7 @@ endif
ifdef CHECK_FOUND
TPKG_CPPFLAGS+= -I$(CHECK_FOUND)/include
TPKG_LDFLAGS+= -L$(CHECK_FOUND)/lib
......
From: Hilko Bengen <bengen@debian.org>
Date: Mon, 26 Dec 2016 19:50:07 +0100
Subject: Add a test that seems to unbreak the following test when building on
mips
---
cachedsess.t.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/cachedsess.t.c b/cachedsess.t.c
index 7daa472..dcbafc0 100644
--- a/cachedsess.t.c
+++ b/cachedsess.t.c
@@ -82,6 +82,7 @@ START_TEST(cache_dsess_01)
fail_unless(ssl_session_is_valid(s1), "session invalid");
cachemgr_dsess_set((struct sockaddr*)&addr, addrlen, sni, s1);
+ fail_unless(!!s1, "cache stored no session");
s2 = cachemgr_dsess_get((struct sockaddr*)&addr, addrlen, sni);
fail_unless(!!s2, "cache returned no session");
fail_unless(s2 != s1, "cache returned same pointer");
0001-Fix-Lintian-warnings-about-manpage.patch
0002-Use-pkg-config-to-determine-linker-flags-for-test-pr.patch
0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
0004-Add-a-test-that-seems-to-unbreak-the-following-test-.patch
0001-Use-pkg-config-to-determine-linker-flags-for-test-pr.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment