Date: Tue, 13 Sep 2016 18:09:33 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422051 - head/security/proxytunnel/files Message-ID: <201609131809.u8DI9XvM087367@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Sep 13 18:09:33 2016 New Revision: 422051 URL: https://svnweb.freebsd.org/changeset/ports/422051 Log: security/proxytunnel: Fix all SSL configuration, fix no SSLv3 (LibreSSL) Approved by: SSL blanket Added: head/security/proxytunnel/files/ head/security/proxytunnel/files/patch-Makefile (contents, props changed) head/security/proxytunnel/files/patch-ptstream.c (contents, props changed) Added: head/security/proxytunnel/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/proxytunnel/files/patch-Makefile Tue Sep 13 18:09:33 2016 (r422051) @@ -0,0 +1,16 @@ +--- Makefile.orig 2012-01-23 18:13:41 UTC ++++ Makefile +@@ -46,9 +46,11 @@ OPTFLAGS += -DSO_REUSEPORT + + # END system dependant block + +-SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null) +-ifeq ($(SSL_LIBS),) + SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null) ++CFLAGS += $(shell pkg-config --cflags openssl 2>/dev/null) ++ifeq ($(SSL_LIBS),) ++SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null) ++CFLAGS += $(shell pkg-config --cflags libssl 2>/dev/null) + endif + ifeq ($(SSL_LIBS),) + SSL_LIBS := -lssl -lcrypto Added: head/security/proxytunnel/files/patch-ptstream.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/proxytunnel/files/patch-ptstream.c Tue Sep 13 18:09:33 2016 (r422051) @@ -0,0 +1,14 @@ +--- ptstream.c.orig 2012-01-23 18:13:41 UTC ++++ ptstream.c +@@ -151,7 +151,11 @@ int stream_enable_ssl(PTSTREAM *pts) { + + /* Initialise the connection */ + SSLeay_add_ssl_algorithms(); ++#ifndef OPENSSL_NO_SSL3 + meth = SSLv3_client_method(); ++#else ++ meth = SSLv23_client_method(); ++#endif + SSL_load_error_strings(); + + ctx = SSL_CTX_new (meth);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609131809.u8DI9XvM087367>