svn commit: r511046 - in head/net-mgmt/flow-tools: . files

[Muhammad Moinur Rahman]

Author: bofh
Date: Tue Sep  3 21:53:47 2019
New Revision: 511046
URL: https://svnweb.freebsd.org/changeset/ports/511046

Log:
  net-mgmt/flow-tools: Fix build with OpenSSL 1.1.x
  
  PR:		239709
  Submitted by:	ports at bsdserwis.com

Added:
  head/net-mgmt/flow-tools/files/patch-lib_ftxlate.c   (contents, props changed)
Modified:
  head/net-mgmt/flow-tools/Makefile

Modified: head/net-mgmt/flow-tools/Makefile
==============================================================================
--- head/net-mgmt/flow-tools/Makefile	Tue Sep  3 21:35:08 2019	(r511045)
+++ head/net-mgmt/flow-tools/Makefile	Tue Sep  3 21:53:47 2019	(r511046)
@@ -4,6 +4,7 @@
 PORTNAME=	flow-tools
 PORTVERSION=	0.68.6
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	bofh at FreeBSD.org

Added: head/net-mgmt/flow-tools/files/patch-lib_ftxlate.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/flow-tools/files/patch-lib_ftxlate.c	Tue Sep  3 21:53:47 2019	(r511046)
@@ -0,0 +1,39 @@
+--- lib/ftxlate.c.orig	2019-03-21 19:39:03 UTC
++++ lib/ftxlate.c
+@@ -2040,21 +2040,21 @@ static int cryptopan_init(struct cryptopan *cp, unsign
+ 
+ 
+   /* init crypto */
+-  if (!(cp->cipher_ctx = (EVP_CIPHER_CTX*) malloc(sizeof(EVP_CIPHER_CTX)))) {
++  cp->cipher_ctx = EVP_CIPHER_CTX_new();
++  if (cp->cipher_ctx == NULL)
+     return -1;
+-  }
+ 
+-  EVP_CIPHER_CTX_init(cp->cipher_ctx);
+-
+   /* disable padding */
+   if (!(EVP_CIPHER_CTX_set_padding(cp->cipher_ctx, 0))) {
+     cryptopan_free(cp);
++    EVP_CIPHER_CTX_free(cp->cipher_ctx);
+     return -1;
+   }
+ 
+   /* init encryption */
+   if (!(EVP_EncryptInit(cp->cipher_ctx, EVP_aes_128_ecb(), key, NULL))) {
+     cryptopan_free(cp);
++    EVP_CIPHER_CTX_free(cp->cipher_ctx);
+     return -1;
+   }
+ 
+@@ -2062,8 +2062,10 @@ static int cryptopan_init(struct cryptopan *cp, unsign
+   i = 16;
+   if (!(EVP_EncryptUpdate(cp->cipher_ctx, cp->m_pad, &i, key+16, i))) {
+     cryptopan_free(cp);
++    EVP_CIPHER_CTX_free(cp->cipher_ctx);
+     return -1;
+   }
++  EVP_CIPHER_CTX_free(cp->cipher_ctx);
+ 
+ #endif /* HAVE_OPENSSL */
+