Attachment 197992 Details for Bug 232144 – Fix openssl

[patch] Fix openssl

ipdecap (text/plain), 3.51 KB, created by Nathan on 2018-10-10 02:45:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-10-10 02:45:08 UTC

Size: 3.51 KB

patch

obsolete

>net/ipdecap: Fix OpenSSL build
>
>PR:		231931
>Submitted by:	Nathan <ndowens@yahoo.com>
>
>Index: net/ipdecap/Makefile
>===================================================================
>--- net/ipdecap/Makefile	(revision 481499)
>+++ net/ipdecap/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> PORTNAME=	ipdecap
> PORTVERSION=	0.7.1
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> 
> MAINTAINER=	loic-freebsd@loicp.eu
>Index: net/ipdecap/files/patch-configure.ac
>===================================================================
>--- net/ipdecap/files/patch-configure.ac	(nonexistent)
>+++ net/ipdecap/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2018-10-10 02:16:26 UTC
>++++ configure.ac
>+@@ -23,7 +23,7 @@ esac
>+ # Checks for libraries.
>+ AC_CHECK_LIB(pcap, pcap_offline_filter, [],
>+              AC_MSG_ERROR(pcap library not found ))
>+-AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_init, [],
>++AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, [],
>+              AC_MSG_ERROR(OpenSSL library not found))
>+ 
>+ # Checks for header files.
>
>Property changes on: net/ipdecap/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/ipdecap/files/patch-src_esp.h
>===================================================================
>--- net/ipdecap/files/patch-src_esp.h	(nonexistent)
>+++ net/ipdecap/files/patch-src_esp.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/esp.h.orig	2018-10-10 02:21:27 UTC
>++++ src/esp.h
>+@@ -47,7 +47,7 @@ typedef struct auth_method_t {
>+ typedef struct llflow_t {
>+   address_t addr_src;
>+   address_t addr_dst;
>+-  EVP_CIPHER_CTX ctx;
>++  EVP_CIPHER_CTX *ctx;
>+   unsigned char *key;
>+   u_int32_t spi;
>+   char *crypt_name;
>
>Property changes on: net/ipdecap/files/patch-src_esp.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/ipdecap/files/patch-src_ipdecap.c
>===================================================================
>--- net/ipdecap/files/patch-src_ipdecap.c	(nonexistent)
>+++ net/ipdecap/files/patch-src_ipdecap.c	(working copy)
>@@ -0,0 +1,22 @@
>+--- src/ipdecap.c.orig	2018-10-10 02:20:40 UTC
>++++ src/ipdecap.c
>+@@ -356,8 +356,8 @@ int add_flow(char *ip_src, char *ip_dst, char *crypt_n
>+   flow->auth_name = strdup(auth_name);
>+   flow->key = dec_key;
>+ 
>+-  EVP_CIPHER_CTX ctx;
>+-  EVP_CIPHER_CTX_init(&ctx);
>++  EVP_CIPHER_CTX *ctx;
>++  EVP_CIPHER_CTX_init(ctx);
>+   flow->ctx = ctx;
>+ 
>+   // Adding to linked list
>+@@ -743,7 +743,7 @@ void process_esp_packet(u_char const *payload, const i
>+   char ip_src[INET_ADDRSTRLEN+1];
>+   char ip_dst[INET_ADDRSTRLEN+1];
>+   llflow_t *flow = NULL;
>+-  EVP_CIPHER_CTX ctx;
>++  EVP_CIPHER_CTX *ctx;
>+   const EVP_CIPHER *cipher = NULL;
>+   int packet_size, rc, len, remaining;
>+   int ivlen;
>
>Property changes on: net/ipdecap/files/patch-src_ipdecap.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 232144: 197992 | 197993 | 197994 | 197995