diff options
| author | marino <marino@FreeBSD.org> | 2016-09-14 02:09:33 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2016-09-14 02:09:33 +0800 |
| commit | 0ae49d16647dacec3216d59341fb51ffa9c169dd (patch) | |
| tree | a3cf4a0ae8a6e9b48385dfc844cf1269030049c8 /security/proxytunnel/files | |
| parent | dae462a067e01b4f20c3499f8bcaf042c0f1ed40 (diff) | |
| download | freebsd-ports-gnome-0ae49d16647dacec3216d59341fb51ffa9c169dd.tar.gz freebsd-ports-gnome-0ae49d16647dacec3216d59341fb51ffa9c169dd.tar.zst freebsd-ports-gnome-0ae49d16647dacec3216d59341fb51ffa9c169dd.zip | |
security/proxytunnel: Fix all SSL configuration, fix no SSLv3 (LibreSSL)
Approved by: SSL blanket
Diffstat (limited to 'security/proxytunnel/files')
| -rw-r--r-- | security/proxytunnel/files/patch-Makefile | 16 | ||||
| -rw-r--r-- | security/proxytunnel/files/patch-ptstream.c | 14 |
2 files changed, 30 insertions, 0 deletions
diff --git a/security/proxytunnel/files/patch-Makefile b/security/proxytunnel/files/patch-Makefile new file mode 100644 index 000000000000..0d54d38bf170 --- /dev/null +++ b/security/proxytunnel/files/patch-Makefile @@ -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 diff --git a/security/proxytunnel/files/patch-ptstream.c b/security/proxytunnel/files/patch-ptstream.c new file mode 100644 index 000000000000..b0b49feb6b82 --- /dev/null +++ b/security/proxytunnel/files/patch-ptstream.c @@ -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); |