Adjust for OpenSSL 1.1

3 files changed, 71 insertions, 1 deletions

diff --git a/sysutils/burp/distinfo b/sysutils/burp/distinfo
index 9dfceb63197..faebfba7fac 100644
--- a/sysutils/burp/distinfo
+++ b/sysutils/burp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2016/12/17 14:21:26 joerg Exp $
+$NetBSD: distinfo,v 1.5 2020/03/29 01:02:12 joerg Exp $
 
 SHA1 (burp-1.4.40.tar.bz2) = b06dbe9d1440b9e7915d35ad0c23b9d120fec10e
 RMD160 (burp-1.4.40.tar.bz2) = 3ba2a60605562bbff7bacc600ee511c3ce020995
@@ -15,4 +15,6 @@ SHA1 (patch-manpages_bedup.8) = 5e1a2e3c42118d98c9b66a0bc5cafb2eb9c09f11
 SHA1 (patch-manpages_burp.8) = 81879e11cf917c36467513aeb440d0ab2dbad142
 SHA1 (patch-manpages_burp__ca.8) = f9ac9ffe1f67df040c939bb1afcf614869695034
 SHA1 (patch-src-xattr.c) = 105aa2c67fde7007b525d6ff93e0d9ce67ee2f4f
+SHA1 (patch-src_handy.c) = 6d3fe34734c6392a28a59ed1491688d2f12e0a66
+SHA1 (patch-src_msg.c) = 2a8f542f801f2d4ace5d9335d3abb7490cba82d7
 SHA1 (patch-src_server.c) = 3dc518b24bd866d0ff7cc9c834d4fde810cacb74
diff --git a/sysutils/burp/patches/patch-src_handy.c b/sysutils/burp/patches/patch-src_handy.c
new file mode 100644
index 00000000000..992c73866e1
--- /dev/null
+++ b/sysutils/burp/patches/patch-src_handy.c
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_handy.c,v 1.1 2020/03/29 01:02:12 joerg Exp $
+
+--- src/handy.c.orig	2020-03-29 00:41:21.500961186 +0000
++++ src/handy.c
+@@ -279,18 +279,17 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, c
+ 	// compilation warnings on Macs.
+ 	unsigned char enc_iv[]={'[', 'l', 'k', 'd', '.', '$', 'G', 0xa3, '\0'};
+ 
+-	if(!(ctx=(EVP_CIPHER_CTX *)malloc(sizeof(EVP_CIPHER_CTX))))
++	if(!(ctx=EVP_CIPHER_CTX_new()))
+ 	{
+ 		log_out_of_memory(__FUNCTION__);
+ 		return NULL;
+ 	}
+-        memset(ctx, 0, sizeof(EVP_CIPHER_CTX));
+ 	// Don't set key or IV because we will modify the parameters.
+ 	EVP_CIPHER_CTX_init(ctx);
+ 	if(!(EVP_CipherInit_ex(ctx, EVP_bf_cbc(), NULL, NULL, NULL, encrypt)))
+ 	{
+ 		logp("EVP_CipherInit_ex failed\n");
+-		free(ctx);
++		EVP_CIPHER_CTX_free(ctx);
+ 		return NULL;
+ 	}
+ 	EVP_CIPHER_CTX_set_key_length(ctx, strlen(encryption_password));
+@@ -301,7 +300,7 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, c
+ 		enc_iv, encrypt))
+ 	{
+ 		logp("Second EVP_CipherInit_ex failed\n");
+-		free(ctx);
++		EVP_CIPHER_CTX_free(ctx);
+ 		return NULL;
+ 	}
+ 	return ctx;
+@@ -591,8 +590,7 @@ cleanup:
+ 
+ 	if(enc_ctx)
+ 	{
+-		EVP_CIPHER_CTX_cleanup(enc_ctx);
+-		free(enc_ctx);
++		EVP_CIPHER_CTX_free(enc_ctx);
+ 	}
+ 
+ 	if(!ret)
diff --git a/sysutils/burp/patches/patch-src_msg.c b/sysutils/burp/patches/patch-src_msg.c
new file mode 100644
index 00000000000..1a7001a086b
--- /dev/null
+++ b/sysutils/burp/patches/patch-src_msg.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_msg.c,v 1.1 2020/03/29 01:02:12 joerg Exp $
+
+--- src/msg.c.orig	2020-03-29 00:42:58.268427372 +0000
++++ src/msg.c
+@@ -235,8 +235,7 @@ int transfer_gzfile_in(struct sbuf *sb, 
+ 		{
+ 			if(enc_ctx)
+ 			{
+-				EVP_CIPHER_CTX_cleanup(enc_ctx);
+-				free(enc_ctx);
++				EVP_CIPHER_CTX_free(enc_ctx);
+ 			}
+ 			inflateEnd(&zstrm);
+ 			return -1;
+@@ -369,8 +368,7 @@ int transfer_gzfile_in(struct sbuf *sb, 
+ 	inflateEnd(&zstrm);
+ 	if(enc_ctx)
+ 	{
+-		EVP_CIPHER_CTX_cleanup(enc_ctx);
+-		free(enc_ctx);
++		EVP_CIPHER_CTX_free(enc_ctx);
+ 	}
+ 
+ 	if(ret) logp("transfer file returning: %d\n", ret);