Attachment #189337 for bug #224658




# $FreeBSD$

PORTNAME=	freerdp
DISTVERSION=	2.0.0-rc1
PORTREVISION=	3
CATEGORIES=	net comms ipv6

MAINTAINER=	kevans@FreeBSD.org

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
USE_LDCONFIG=	yes
CPE_VENDOR=	freerdp_project

USE_GITHUB=	yes
GH_ACCOUNT=	FreeRDP
GH_PROJECT=	${GH_ACCOUNT}

USES=		alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
USE_LDCONFIG=	yes
CPE_VENDOR=	freerdp_project

CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}

CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang

OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \
			PULSEAUDIO WAYLAND X11
OPTIONS_DEFAULT=	CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11
OPTIONS_SUB=		yes

OPTIONS_DEFINE_armv6=	NEON

GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xext,xextproto,xrandr
GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1

ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
ICU_CMAKE_BOOL=		WITH_ICU

KERBEROS_CMAKE_BOOL=	WITH_GSSAPI_HEIMDAL

MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt
MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
MANPAGES_CMAKE_OFF=	-DWITH_MANPAGES=OFF

NEON_DESC=		Enable	Media Processing Engine instructions
NEON_CMAKE_BOOL=	WITH_NEON
.if ! ${CFLAGS:M-march*}

WAYLAND_CMAKE_BOOL=	WITH_WAYLAND

X11_DESC=		Build FreeRDP X11 client
X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
X11_CMAKE_BOOL=		WITH_X11
X11_CMAKE_OFF=		-DWITH_XKBFILE=OFF
X11_USE=		xorg=x11,xcursor,xext,xextproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv

post-patch:
	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
		${WRKSRC}/CMakeLists.txt
	@${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \
		${WRKSRC}/winpr/CMakeLists.txt
		${WRKSRC}/client/X11/CMakeLists.txt
	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake

Lines 1-3 Link Here

(-)net/freerdp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1501924476	1	TIMESTAMP = 1514888037
2	SHA256 (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664	2	SHA256 (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2
3	SIZE (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = 6486533	3	SIZE (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = 6530403




--- winpr/libwinpr/crypto/hash.c.orig	2017-11-28 14:26:30 UTC
+++ winpr/libwinpr/crypto/hash.c
@@ -179,7 +179,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx
 	if (!evp || !hmac)
 		return FALSE;
 

 	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
 	return TRUE;
 #else
@@ -215,7 +215,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* c
 {
 #if defined(WITH_OPENSSL)
 	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
 
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
 	HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */
 	return TRUE;
 #else
@@ -247,7 +247,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ct
 
 #if defined(WITH_OPENSSL)
 	hmac = (HMAC_CTX*) ctx;




--- winpr/libwinpr/utils/ssl.c.orig	2017-11-28 14:26:30 UTC
+++ winpr/libwinpr/utils/ssl.c
@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value
 };

 static unsigned long _winpr_openssl_id(void)
 {
 	return (unsigned long)GetCurrentThreadId();
@@ -174,7 +174,7 @@ static BOOL _winpr_openssl_initialize_lo
 	}
 
 	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */

 
 	if (CRYPTO_get_id_callback())
 	{
@@ -224,7 +224,7 @@ static BOOL _winpr_openssl_cleanup_locki
 		CRYPTO_set_dynlock_destroy_callback(NULL);
 	}
 

 
 	if (CRYPTO_get_id_callback() == _winpr_openssl_id)
 	{
@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_init
 
 	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
 	/* SSL_load_error_strings() is void */
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 	SSL_load_error_strings();
 	/* SSL_library_init() always returns "1" */
 	SSL_library_init();
@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
 #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
 		_winpr_openssl_cleanup_locking();
 #endif
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 		CRYPTO_cleanup_all_ex_data();
 		ERR_free_strings();
 		EVP_cleanup();
@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
 #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
 	if (flags & WINPR_SSL_CLEANUP_THREAD)
 	{
-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
 		WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!");
 #else
 		WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
 
 BOOL winpr_FIPSMode(void)
 {
-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
 	return FALSE;
 #else
 	return (FIPS_mode() == 1);




--- winpr/tools/makecert/makecert.c.orig	2017-11-28 14:26:30 UTC
+++ winpr/tools/makecert/makecert.c
@@ -1275,7 +1275,7 @@ void makecert_context_free(MAKECERT_CONT
 				printf("Using default export password \"password\"\n");
 			}
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 			OpenSSL_add_all_algorithms();
 			OpenSSL_add_all_ciphers();
 			OpenSSL_add_all_digests();
@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
 		key_length = atoi(arg->Value);
 	}
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
 #else
 	{
@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
 	{
 		ASN1_TIME* before;
 		ASN1_TIME* after;
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 		before = X509_get_notBefore(context->x509);
 		after = X509_get_notAfter(context->x509);
 #else
@@ -1242,7 +1242,7 @@ void makecert_context_free(MAKECERT_CONTEXT* context)
 #ifdef WITH_OPENSSL
 		X509_free(context->x509);
 		EVP_PKEY_free(context->pkey);

Lines 3-6 Link Here

(-)net/freerdp/pkg-descr (-1 / +1 lines)
3	software wherever you want, the way you want it, in a world where	3	software wherever you want, the way you want it, in a world where
4	interoperability can finally liberate your computing experience.	4	interoperability can finally liberate your computing experience.
5		5
6	WWW: http://www.freerdp.com/	6	WWW: http://www.freerdp.com

Lines 43-48 Link Here

(-)net/freerdp/pkg-plist (-5 / +6 lines)
43	include/freerdp2/freerdp/client/rdpgfx.h	43	include/freerdp2/freerdp/client/rdpgfx.h
44	include/freerdp2/freerdp/client/rdpsnd.h	44	include/freerdp2/freerdp/client/rdpsnd.h
45	include/freerdp2/freerdp/client/remdesk.h	45	include/freerdp2/freerdp/client/remdesk.h
		46	include/freerdp2/freerdp/client/sshagent.h
46	include/freerdp2/freerdp/client/tsmf.h	47	include/freerdp2/freerdp/client/tsmf.h
47	include/freerdp2/freerdp/codec/audio.h	48	include/freerdp2/freerdp/codec/audio.h
48	include/freerdp2/freerdp/codec/bitmap.h	49	include/freerdp2/freerdp/codec/bitmap.h
Lines 229-236 Link Here
229	share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake	230	share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
230	share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake	231	share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
231	share/cmake/Modules/WinPR2/WinPRTargets.cmake	232	share/cmake/Modules/WinPR2/WinPRTargets.cmake
232	share/man/man1/winpr-hash.1	233	%%MANPAGES%%share/man/man1/winpr-hash.1
233	share/man/man1/winpr-makecert.1	234	%%MANPAGES%%share/man/man1/winpr-makecert.1
234	%%WAYLAND%%share/man/man1/wlfreerdp.1	235	%%WAYLAND%%%%MANPAGES%%share/man/man1/wlfreerdp.1
235	%%X11%%share/man/man1/xfreerdp.1	236	%%X11%%%%MANPAGES%%share/man/man1/xfreerdp.1
236	share/man/man7/wlog.7	237	%%MANPAGES%%share/man/man7/wlog.7

Return to bug 224658

Lines 2-9 Link Here

(-)net/freerdp/Makefile (-12 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= freerdp	4	PORTNAME= freerdp
5	DISTVERSION= 2.0.0-rc0	5	DISTVERSION= 2.0.0-rc1
6	PORTREVISION= 3
7	CATEGORIES= net comms ipv6	6	CATEGORIES= net comms ipv6
8		7
9	MAINTAINER= kevans@FreeBSD.org	8	MAINTAINER= kevans@FreeBSD.org
Lines 12-32 Link Here
12	LICENSE= APACHE20	11	LICENSE= APACHE20
13	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
14		13
		14	USES= alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
		15	USE_LDCONFIG= yes
		16	CPE_VENDOR= freerdp_project
		17
15	USE_GITHUB= yes	18	USE_GITHUB= yes
16	GH_ACCOUNT= FreeRDP	19	GH_ACCOUNT= FreeRDP
17	GH_PROJECT= ${GH_ACCOUNT}	20	GH_PROJECT= ${GH_ACCOUNT}
18		21
19	USES= alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
20	USE_LDCONFIG= yes
21	CPE_VENDOR= freerdp_project
22
23	CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}	22	CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
24		23
25	CMAKE_ARGS_aarch64= -DWITH_NEON=ON	24	CMAKE_ARGS_aarch64= -DWITH_NEON=ON
26	CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang	25	CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang
27		26
28	OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO WAYLAND X11	27	OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \
29	OPTIONS_DEFAULT= CUPS GSTREAMER WAYLAND X11	28	PULSEAUDIO WAYLAND X11
		29	OPTIONS_DEFAULT= CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11
30	OPTIONS_SUB= yes	30	OPTIONS_SUB= yes
31		31
32	OPTIONS_DEFINE_armv6= NEON	32	OPTIONS_DEFINE_armv6= NEON
Lines 49-54 Link Here
49	GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xextproto,xrandr	49	GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xextproto,xrandr
50	GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1	50	GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1
51		51
		52	ICU_LIB_DEPENDS= libicuuc.so:devel/icu
		53	ICU_CMAKE_BOOL= WITH_ICU
		54
		55	KERBEROS_CMAKE_BOOL= WITH_GSSAPI_HEIMDAL
		56
		57	MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt
		58	MANPAGES_CMAKE_BOOL= WITH_MANPAGES
		59	MANPAGES_CMAKE_OFF= -DWITH_MANPAGES=OFF
		60
52	NEON_DESC= Enable Media Processing Engine instructions	61	NEON_DESC= Enable Media Processing Engine instructions
53	NEON_CMAKE_BOOL= WITH_NEON	62	NEON_CMAKE_BOOL= WITH_NEON
54	.if ! ${CFLAGS:M-march*}	63	.if ! ${CFLAGS:M-march*}
Lines 69-75 Link Here
69	WAYLAND_CMAKE_BOOL= WITH_WAYLAND	78	WAYLAND_CMAKE_BOOL= WITH_WAYLAND
70		79
71	X11_DESC= Build FreeRDP X11 client	80	X11_DESC= Build FreeRDP X11 client
72	X11_BUILD_DEPENDS= xmlto:textproc/xmlto
73	X11_CMAKE_BOOL= WITH_X11	81	X11_CMAKE_BOOL= WITH_X11
74	X11_CMAKE_OFF= -DWITH_XKBFILE=OFF	82	X11_CMAKE_OFF= -DWITH_XKBFILE=OFF
75	X11_USE= xorg=x11,xcursor,xext,xextproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv	83	X11_USE= xorg=x11,xcursor,xext,xextproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
Lines 88-96 Link Here
88	post-patch:	96	post-patch:
89	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \	97	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
90	${WRKSRC}/CMakeLists.txt	98	${WRKSRC}/CMakeLists.txt
91	@${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \	99	@${REINPLACE_CMD} -e 's/Linux/Linux\|FreeBSD/' \
92	${WRKSRC}/winpr/CMakeLists.txt \	100	${WRKSRC}/winpr/CMakeLists.txt
93	${WRKSRC}/client/X11/CMakeLists.txt
94	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \	101	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \
95	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h	102	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
96	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake	103	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake

Lines 1-6 Link Here

(-)net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c (-5 / +5 lines)
1	--- winpr/libwinpr/crypto/hash.c.orig 2017-08-05 09:37:24 UTC	1	--- winpr/libwinpr/crypto/hash.c.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/libwinpr/crypto/hash.c	2	+++ winpr/libwinpr/crypto/hash.c
3	@@ -178,7 +178,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx, WINPR_MD_TYP	3	@@ -179,7 +179,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx
4	if (!evp \|\| !hmac)	4	if (!evp \|\| !hmac)
5	return FALSE;	5	return FALSE;
6		6
Lines 9-24 Link Here
9	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */	9	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
10	return TRUE;	10	return TRUE;
11	#else	11	#else
12	@@ -214,7 +214,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* ctx, const BYTE	12	@@ -215,7 +215,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* c
		13	{
13	#if defined(WITH_OPENSSL)	14	#if defined(WITH_OPENSSL)
14	HMAC_CTX* hmac = (HMAC_CTX*) ctx;	15	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
15
16	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)	16	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
17	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	17	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
18	HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */	18	HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */
19	return TRUE;	19	return TRUE;
20	#else	20	#else
21	@@ -244,7 +244,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ctx, BYTE* outpu	21	@@ -247,7 +247,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ct
22		22
23	#if defined(WITH_OPENSSL)	23	#if defined(WITH_OPENSSL)
24	hmac = (HMAC_CTX*) ctx;	24	hmac = (HMAC_CTX*) ctx;

Lines 1-4 Link Here

(-)net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (-28 / +19 lines)
1	--- winpr/libwinpr/utils/ssl.c.orig 2017-07-24 08:46:54 UTC	1	--- winpr/libwinpr/utils/ssl.c.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/libwinpr/utils/ssl.c	2	+++ winpr/libwinpr/utils/ssl.c
3	@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value	3	@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value
4	};	4	};
Lines 9-15 Link Here
9	static unsigned long _winpr_openssl_id(void)	9	static unsigned long _winpr_openssl_id(void)
10	{	10	{
11	return (unsigned long)GetCurrentThreadId();	11	return (unsigned long)GetCurrentThreadId();
12	@@ -172,7 +172,7 @@ static BOOL _winpr_openssl_initialize_locking(void)	12	@@ -174,7 +174,7 @@ static BOOL _winpr_openssl_initialize_lo
13	}	13	}
14		14
15	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */	15	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */
Lines 18-24 Link Here
18		18
19	if (CRYPTO_get_id_callback())	19	if (CRYPTO_get_id_callback())
20	{	20	{
21	@@ -222,7 +222,7 @@ static BOOL _winpr_openssl_cleanup_locking(void)	21	@@ -224,7 +224,7 @@ static BOOL _winpr_openssl_cleanup_locki
22	CRYPTO_set_dynlock_destroy_callback(NULL);	22	CRYPTO_set_dynlock_destroy_callback(NULL);
23	}	23	}
24		24
Lines 27-56 Link Here
27		27
28	if (CRYPTO_get_id_callback() == _winpr_openssl_id)	28	if (CRYPTO_get_id_callback() == _winpr_openssl_id)
29	{	29	{
30	@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_O	30	@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_init
31	}	31
32	#endif	32	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
33	/* SSL_load_error_strings() is void */
34	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
35	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
36	SSL_load_error_strings();
37	/* SSL_library_init() always returns "1" */
38	SSL_library_init();
39	@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
40	#ifdef WINPR_OPENSSL_LOCKING_REQUIRED
41	_winpr_openssl_cleanup_locking();
42	#endif
43	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
44	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
45	CRYPTO_cleanup_all_ex_data();
46	ERR_free_strings();
47	EVP_cleanup();
48	@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
49	#ifdef WINPR_OPENSSL_LOCKING_REQUIRED
50	if (flags & WINPR_SSL_CLEANUP_THREAD)
51	{	33	{
52	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)	34	-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
53	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	35	+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
54	ERR_remove_state(0);	36	WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!");
55	#else	37	#else
56	ERR_remove_thread_state(NULL);	38	WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
		39	@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
		40
		41	BOOL winpr_FIPSMode(void)
		42	{
		43	-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
		44	+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
		45	return FALSE;
		46	#else
		47	return (FIPS_mode() == 1);

Lines 1-33 Link Here

(-)net/freerdp/files/patch-winpr_tools_makecert_makecert.c (-29 / +2 lines)
1	--- winpr/tools/makecert/makecert.c.orig 2017-07-24 08:46:54 UTC	1	--- winpr/tools/makecert/makecert.c.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/tools/makecert/makecert.c	2	+++ winpr/tools/makecert/makecert.c
3	@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_	3	@@ -1275,7 +1275,7 @@ void makecert_context_free(MAKECERT_CONT
4	printf("Using default export password \"password\"\n");
5	}
6
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
9	OpenSSL_add_all_algorithms();
10	OpenSSL_add_all_ciphers();
11	OpenSSL_add_all_digests();
12	@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
13	key_length = atoi(arg->Value);
14	}
15
16	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
17	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
18	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
19	#else
20	{
21	@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
22	{
23	ASN1_TIME* before;
24	ASN1_TIME* after;
25	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
26	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
27	before = X509_get_notBefore(context->x509);
28	after = X509_get_notAfter(context->x509);
29	#else
30	@@ -1242,7 +1242,7 @@ void makecert_context_free(MAKECERT_CONTEXT* context)
31	#ifdef WITH_OPENSSL	4	#ifdef WITH_OPENSSL
32	X509_free(context->x509);	5	X509_free(context->x509);
33	EVP_PKEY_free(context->pkey);	6	EVP_PKEY_free(context->pkey);