Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1583500202137100"
MIME-Version: 1.0
Date: Fri, 6 Mar 2020 13:10:02 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/net/unworkable
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200306131002.EB6B7FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1583500202137100
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Fri Mar  6 13:10:02 UTC 2020

Modified Files:
	pkgsrc/net/unworkable: distinfo
Added Files:
	pkgsrc/net/unworkable/patches: patch-network.c

Log Message:
unworkable: Fix build with OpenSSL 1.1


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/unworkable/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unworkable/patches/patch-network.c

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


--_----------=_1583500202137100
Content-Disposition: inline
Content-Length: 2286
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/unworkable/distinfo
diff -u pkgsrc/net/unworkable/distinfo:1.4 pkgsrc/net/unworkable/distinfo:1.5
--- pkgsrc/net/unworkable/distinfo:1.4	Wed Nov  4 00:35:42 2015
+++ pkgsrc/net/unworkable/distinfo	Fri Mar  6 13:10:02 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 00:35:42 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/03/06 13:10:02 nia Exp $
 
 SHA1 (unworkable-0.53.tar.gz) = 546dee5844fcbac42fe7ae51bc5344537e9b769d
 RMD160 (unworkable-0.53.tar.gz) = a361bff35856f255be85256f9d74c3dfb11fb60e
 SHA512 (unworkable-0.53.tar.gz) = e7f0ee47239c06f466434e4cfcdf4db9cce0ca9ede3d03bf5944b596c1506f9682d517963d9d69012f5512662396b19c19db854869240754f8fe4c5bb5e9b382
 Size (unworkable-0.53.tar.gz) = 72053 bytes
 SHA1 (patch-BSDMakefile) = 722124fc797d751cb4402132a1f662553ddce0ec
+SHA1 (patch-network.c) = 4f80be58fddedec2ff17c81622139f1e13f48e98

Added files:

Index: pkgsrc/net/unworkable/patches/patch-network.c
diff -u /dev/null pkgsrc/net/unworkable/patches/patch-network.c:1.1
--- /dev/null	Fri Mar  6 13:10:02 2020
+++ pkgsrc/net/unworkable/patches/patch-network.c	Fri Mar  6 13:10:02 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-network.c,v 1.1 2020/03/06 13:10:02 nia Exp $
+
+Use DH_set0_pqg() for OpenSSL 1.1 compatibility
+
+https://github.com/niallo/Unworkable/commit/79d717826532850772fb49e0b22ce89087636a40.patch
+
+--- network.c.orig	2008-10-06 17:04:18.000000000 +0000
++++ network.c
+@@ -1282,13 +1282,21 @@ DH *
+ network_crypto_dh()
+ {
+ 	DH *dhp;
++	BIGNUM *p, *g;
+ 
+ 	if ((dhp = DH_new()) == NULL)
+ 		errx(1, "network_crypto_pubkey: DH_new() failure");
+-	if ((dhp->p = BN_bin2bn(mse_P, CRYPTO_INT_LEN, NULL)) == NULL)
++	if ((p = BN_bin2bn(mse_P, CRYPTO_INT_LEN, NULL)) == NULL)
+ 		errx(1, "network_crypto_pubkey: BN_bin2bn(P) failure");
+-	if ((dhp->g = BN_bin2bn(mse_G, CRYPTO_INT_LEN, NULL)) == NULL)
++	if ((g = BN_bin2bn(mse_G, CRYPTO_INT_LEN, NULL)) == NULL)
+ 		errx(1, "network_crypto_pubkey: BN_bin2bn(G) failure");
++#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000)
++	if (DH_set0_pqg(dhp, p, NULL, g) != 1)
++		errx(1, "DH_set0_pgq failed");
++#else
++	dhp->p = p;
++	dhp->g = g;
++#endif
+ 	if (DH_generate_key(dhp) == 0)
+ 		errx(1, "network_crypto_pubkey: DH_generate_key() failure");
+ 


--_----------=_1583500202137100--