Attachment #208629 for bug #241445




# $FreeBSD$

PORTNAME=	kronosnet
PORTVERSION=	1.13
PORTREVISION=	5
CATEGORIES=	devel
MASTER_SITES=	https://kronosnet.org/releases/


		liblz4.so:archivers/liblz4 \
		libnspr4.so:devel/nspr \
		libnss3.so:security/nss \
		libqb.so.0:devel/libqb \
		libzstd.so:archivers/zstd

USES=		autoreconf gmake libtool pkgconfig ssl
USE_BINUTILS=	yes
USE_GCC=	yes
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
LDFLAGS+=	-B${LOCALBASE}/bin

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

OPTIONS_DEFAULT=MANPAGES
OPTIONS_SUB=	yes

MANPAGES_BUILD_DEPENDS=		doxygen:devel/doxygen
MANPAGES_CONFIGURE_ENABLE=	man

.include <bsd.port.options.mk>

.if ${SSL_DEFAULT} == base
CONFIGURE_ENV=	openssl_CFLAGS="-I/usr/include" openssl_LIBS="-lcrypto"
BROKEN_FreeBSD_13=	error: storage size of 'ctx' isn't known
EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-base-configure.ac
CONFIGURE_ENV=	openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto
.elif ${SSL_DEFAULT} == libressl
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ssl-libressl-configure.ac
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/kronosnet/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524484064	1	TIMESTAMP = 1572171668
2	SHA256 (kronosnet-1.3.tar.gz) = c24d93dbb25561e684cecf4d7afd58c98a7f883ba9ad812793e268ad857c3a62	2	SHA256 (kronosnet-1.13.tar.gz) = 91685584655c2e0f7927b1d1a6001e26253244f68b997dcb2cf8b06a428f4e65
3	SIZE (kronosnet-1.3.tar.gz) = 701399	3	SIZE (kronosnet-1.13.tar.gz) = 753915

Lines 16-26 Link Here

(-)devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac (-8 lines)
16		16
17	AC_ARG_ENABLE([compress-all],	17	AC_ARG_ENABLE([compress-all],
18	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,	18	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
19	@@ -414,7 +411,6 @@ WARNLIST="
20	pointer-arith
21	write-strings
22	cast-align
23	- bad-function-cast
24	missing-format-attribute
25	float-equal
26	format=2




--- Makefile.am.orig	2018-02-26 13:46:34 UTC
+++ Makefile.am
@@ -44,11 +44,6 @@ dist_doc_DATA		= \
 			  README.licence \
 			  README
 
-all-local: $(SPEC)
-
-clean-local:
-	rm -f $(SPEC)
-
 distclean-local:
 	rm -f $(PACKAGE_NAME)-*.tar.* $(PACKAGE_NAME)-*.sha256* tag-*
 




--- configure.ac.orig	2019-10-27 10:22:37 UTC
+++ configure.ac
@@ -122,19 +122,13 @@ AC_ARG_ENABLE([crypto-all],
 	[ enable_crypto_all="yes" ])
 
 KNET_OPTION_DEFINES([nss],[crypto],[PKG_CHECK_MODULES([nss], [nss])])
-KNET_OPTION_DEFINES([openssl],[crypto],[
-	PKG_CHECK_MODULES([openssl],[libcrypto < 1.1],
-			  [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])],
-			  [PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
-					     [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
-])
+KNET_OPTION_DEFINES([openssl],[crypto],[PKG_CHECK_MODULES([openssl],[libcrypto])])
 
 AC_ARG_ENABLE([compress-all],
 	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
 	[ enable_compress_all="yes" ])
 
 KNET_OPTION_DEFINES([zstd],[compress],[PKG_CHECK_MODULES([libzstd], [libzstd])])
-
 KNET_OPTION_DEFINES([zlib],[compress],[PKG_CHECK_MODULES([zlib], [zlib])])
 KNET_OPTION_DEFINES([lz4],[compress],[PKG_CHECK_MODULES([liblz4], [liblz4])])
 KNET_OPTION_DEFINES([lzo2],[compress],[




From 97924ac12d8da26b61d3bc3ab90fbd86b0b58e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Thu, 24 Jan 2019 14:54:24 +0100
Subject: [PATCH] [common] fix not reporting a true dlinfo error cause
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was automatically caught with GCC 9
("'%s' directive argument is null").

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
--- libknet/common.c.orig	2018-02-25 04:32:12 UTC
+++ libknet/common.c
@@ -82,6 +82,7 @@ static void *open_lib(knet_handle_t knet_h, const char
 		/*
 		 * should we dlclose and return error?
 		 */
+		error = dlerror();
 		log_warn(knet_h, KNET_SUB_COMMON, "unable to dlinfo %s: %s",
 			 libname, error);
 	} else {




--- libknet/crypto_openssl.c.orig	2019-10-27 10:24:59 UTC
+++ libknet/crypto_openssl.c
@@ -50,7 +50,7 @@ static int openssl_is_init = 0;
  * crypt/decrypt functions openssl1.0
  */
 
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
 static int encrypt_openssl(
 	knet_handle_t knet_h,
 	const struct iovec *iov,
@@ -150,9 +150,7 @@ out:
 	EVP_CIPHER_CTX_cleanup(&ctx);
 	return err;
 }
-#endif
-
-#ifdef BUILDCRYPTOOPENSSL11
+#else /* (OPENSSL_VERSION_NUMBER < 0x10100000L) */
 static int encrypt_openssl(
 	knet_handle_t knet_h,
 	const struct iovec *iov,
@@ -386,7 +384,7 @@ static int opensslcrypto_authenticate_an
 	return 0;
 }
 
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
 static pthread_mutex_t *openssl_internal_lock;
 
 static void openssl_internal_locking_callback(int mode, int type, char *file, int line)
@@ -476,7 +474,7 @@ static void opensslcrypto_fini(
 		crypto_instance->model_instance = NULL;
 	}
 
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
 	ERR_free_strings();
 #endif
 
@@ -497,7 +495,7 @@ static int opensslcrypto_init(
 		  knet_handle_crypto_cfg->crypto_hash_type);
 
 	if (!openssl_is_init) {
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
 		ERR_load_crypto_strings();
 		OPENSSL_add_all_algorithms_noconf();
 		if (openssl_internal_lock_setup() < 0) {
@@ -505,8 +503,7 @@ static int opensslcrypto_init(
 			errno = EAGAIN;
 			return -1;
 		}
-#endif
-#ifdef BUILDCRYPTOOPENSSL11
+#else
 		if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
 					 | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)) {
 			log_err(knet_h, KNET_SUB_OPENSSLCRYPTO, "Unable to init openssl");

Lines 1-4 Link Here

(-)devel/kronosnet/pkg-plist (-1 / +32 lines)
1	include/libknet.h	1	include/libknet.h
		2	include/libnozzle.h
2	lib/kronosnet/compress_bzip2.a	3	lib/kronosnet/compress_bzip2.a
3	lib/kronosnet/compress_bzip2.so	4	lib/kronosnet/compress_bzip2.so
4	lib/kronosnet/compress_lz4.a	5	lib/kronosnet/compress_lz4.a
Lines 11-16 Link Here
11	lib/kronosnet/compress_lzo2.so	12	lib/kronosnet/compress_lzo2.so
12	lib/kronosnet/compress_zlib.a	13	lib/kronosnet/compress_zlib.a
13	lib/kronosnet/compress_zlib.so	14	lib/kronosnet/compress_zlib.so
		15	lib/kronosnet/compress_zstd.a
		16	lib/kronosnet/compress_zstd.so
14	lib/kronosnet/crypto_openssl.a	17	lib/kronosnet/crypto_openssl.a
15	lib/kronosnet/crypto_openssl.so	18	lib/kronosnet/crypto_openssl.so
16	lib/kronosnet/crypto_nss.a	19	lib/kronosnet/crypto_nss.a
Lines 18-25 Link Here
18	lib/libknet.a	21	lib/libknet.a
19	lib/libknet.so	22	lib/libknet.so
20	lib/libknet.so.1	23	lib/libknet.so.1
21	lib/libknet.so.1.1.0	24	lib/libknet.so.1.3.0
		25	lib/libnozzle.a
		26	lib/libnozzle.so
		27	lib/libnozzle.so.1
		28	lib/libnozzle.so.1.0.0
22	libdata/pkgconfig/libknet.pc	29	libdata/pkgconfig/libknet.pc
		30	libdata/pkgconfig/libnozzle.pc
23	%%MANPAGES%%man/man3/knet_addrtostr.3.gz	31	%%MANPAGES%%man/man3/knet_addrtostr.3.gz
24	%%MANPAGES%%man/man3/knet_get_compress_list.3.gz	32	%%MANPAGES%%man/man3/knet_get_compress_list.3.gz
25	%%MANPAGES%%man/man3/knet_get_crypto_list.3.gz	33	%%MANPAGES%%man/man3/knet_get_crypto_list.3.gz
Lines 31-36 Link Here
31	%%MANPAGES%%man/man3/knet_handle_compress.3.gz	39	%%MANPAGES%%man/man3/knet_handle_compress.3.gz
32	%%MANPAGES%%man/man3/knet_handle_crypto.3.gz	40	%%MANPAGES%%man/man3/knet_handle_crypto.3.gz
33	%%MANPAGES%%man/man3/knet_handle_enable_filter.3.gz	41	%%MANPAGES%%man/man3/knet_handle_enable_filter.3.gz
		42	%%MANPAGES%%man/man3/knet_handle_enable_access_lists.3.gz
34	%%MANPAGES%%man/man3/knet_handle_enable_pmtud_notify.3.gz	43	%%MANPAGES%%man/man3/knet_handle_enable_pmtud_notify.3.gz
35	%%MANPAGES%%man/man3/knet_handle_enable_sock_notify.3.gz	44	%%MANPAGES%%man/man3/knet_handle_enable_sock_notify.3.gz
36	%%MANPAGES%%man/man3/knet_handle_free.3.gz	45	%%MANPAGES%%man/man3/knet_handle_free.3.gz
Lines 42-47 Link Here
42	%%MANPAGES%%man/man3/knet_handle_new_ex.3.gz	51	%%MANPAGES%%man/man3/knet_handle_new_ex.3.gz
43	%%MANPAGES%%man/man3/knet_handle_pmtud_get.3.gz	52	%%MANPAGES%%man/man3/knet_handle_pmtud_get.3.gz
44	%%MANPAGES%%man/man3/knet_handle_pmtud_getfreq.3.gz	53	%%MANPAGES%%man/man3/knet_handle_pmtud_getfreq.3.gz
		54	%%MANPAGES%%man/man3/knet_handle_pmtud_set.3.gz
45	%%MANPAGES%%man/man3/knet_handle_pmtud_setfreq.3.gz	55	%%MANPAGES%%man/man3/knet_handle_pmtud_setfreq.3.gz
46	%%MANPAGES%%man/man3/knet_handle_remove_datafd.3.gz	56	%%MANPAGES%%man/man3/knet_handle_remove_datafd.3.gz
47	%%MANPAGES%%man/man3/knet_handle_set_transport_reconnect_interval.3.gz	57	%%MANPAGES%%man/man3/knet_handle_set_transport_reconnect_interval.3.gz
Lines 56-61 Link Here
56	%%MANPAGES%%man/man3/knet_host_remove.3.gz	66	%%MANPAGES%%man/man3/knet_host_remove.3.gz
57	%%MANPAGES%%man/man3/knet_host_set_name.3.gz	67	%%MANPAGES%%man/man3/knet_host_set_name.3.gz
58	%%MANPAGES%%man/man3/knet_host_set_policy.3.gz	68	%%MANPAGES%%man/man3/knet_host_set_policy.3.gz
		69	%%MANPAGES%%man/man3/knet_link_add_acl.3.gz
		70	%%MANPAGES%%man/man3/knet_link_clear_acl.3.gz
59	%%MANPAGES%%man/man3/knet_link_clear_config.3.gz	71	%%MANPAGES%%man/man3/knet_link_clear_config.3.gz
60	%%MANPAGES%%man/man3/knet_link_get_config.3.gz	72	%%MANPAGES%%man/man3/knet_link_get_config.3.gz
61	%%MANPAGES%%man/man3/knet_link_get_enable.3.gz	73	%%MANPAGES%%man/man3/knet_link_get_enable.3.gz
Lines 66-71 Link Here
66	%%MANPAGES%%man/man3/knet_link_get_status.3.gz	78	%%MANPAGES%%man/man3/knet_link_get_status.3.gz
67	%%MANPAGES%%man/man3/knet_link_set_config.3.gz	79	%%MANPAGES%%man/man3/knet_link_set_config.3.gz
68	%%MANPAGES%%man/man3/knet_link_set_enable.3.gz	80	%%MANPAGES%%man/man3/knet_link_set_enable.3.gz
		81	%%MANPAGES%%man/man3/knet_link_insert_acl.3.gz
		82	%%MANPAGES%%man/man3/knet_link_rm_acl.3.gz
69	%%MANPAGES%%man/man3/knet_link_set_ping_timers.3.gz	83	%%MANPAGES%%man/man3/knet_link_set_ping_timers.3.gz
70	%%MANPAGES%%man/man3/knet_link_set_pong_count.3.gz	84	%%MANPAGES%%man/man3/knet_link_set_pong_count.3.gz
71	%%MANPAGES%%man/man3/knet_link_set_priority.3.gz	85	%%MANPAGES%%man/man3/knet_link_set_priority.3.gz
Lines 79-84 Link Here
79	%%MANPAGES%%man/man3/knet_send.3.gz	93	%%MANPAGES%%man/man3/knet_send.3.gz
80	%%MANPAGES%%man/man3/knet_send_sync.3.gz	94	%%MANPAGES%%man/man3/knet_send_sync.3.gz
81	%%MANPAGES%%man/man3/knet_strtoaddr.3.gz	95	%%MANPAGES%%man/man3/knet_strtoaddr.3.gz
		96	%%MANPAGES%%man/man3/nozzle_add_ip.3.gz
		97	%%MANPAGES%%man/man3/nozzle_close.3.gz
		98	%%MANPAGES%%man/man3/nozzle_del_ip.3.gz
		99	%%MANPAGES%%man/man3/nozzle_get_fd.3.gz
		100	%%MANPAGES%%man/man3/nozzle_get_handle_by_name.3.gz
		101	%%MANPAGES%%man/man3/nozzle_get_ips.3.gz
		102	%%MANPAGES%%man/man3/nozzle_get_mac.3.gz
		103	%%MANPAGES%%man/man3/nozzle_get_mtu.3.gz
		104	%%MANPAGES%%man/man3/nozzle_get_name_by_handle.3.gz
		105	%%MANPAGES%%man/man3/nozzle_open.3.gz
		106	%%MANPAGES%%man/man3/nozzle_reset_mac.3.gz
		107	%%MANPAGES%%man/man3/nozzle_reset_mtu.3.gz
		108	%%MANPAGES%%man/man3/nozzle_run_updown.3.gz
		109	%%MANPAGES%%man/man3/nozzle_set_down.3.gz
		110	%%MANPAGES%%man/man3/nozzle_set_mac.3.gz
		111	%%MANPAGES%%man/man3/nozzle_set_mtu.3.gz
		112	%%MANPAGES%%man/man3/nozzle_set_up.3.gz
82	%%PORTDOCS%%%%DOCSDIR%%/COPYING.applications	113	%%PORTDOCS%%%%DOCSDIR%%/COPYING.applications
83	%%PORTDOCS%%%%DOCSDIR%%/COPYING.libraries	114	%%PORTDOCS%%%%DOCSDIR%%/COPYING.libraries
84	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT	115	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT

Return to bug 241445

Lines 2-9 Link Here

(-)devel/kronosnet/Makefile (-11 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kronosnet	4	PORTNAME= kronosnet
5	PORTVERSION= 1.3	5	PORTVERSION= 1.13
6	PORTREVISION= 5
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= https://kronosnet.org/releases/	7	MASTER_SITES= https://kronosnet.org/releases/
9		8
Lines 16-29 Link Here
16	liblz4.so:archivers/liblz4 \	15	liblz4.so:archivers/liblz4 \
17	libnspr4.so:devel/nspr \	16	libnspr4.so:devel/nspr \
18	libnss3.so:security/nss \	17	libnss3.so:security/nss \
19	libqb.so.0:devel/libqb	18	libqb.so.0:devel/libqb \
		19	libzstd.so:archivers/zstd
20		20
21	USES= autoreconf gmake libtool localbase pkgconfig ssl	21	USES= autoreconf gmake libtool pkgconfig ssl
22	USE_BINUTILS= yes	22	USE_BINUTILS= yes
23	USE_GCC= yes	23	USE_GCC= yes
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	LDFLAGS+= -B${LOCALBASE}/bin
27		26
28	INSTALL_TARGET= install-strip	27	INSTALL_TARGET= install-strip
29	TEST_TARGET= check	28	TEST_TARGET= check
Lines 32-49 Link Here
32	OPTIONS_DEFAULT=MANPAGES	31	OPTIONS_DEFAULT=MANPAGES
33	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
34		33
35	MANPAGES_BUILD_DEPENDS= doxygen:devel/doxygen	34	MANPAGES_BUILD_DEPENDS= doxygen:devel/doxygen
36	MANPAGES_CONFIGURE_ENABLE= man	35	MANPAGES_CONFIGURE_ENABLE= man
37		36
38	.include <bsd.port.options.mk>	37	.include <bsd.port.options.mk>
39		38
40	.if ${SSL_DEFAULT} == base	39	.if ${SSL_DEFAULT} == base
41	BROKEN_FreeBSD_12= error: storage size of 'ctx' isn't known	40	CONFIGURE_ENV= openssl_CFLAGS="-I/usr/include" openssl_LIBS="-lcrypto"
42	BROKEN_FreeBSD_13= error: storage size of 'ctx' isn't known
43	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-base-configure.ac
44	CONFIGURE_ENV= openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto
45	.elif ${SSL_DEFAULT} == libressl	41	.elif ${SSL_DEFAULT} == libressl
46	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac	42	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ssl-libressl-configure.ac
47	.endif	43	.endif
48		44
49	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)devel/kronosnet/files/patch-Makefile.am (-14 lines)
1	--- Makefile.am.orig 2018-02-26 13:46:34 UTC
2	+++ Makefile.am
3	@@ -44,11 +44,6 @@ dist_doc_DATA = \
4	README.licence \
5	README
6
7	-all-local: $(SPEC)
8	-
9	-clean-local:
10	- rm -f $(SPEC)
11	-
12	distclean-local:
13	rm -f $(PACKAGE_NAME)-.tar. $(PACKAGE_NAME)-.sha256 tag-*
14

Line 0 Link Here

(-)devel/kronosnet/files/patch-configure.ac (+23 lines)
	1	--- configure.ac.orig 2019-10-27 10:22:37 UTC
	2	+++ configure.ac
	3	@@ -122,19 +122,13 @@ AC_ARG_ENABLE([crypto-all],
	4	[ enable_crypto_all="yes" ])
	5
	6	KNET_OPTION_DEFINES([nss],[crypto],[PKG_CHECK_MODULES([nss], [nss])])
	7	-KNET_OPTION_DEFINES([openssl],[crypto],[
	8	- PKG_CHECK_MODULES([openssl],[libcrypto < 1.1],
	9	- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])],
	10	- [PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
	11	- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
	12	-])
	13	+KNET_OPTION_DEFINES([openssl],[crypto],[PKG_CHECK_MODULES([openssl],[libcrypto])])
	14
	15	AC_ARG_ENABLE([compress-all],
	16	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
	17	[ enable_compress_all="yes" ])
	18
	19	KNET_OPTION_DEFINES([zstd],[compress],[PKG_CHECK_MODULES([libzstd], [libzstd])])
	20	-
	21	KNET_OPTION_DEFINES([zlib],[compress],[PKG_CHECK_MODULES([zlib], [zlib])])
	22	KNET_OPTION_DEFINES([lz4],[compress],[PKG_CHECK_MODULES([liblz4], [liblz4])])
	23	KNET_OPTION_DEFINES([lzo2],[compress],[

Lines 1-22 Link Here

(-)devel/kronosnet/files/patch-libknet_common.c (-22 lines)
1	From 97924ac12d8da26b61d3bc3ab90fbd86b0b58e72 Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
3	Date: Thu, 24 Jan 2019 14:54:24 +0100
4	Subject: [PATCH] [common] fix not reporting a true dlinfo error cause
5	MIME-Version: 1.0
6	Content-Type: text/plain; charset=UTF-8
7	Content-Transfer-Encoding: 8bit
8
9	This was automatically caught with GCC 9
10	("'%s' directive argument is null").
11
12	Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
13	--- libknet/common.c.orig 2018-02-25 04:32:12 UTC
14	+++ libknet/common.c
15	@@ -82,6 +82,7 @@ static void *open_lib(knet_handle_t knet_h, const char
16	/*
17	* should we dlclose and return error?
18	*/
19	+ error = dlerror();
20	log_warn(knet_h, KNET_SUB_COMMON, "unable to dlinfo %s: %s",
21	libname, error);
22	} else {

Line 0 Link Here

(-)devel/kronosnet/files/patch-libknet_crypto__openssl.c (+59 lines)
	1	--- libknet/crypto_openssl.c.orig 2019-10-27 10:24:59 UTC
	2	+++ libknet/crypto_openssl.c
	3	@@ -50,7 +50,7 @@ static int openssl_is_init = 0;
	4	* crypt/decrypt functions openssl1.0
	5	*/
	6
	7	-#ifdef BUILDCRYPTOOPENSSL10
	8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
	9	static int encrypt_openssl(
	10	knet_handle_t knet_h,
	11	const struct iovec *iov,
	12	@@ -150,9 +150,7 @@ out:
	13	EVP_CIPHER_CTX_cleanup(&ctx);
	14	return err;
	15	}
	16	-#endif
	17	-
	18	-#ifdef BUILDCRYPTOOPENSSL11
	19	+#else /* (OPENSSL_VERSION_NUMBER < 0x10100000L) */
	20	static int encrypt_openssl(
	21	knet_handle_t knet_h,
	22	const struct iovec *iov,
	23	@@ -386,7 +384,7 @@ static int opensslcrypto_authenticate_an
	24	return 0;
	25	}
	26
	27	-#ifdef BUILDCRYPTOOPENSSL10
	28	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
	29	static pthread_mutex_t *openssl_internal_lock;
	30
	31	static void openssl_internal_locking_callback(int mode, int type, char *file, int line)
	32	@@ -476,7 +474,7 @@ static void opensslcrypto_fini(
	33	crypto_instance->model_instance = NULL;
	34	}
	35
	36	-#ifdef BUILDCRYPTOOPENSSL10
	37	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
	38	ERR_free_strings();
	39	#endif
	40
	41	@@ -497,7 +495,7 @@ static int opensslcrypto_init(
	42	knet_handle_crypto_cfg->crypto_hash_type);
	43
	44	if (!openssl_is_init) {
	45	-#ifdef BUILDCRYPTOOPENSSL10
	46	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
	47	ERR_load_crypto_strings();
	48	OPENSSL_add_all_algorithms_noconf();
	49	if (openssl_internal_lock_setup() < 0) {
	50	@@ -505,8 +503,7 @@ static int opensslcrypto_init(
	51	errno = EAGAIN;
	52	return -1;
	53	}
	54	-#endif
	55	-#ifdef BUILDCRYPTOOPENSSL11
	56	+#else
	57	if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
	58	\| OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)) {
	59	log_err(knet_h, KNET_SUB_OPENSSLCRYPTO, "Unable to init openssl");