svn commit: r546708 - in head/net-im/climm: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Aug 28 06:53:53 2020
New Revision: 546708
URL: https://svnweb.freebsd.org/changeset/ports/546708

Log:
  Allow to build against contemporary versions of OpenSSL.

Added:
  head/net-im/climm/files/
  head/net-im/climm/files/patch-src_io_io__openssl.c   (contents, props changed)
Modified:
  head/net-im/climm/Makefile

Modified: head/net-im/climm/Makefile
==============================================================================
--- head/net-im/climm/Makefile	Fri Aug 28 06:09:24 2020	(r546707)
+++ head/net-im/climm/Makefile	Fri Aug 28 06:53:53 2020	(r546708)
@@ -25,11 +25,6 @@ XMPP_DESC=	Enable XMPP Jabber support
 
 .include <bsd.port.options.mk>
 
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	incomplete definition of type 'struct dh_st'
-BROKEN_FreeBSD_13=	incomplete definition of type 'struct dh_st'
-.endif
-
 .if ${PORT_OPTIONS:MOTR}
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-otr

Added: head/net-im/climm/files/patch-src_io_io__openssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/climm/files/patch-src_io_io__openssl.c	Fri Aug 28 06:53:53 2020	(r546708)
@@ -0,0 +1,25 @@
+--- src/io/io_openssl.c.orig	2010-03-20 14:13:15 UTC
++++ src/io/io_openssl.c
+@@ -96,10 +96,22 @@ static DH *get_dh512()
+     DH *dh;
+ 
+     if ((dh=DH_new()) == NULL) return(NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100005L
++    BIGNUM *p, *g;
++
++    p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
++    g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
++    if (p == NULL || g == NULL) {
++        BN_free(p); BN_free(g);
++        DH_free(dh); return(NULL);
++    } else
++        DH_set0_pqg(dh, p, NULL, g);
++#else
+     dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
+     dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
+     if ((dh->p == NULL) || (dh->g == NULL))
+             { DH_free(dh); return(NULL); }
++#endif
+     return(dh);
+ }
+ /* END AUTOGENERATED */