svn commit: r487046 - branches/2018Q4/net/vde2/files

[Roman Bogorodskiy]

Author: novel
Date: Sun Dec  9 13:24:29 2018
New Revision: 487046
URL: https://svnweb.freebsd.org/changeset/ports/487046

Log:
  MFH: r483811
  
  Fix the build with OpenSSL 1.1.1
  
  Approved by:	ports-secteam (miwi)

Added:
  branches/2018Q4/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c
     - copied unchanged from r483811, head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c
Modified:
Directory Properties:
  branches/2018Q4/   (props changed)

Copied: branches/2018Q4/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c (from r483811, head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q4/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c	Sun Dec  9 13:24:29 2018	(r487046, copy of r483811, head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c)
@@ -0,0 +1,110 @@
+--- src/vde_cryptcab/cryptcab.c.orig	2011-11-23 16:41:17 UTC
++++ src/vde_cryptcab/cryptcab.c
+@@ -22,7 +22,11 @@ static void Usage(char *programname)
+ 	exit(1);
+ }
+ 	
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++static EVP_CIPHER_CTX *ctx;
++#else
+ static EVP_CIPHER_CTX ctx;
++#endif
+ static int ctx_initialized = 0;
+ static int encryption_disabled = 0;
+ static int nfd;
+@@ -103,19 +107,33 @@ int data_encrypt(unsigned char *src, unsigned char *ds
+ 	}
+ 
+ 	if (!ctx_initialized) {
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++		ctx = EVP_CIPHER_CTX_new();
++		EVP_CIPHER_CTX_init (ctx);
++#else
+ 		EVP_CIPHER_CTX_init (&ctx);
++#endif
+ 		ctx_initialized = 1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++	EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++	if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
++#else
+ 	EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+ 	if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
++#endif
+ 	{
+ 		fprintf (stderr,"error in encrypt update\n");
+ 		olen = -1;
+ 		goto cleanup;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++	if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
++#else
+ 	if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
++#endif
+ 	{
+ 		fprintf (stderr,"error in encrypt final\n");
+ 		olen = -1;
+@@ -124,7 +142,12 @@ int data_encrypt(unsigned char *src, unsigned char *ds
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++	EVP_CIPHER_CTX_cleanup(ctx);	
++	EVP_CIPHER_CTX_free(ctx);
++#else
++	EVP_CIPHER_CTX_cleanup(&ctx);
++#endif
+ 	return olen;
+ }
+ 
+@@ -138,19 +161,33 @@ int data_decrypt(unsigned char *src, unsigned char *ds
+ 	}
+ 	
+ 	if (!ctx_initialized) {
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++		ctx = EVP_CIPHER_CTX_new();
++		EVP_CIPHER_CTX_init(ctx);
++#else
+ 		EVP_CIPHER_CTX_init (&ctx);
++#endif
+ 		ctx_initialized = 1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++	EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++	if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
++#else
+ 	EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+ 	if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
++#endif
+ 	{
+ 		fprintf (stderr,"error in decrypt update\n");
+ 		olen = -1;
+ 		goto cleanup;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++	if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
++#else
+ 	if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
++#endif
+ 	{
+ 		fprintf (stderr,"error in decrypt final\n");
+ 		olen = -1;
+@@ -159,7 +196,12 @@ int data_decrypt(unsigned char *src, unsigned char *ds
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++	EVP_CIPHER_CTX_cleanup(ctx);	
++	EVP_CIPHER_CTX_free(ctx);
++#else
++	EVP_CIPHER_CTX_cleanup(&ctx);
++#endif
+ 	return olen;
+ }
+