Attachment 206356 Details for Bug 239709 – flow-tools patch for openssl 1.1.x

[patch] flow-tools patch for openssl 1.1.x

_flow_tools.openssl11.patch (text/plain), 1.73 KB, created by Krzysztof on 2019-08-08 08:25:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2019-08-08 08:25:53 UTC

Size: 1.73 KB

patch

obsolete

>diff -ruN net-mgmt/flow-tools/Makefile net-mgmt/flow-tools.new/Makefile
>--- net-mgmt/flow-tools/Makefile	2019-03-21 22:55:31.000000000 +0100
>+++ net-mgmt/flow-tools.new/Makefile	2019-08-08 10:23:33.259740000 +0200
>@@ -4,6 +4,7 @@
> PORTNAME=	flow-tools
> PORTVERSION=	0.68.6
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	bofh@FreeBSD.org
>diff -ruN net-mgmt/flow-tools/files/patch-lib_ftxlate.c net-mgmt/flow-tools.new/files/patch-lib_ftxlate.c
>--- net-mgmt/flow-tools/files/patch-lib_ftxlate.c	1970-01-01 01:00:00.000000000 +0100
>+++ net-mgmt/flow-tools.new/files/patch-lib_ftxlate.c	2019-08-05 22:30:19.878034000 +0200
>@@ -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 */
>+

Actions: View | Diff

Attachments on bug 239709: 206356