svn commit: r416819 - in head/security/ftimes: . files

[Bernard Spil]

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