From owner-svn-ports-all@freebsd.org Tue Sep 3 21:53:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 50FD1D9713; Tue, 3 Sep 2019 21:53:48 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46NLLh0pc2z4Qxc; Tue, 3 Sep 2019 21:53:48 +0000 (UTC) (envelope-from bofh@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F316D981C; Tue, 3 Sep 2019 21:53:47 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x83LrlLg049497; Tue, 3 Sep 2019 21:53:47 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x83LrldG049496; Tue, 3 Sep 2019 21:53:47 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201909032153.x83LrldG049496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Tue, 3 Sep 2019 21:53:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511046 - in head/net-mgmt/flow-tools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: in head/net-mgmt/flow-tools: . files X-SVN-Commit-Revision: 511046 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Sep 2019 21:53:48 -0000 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@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@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 */ +