From owner-svn-ports-head@freebsd.org Sun Jun 12 18:28:20 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81BACAF1095; Sun, 12 Jun 2016 18:28:20 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 438D72EC1; Sun, 12 Jun 2016 18:28:20 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5CISJq2096825; Sun, 12 Jun 2016 18:28:19 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5CISJD4096823; Sun, 12 Jun 2016 18:28:19 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201606121828.u5CISJD4096823@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 12 Jun 2016 18:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416819 - in head/security/ftimes: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2016 18:28:20 -0000 Author: brnrd Date: Sun Jun 12 18:28:19 2016 New Revision: 416819 URL: https://svnweb.freebsd.org/changeset/ports/416819 Log: security/ftimes: Fix build without SSLv3 methods - Use SSLv23 methods and SSL_OP_NO_SSL3 PR: 203693 Sponsored by: BSDCan DevSummit Added: head/security/ftimes/files/patch-src__ssl.c (contents, props changed) Modified: head/security/ftimes/Makefile Modified: head/security/ftimes/Makefile ============================================================================== --- head/security/ftimes/Makefile Sun Jun 12 18:23:28 2016 (r416818) +++ head/security/ftimes/Makefile Sun Jun 12 18:28:19 2016 (r416819) @@ -3,7 +3,7 @@ PORTNAME= ftimes PORTVERSION= 3.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security sysutils MASTER_SITES= SF @@ -53,7 +53,7 @@ SHEBANG_FILES= \ ${WRKSRC}/tools/zipmap/zipmap OPTIONS_DEFINE= DBM_TOOLS DIG_TOOLS FILE_HOOKS HASHDIG_TOOLS MAP_TOOLS SSL XMAGIC -OPTIONS_DEFAULT= DBM_TOOLS DIG_TOOLS FILE_HOOKS HASHDIG_TOOLS MAP_TOOLS SSL XMAGIC +OPTIONS_DEFAULT= DBM_TOOLS DIG_TOOLS FILE_HOOKS HASHDIG_TOOLS MAP_TOOLS XMAGIC DBM_TOOLS_DESC= Install DBM tools DIG_TOOLS_DESC= Install dig tools FILE_HOOKS_DESC= Include file hooks support Added: head/security/ftimes/files/patch-src__ssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ftimes/files/patch-src__ssl.c Sun Jun 12 18:28:19 2016 (r416819) @@ -0,0 +1,46 @@ +diff -urN ftimes-3.11.0.old/src/ssl.c ftimes-3.11.0.new/src/ssl.c +--- src/ssl.c 2014-07-18 02:40:44.000000000 -0400 ++++ src/ssl.c 2016-01-13 17:18:29.073028573 -0500 +@@ -251,7 +251,7 @@ + * + ********************************************************************* + */ +- psProperties->psslCTX = SSL_CTX_new(SSLv3_client_method()); ++ psProperties->psslCTX = SSL_CTX_new(SSLv23_client_method()); + if (psProperties->psslCTX == NULL) + { + ERR_error_string(ERR_get_error(), acLocalError); +@@ -262,6 +262,33 @@ + /*- + ********************************************************************* + * ++ * Disable protocol versions that are no longer safe to use. ++ * ++ ********************************************************************* ++ */ ++ SSL_CTX_set_options ++ ( ++ psProperties->psslCTX, ++ ( ++ 0 ++#ifdef SSL_OP_NO_SSLv2 ++ | SSL_OP_NO_SSLv2 ++#endif ++#ifdef SSL_OP_NO_SSLv3 ++ | SSL_OP_NO_SSLv3 ++#endif ++#ifdef SSL_OP_NO_TLSv1 ++ | SSL_OP_NO_TLSv1 ++#endif ++#ifdef SSL_OP_NO_TLSv1_1 ++ | SSL_OP_NO_TLSv1_1 ++#endif ++ ) ++ ); ++ ++ /*- ++ ********************************************************************* ++ * + * Setup SSL certificate verification. Load the bundled certificate + * authorities file. A common name (CN) and a positive chain length + * must be specified to activate PEER verification. If you want to