cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional fixes for SSLv3 removal. ok sthen@ (maintainer)

Browse Source
This commit is contained in:
jca 2015-08-28 11:05:22 +00:00
parent d941c47e55
commit d0d78cd0b5
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/sslsplit/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2015/06/10 10:43:29 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2015/08/28 11:05:22 jca Exp $
COMMENT= transparent and scalable SSL/TLS interception
DISTNAME= sslsplit-0.4.11
REVISION= 0
REVISION= 1
EXTRACT_SUFX= .tar.bz2
CATEGORIES= security

17
security/sslsplit/patches/patch-opts_c
View File

@ -1,17 +1,26 @@
$OpenBSD: patch-opts_c,v 1.2 2015/08/25 17:30:56 jca Exp $
$OpenBSD: patch-opts_c,v 1.3 2015/08/28 11:05:22 jca Exp $
Fixed upstream
https://github.com/droe/sslsplit/commit/57a2ab85884e8bacec8b03aa5a3f935376f43a2d
--- opts.c.orig Fri Jul 17 22:51:48 2015
+++ opts.c Fri Jul 17 22:54:07 2015
--- opts.c.orig Mon Mar 16 00:24:02 2015
+++ opts.c Fri Aug 28 12:34:18 2015
@@ -143,7 +143,7 @@ opts_proto_force(opts_t *opts, const char *optarg, con
opts->sslmethod = SSLv2_method;
} else
#endif /* SSL_OP_NO_SSLv2 && WITH_SSLV2 */
-#ifdef SSL_OP_NO_SSLv3
+#ifdef SSL_OP_NO_SSLv3 && !defined(OPENSSL_NO_SSL3_METHOD)
+#if defined(SSL_OP_NO_SSLv3) && !defined(OPENSSL_NO_SSL3_METHOD)
if (!strcmp(optarg, "ssl3")) {
opts->sslmethod = SSLv3_method;
} else
@@ -219,7 +219,7 @@ opts_proto_dbg_dump(opts_t *opts)
#if defined(SSL_OP_NO_SSLv2) && defined(WITH_SSLV2)
(opts->sslmethod == SSLv2_method) ? "nossl2" :
#endif /* SSL_OP_NO_SSLv2 && WITH_SSLV2 */
-#ifdef SSL_OP_NO_SSLv3
+#if defined(SSL_OP_NO_SSLv3) && !defined(OPENSSL_NO_SSL3_METHOD)
(opts->sslmethod == SSLv3_method) ? "ssl3" :
#endif /* SSL_OP_NO_SSLv3 */
#ifdef SSL_OP_NO_TLSv1