[packages/vde2] - openssl-1.1 patch from arch linux - release 5

[adamg]

commit d1657b48699c0b5cc2e15a0d3959e22068ca950c
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Wed Sep 26 15:08:04 2018 +0200

    - openssl-1.1 patch from arch linux
    - release 5

 vde2-openssl-1.1.patch | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
 vde2.spec              |  6 ++--
 2 files changed, 98 insertions(+), 2 deletions(-)
---
diff --git a/vde2.spec b/vde2.spec
index 345534d..b808bbf 100644
--- a/vde2.spec
+++ b/vde2.spec
@@ -2,13 +2,14 @@ Summary:	VDE2: Virtual Distributed Ethernet
 Summary(pl.UTF-8):	VDE2: wirtualny rozproszony ethernet
 Name:		vde2
 Version:	2.3.2
-Release:	4
+Release:	5
 License:	LGPL v2.1+ (libvdeplug), BSD (slirpvde), GPL v2+ (the rest)
 Group:		Networking/Utilities
 Source0:	http://downloads.sourceforge.net/vde/%{name}-%{version}.tar.bz2
 # Source0-md5:	46fbc5f97f03dc517aa3b2c9d9ea6628
 Patch0:		%{name}-pathmax.patch
 Patch1:		%{name}-format.patch
+Patch2:		%{name}-openssl-1.1.patch
 URL:		http://sourceforge.net/projects/vde/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -87,6 +88,7 @@ Pythonowy interfejs do VDE2.
 %setup -q 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -156,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vdeterm
 %attr(755,root,root) %{_bindir}/wirefilter
 %attr(755,root,root) %{_sbindir}/vde_tunctl
-%attr(755,root,root) %{_libdir}/vdetap
+%attr(755,root,root) %{_libexecdir}/vdetap
 %dir %{_libdir}/vde2
 %attr(755,root,root) %{_libdir}/vde2/libvdetap.so
 %dir %{_libdir}/vde2/vde_l3
diff --git a/vde2-openssl-1.1.patch b/vde2-openssl-1.1.patch
new file mode 100644
index 0000000..82e121a
--- /dev/null
+++ b/vde2-openssl-1.1.patch
@@ -0,0 +1,94 @@
+https://aur.archlinux.org/cgit/aur.git/plain/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=vde2-static
+
+--- a/src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
++++ b/src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
+@@ -22,7 +22,7 @@
+ 	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 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 @@
+ 	}
+ 
+ 	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 @@
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++	EVP_CIPHER_CTX_reset(ctx);
+ 	return olen;
+ }
+ 
+@@ -138,19 +144,21 @@
+ 	}
+ 	
+ 	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 @@
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++	EVP_CIPHER_CTX_reset (ctx);
+ 	return olen;
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vde2.git/commitdiff/d1657b48699c0b5cc2e15a0d3959e22068ca950c