CVS commit: pkgsrc/sysutils/burp

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Mar 29 01:02:12 UTC 2020

Modified Files:
        pkgsrc/sysutils/burp: distinfo
Added Files:
        pkgsrc/sysutils/burp/patches: patch-src_handy.c patch-src_msg.c

Log Message:
Adjust for OpenSSL 1.1


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/burp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/burp/patches/patch-src_handy.c \
    pkgsrc/sysutils/burp/patches/patch-src_msg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/burp/distinfo
diff -u pkgsrc/sysutils/burp/distinfo:1.4 pkgsrc/sysutils/burp/distinfo:1.5
--- pkgsrc/sysutils/burp/distinfo:1.4   Sat Dec 17 14:21:26 2016
+++ pkgsrc/sysutils/burp/distinfo       Sun Mar 29 01:02:12 2020
@@ -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) = 5e1a2e3c
 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

Added files:

Index: pkgsrc/sysutils/burp/patches/patch-src_handy.c
diff -u /dev/null pkgsrc/sysutils/burp/patches/patch-src_handy.c:1.1
--- /dev/null   Sun Mar 29 01:02:12 2020
+++ pkgsrc/sysutils/burp/patches/patch-src_handy.c      Sun Mar 29 01:02:12 2020
@@ -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)
Index: pkgsrc/sysutils/burp/patches/patch-src_msg.c
diff -u /dev/null pkgsrc/sysutils/burp/patches/patch-src_msg.c:1.1
--- /dev/null   Sun Mar 29 01:02:12 2020
+++ pkgsrc/sysutils/burp/patches/patch-src_msg.c        Sun Mar 29 01:02:12 2020
@@ -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);