Attachment 198019 Details for Bug 232166 – Fix build with OpenSSL 1.1

[patch] Fix build with OpenSSL 1.1

vde2.diff (text/plain), 3.45 KB, created by Jung-uk Kim on 2018-10-10 22:22:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2018-10-10 22:22:36 UTC

Size: 3.45 KB

patch

obsolete

>Index: net/vde2/Makefile
>===================================================================
>--- net/vde2/Makefile	(revision 481766)
>+++ net/vde2/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	vde2
> PORTVERSION=	2.3.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net
> MASTER_SITES=	SF/vde/${PORTNAME}/${PORTVERSION}
> 
>Index: net/vde2/files/patch-src_vde__cryptcab_cryptcab.c
>===================================================================
>--- net/vde2/files/patch-src_vde__cryptcab_cryptcab.c	(nonexistent)
>+++ net/vde2/files/patch-src_vde__cryptcab_cryptcab.c	(working copy)
>@@ -0,0 +1,92 @@
>+--- src/vde_cryptcab/cryptcab.c.orig	2011-11-23 16:41:17 UTC
>++++ src/vde_cryptcab/cryptcab.c
>+@@ -22,7 +22,7 @@ static void Usage(char *programname)
>+ 	exit(1);
>+ }
>+ 	
>+-static EVP_CIPHER_CTX ctx;
>++static EVP_CIPHER_CTX *ctx;
>+ static int ctx_initialized = 0;
>+ static int encryption_disabled = 0;
>+ static int nfd;
>+@@ -30,6 +30,10 @@ static unsigned long long mycounter=1;
>+ static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
>+ static int verbose = 0;
>+ 
>++#if OPENSSL_VERSION_NUMBER < 0x10100000
>++#define EVP_CIPHER_CTX_reset(x)	EVP_CIPHER_CTX_cleanup(x)
>++#endif
>++
>+ void vc_printlog(int priority, const char *format, ...)
>+ {
>+ 	va_list arg;
>+@@ -103,19 +107,21 @@ int data_encrypt(unsigned char *src, unsigned char *ds
>+ 	}
>+ 
>+ 	if (!ctx_initialized) {
>+-		EVP_CIPHER_CTX_init (&ctx);
>++		ctx = EVP_CIPHER_CTX_new ();
>++		if (!ctx)
>++			return -1;
>+ 		ctx_initialized = 1;
>+ 	}
>+ 	
>+-	EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
>+-	if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
>++	EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
>++	if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
>+ 	{
>+ 		fprintf (stderr,"error in encrypt update\n");
>+ 		olen = -1;
>+ 		goto cleanup;
>+ 	}
>+ 
>+-	if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
>++	if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
>+ 	{
>+ 		fprintf (stderr,"error in encrypt final\n");
>+ 		olen = -1;
>+@@ -124,7 +130,7 @@ int data_encrypt(unsigned char *src, unsigned char *ds
>+ 	olen += tlen;
>+ 
>+ cleanup:
>+-	EVP_CIPHER_CTX_cleanup(&ctx);	
>++	EVP_CIPHER_CTX_reset(ctx);
>+ 	return olen;
>+ }
>+ 
>+@@ -138,19 +144,21 @@ int data_decrypt(unsigned char *src, unsigned char *ds
>+ 	}
>+ 	
>+ 	if (!ctx_initialized) {
>+-		EVP_CIPHER_CTX_init (&ctx);
>++		ctx = EVP_CIPHER_CTX_new ();
>++		if (!ctx)
>++			return -1;
>+ 		ctx_initialized = 1;
>+ 	}
>+ 
>+-	EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
>+-	if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
>++	EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
>++	if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
>+ 	{
>+ 		fprintf (stderr,"error in decrypt update\n");
>+ 		olen = -1;
>+ 		goto cleanup;
>+ 	}
>+ 
>+-	if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
>++	if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
>+ 	{
>+ 		fprintf (stderr,"error in decrypt final\n");
>+ 		olen = -1;
>+@@ -159,7 +167,7 @@ int data_decrypt(unsigned char *src, unsigned char *ds
>+ 	olen += tlen;
>+ 
>+ cleanup:
>+-	EVP_CIPHER_CTX_cleanup(&ctx);	
>++	EVP_CIPHER_CTX_reset (ctx);
>+ 	return olen;
>+ }
>+ 
>
>Property changes on: net/vde2/files/patch-src_vde__cryptcab_cryptcab.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 232166: 198019