Attachment #185041 for bug #221240

View | Details | Raw Unified | Return to bug 221240
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	freerdp
DISTVERSION=	2.0.0-rc0
PORTREVISION=	4
CATEGORIES=	net comms ipv6

MAINTAINER=	kevans@FreeBSD.org

USE_GITHUB=	yes
GH_ACCOUNT=	FreeRDP
GH_PROJECT=	${GH_ACCOUNT}
GH_TAGNAME=	2a6dbab

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

		${WRKSRC}/client/X11/CMakeLists.txt
	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
		${WRKSRC}/channels/drive/client/statvfs.c
	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \
		${WRKSRC}/client/CMakeLists.txt \

Lines 1-3 Link Here

(-)net/freerdp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1480005507	1	TIMESTAMP = 1501924476
2	SHA256 (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 2a8550c3b067f49353614c4dc13fff4b2c0cf7653dd765c8e44eccaf8c79f20b	2	SHA256 (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664
3	SIZE (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 6417326	3	SIZE (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = 6486533

Line 0 Link Here

(-)net/freerdp/files/patch-libfreerdp_crypto_crypto.c (+11 lines)
	1	--- libfreerdp/crypto/crypto.c.orig 2017-08-05 09:35:32 UTC
	2	+++ libfreerdp/crypto/crypto.c
	3	@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* ce
	4	if (cert_ctx == NULL)
	5	goto end;
	6
	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
	8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
	9	OpenSSL_add_all_algorithms();
	10	#else
	11	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \




--- libfreerdp/crypto/tls.c.orig	2017-07-24 08:46:54 UTC
+++ libfreerdp/crypto/tls.c
@@ -853,13 +853,13 @@ int tls_connect(rdpTls* tls, BIO* underlying)
 	if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, TRUE))
 		return FALSE;
 
-#ifndef OPENSSL_NO_TLSEXT
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
 	SSL_set_tlsext_host_name(tls->ssl, tls->hostname);
 #endif
+			else if (SSL_in_accept_init(tls->ssl))
 				SSL_set_accept_state(tls->ssl);
 
 			SSL_clear(tls->ssl);
@@ -805,7 +805,7 @@ int tls_connect(rdpTls* tls, BIO* underl
 	return tls_do_handshake(tls, TRUE);
 }
 
-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
+#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
 static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server,
         int type, unsigned char* data, int len, void* arg)
 {
@@ -1002,7 +1002,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underlying, rdpSetti
 		return FALSE;
 	}
 
-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
+#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
 	SSL_set_tlsext_debug_callback(tls->ssl, tls_openssl_tlsext_debug_callback);
 #endif
 	return tls_do_handshake(tls, FALSE) > 0;




--- winpr/libwinpr/crypto/hash.c.orig	2017-08-05 09:37:24 UTC
+++ winpr/libwinpr/crypto/hash.c
@@ -178,7 +178,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx, WINPR_MD_TYP
 	if (!evp || !hmac)
 		return FALSE;
 
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
 	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
 	return TRUE;
 #else
@@ -214,7 +214,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* ctx, const BYTE
 #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
@@ -244,7 +244,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ctx, BYTE* outpu
 
 #if defined(WITH_OPENSSL)
 	hmac = (HMAC_CTX*) ctx;
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
 	HMAC_Final(hmac, output, NULL); /* no return value on OpenSSL 0.9.x */
 	return TRUE;
 #else




--- winpr/libwinpr/utils/ssl.c.orig	2017-07-24 08:46:54 UTC
+++ winpr/libwinpr/utils/ssl.c
@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value
 };
 
 
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
 static unsigned long _winpr_openssl_id(void)
 {
 	return (unsigned long)GetCurrentThreadId();
@@ -172,7 +172,7 @@ static BOOL _winpr_openssl_initialize_locking(void)
 	}
 
 	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
 
 	if (CRYPTO_get_id_callback())
 	{
@@ -222,7 +222,7 @@ static BOOL _winpr_openssl_cleanup_locking(void)
 		CRYPTO_set_dynlock_destroy_callback(NULL);
 	}
 
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
 
 	if (CRYPTO_get_id_callback() == _winpr_openssl_id)
 	{
@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_O
 	}
 #endif
 	/* 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 < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
 		ERR_remove_state(0);
 #else
 		ERR_remove_thread_state(NULL);




--- winpr/tools/makecert/makecert.c.orig	2017-07-24 08:46:54 UTC
+++ winpr/tools/makecert/makecert.c
@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_
 				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);
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 		CRYPTO_cleanup_all_ex_data();
 #endif
 #endif




include/winpr2/winpr/wnd.h
include/winpr2/winpr/wtsapi.h
include/winpr2/winpr/wtypes.h
lib/libfreerdp-client2.so
lib/libfreerdp-client2.so.2
lib/libfreerdp-client2.so.2.0.0
lib/libfreerdp2.so
lib/libfreerdp2.so.2
lib/libfreerdp2.so.2.0.0
lib/libwinpr-tools2.so
lib/libwinpr-tools2.so.2
lib/libwinpr-tools2.so.2.0.0
lib/libwinpr2.so
lib/libwinpr2.so.2
lib/libwinpr2.so.2.0.0
libdata/pkgconfig/freerdp-client2.pc
libdata/pkgconfig/freerdp2.pc
libdata/pkgconfig/winpr-tools2.pc
libdata/pkgconfig/winpr2.pc
man/man1/wlog.1.gz
%%X11%%man/man1/xfreerdp.1.gz
share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake

share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
share/cmake/Modules/WinPR2/WinPRTargets.cmake
share/man/man1/winpr-hash.1
share/man/man1/winpr-makecert.1
%%X11%%share/man/man1/xfreerdp.1
share/man/man7/wlog.7

Lines 3-9 Link Here

(-)net/vinagre/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= vinagre	4	PORTNAME= vinagre
5	PORTVERSION= 3.18.2	5	PORTVERSION= 3.18.2
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= net gnome	7	CATEGORIES= net gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 2-11 Link Here

(-)net/remmina-plugin-rdp/Makefile (-1 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PKGNAMESUFFIX= -rdp	4	PKGNAMESUFFIX= -rdp
		5	PORTREVISION= 1
5		6
6	COMMENT= Remmina plugin for RDP protocol	7	COMMENT= Remmina plugin for RDP protocol
7		8
8	LIB_DEPENDS= libfreerdp.so:net/freerdp	9	LIB_DEPENDS= libfreerdp2.so:net/freerdp
9		10
10	USE_GNOME+= cairo	11	USE_GNOME+= cairo
11	USE_XORG+= ice sm x11 xext	12	USE_XORG+= ice sm x11 xext

Return to bug 221240

Lines 190-213 Link Here

(-)net/freerdp/pkg-plist (-14 / +16 lines)
190	include/winpr2/winpr/wnd.h	190	include/winpr2/winpr/wnd.h
191	include/winpr2/winpr/wtsapi.h	191	include/winpr2/winpr/wtsapi.h
192	include/winpr2/winpr/wtypes.h	192	include/winpr2/winpr/wtypes.h
193	lib/libfreerdp-client.so	193	lib/libfreerdp-client2.so
194	lib/libfreerdp-client.so.2	194	lib/libfreerdp-client2.so.2
195	lib/libfreerdp-client.so.2.0.0	195	lib/libfreerdp-client2.so.2.0.0
196	lib/libfreerdp.so	196	lib/libfreerdp2.so
197	lib/libfreerdp.so.2	197	lib/libfreerdp2.so.2
198	lib/libfreerdp.so.2.0.0	198	lib/libfreerdp2.so.2.0.0
199	lib/libwinpr-tools.so	199	lib/libwinpr-tools2.so
200	lib/libwinpr-tools.so.2	200	lib/libwinpr-tools2.so.2
201	lib/libwinpr-tools.so.2.0.0	201	lib/libwinpr-tools2.so.2.0.0
202	lib/libwinpr.so	202	lib/libwinpr2.so
203	lib/libwinpr.so.2	203	lib/libwinpr2.so.2
204	lib/libwinpr.so.2.0.0	204	lib/libwinpr2.so.2.0.0
205	libdata/pkgconfig/freerdp-client2.pc	205	libdata/pkgconfig/freerdp-client2.pc
206	libdata/pkgconfig/freerdp2.pc	206	libdata/pkgconfig/freerdp2.pc
207	libdata/pkgconfig/winpr-tools2.pc	207	libdata/pkgconfig/winpr-tools2.pc
208	libdata/pkgconfig/winpr2.pc	208	libdata/pkgconfig/winpr2.pc
209	man/man1/wlog.1.gz
210	%%X11%%man/man1/xfreerdp.1.gz
211	share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake	209	share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
212	share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake	210	share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
213	share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake	211	share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake
Lines 220-222 Link Here
220	share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake	218	share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
221	share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake	219	share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
222	share/cmake/Modules/WinPR2/WinPRTargets.cmake	220	share/cmake/Modules/WinPR2/WinPRTargets.cmake
		221	share/man/man1/winpr-hash.1
		222	share/man/man1/winpr-makecert.1
		223	%%X11%%share/man/man1/xfreerdp.1
		224	share/man/man7/wlog.7

Lines 2-9 Link Here

(-)net/freerdp/Makefile (-5 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= freerdp	4	PORTNAME= freerdp
5	PORTVERSION= 2.0.0.g2016.11.24	5	DISTVERSION= 2.0.0-rc0
6	PORTREVISION= 4
7	CATEGORIES= net comms ipv6	6	CATEGORIES= net comms ipv6
8		7
9	MAINTAINER= kevans@FreeBSD.org	8	MAINTAINER= kevans@FreeBSD.org
Lines 15-21 Link Here
15	USE_GITHUB= yes	14	USE_GITHUB= yes
16	GH_ACCOUNT= FreeRDP	15	GH_ACCOUNT= FreeRDP
17	GH_PROJECT= ${GH_ACCOUNT}	16	GH_PROJECT= ${GH_ACCOUNT}
18	GH_TAGNAME= 2a6dbab
19		17
20	USES= alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl	18	USES= alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl
21	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
Lines 85-92 Link Here
85	${WRKSRC}/client/X11/CMakeLists.txt	83	${WRKSRC}/client/X11/CMakeLists.txt
86	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \	84	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \
87	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h	85	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
88	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \
89	${WRKSRC}/channels/drive/client/statvfs.c
90	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake	86	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
91	@${REINPLACE_CMD} -e 's\|$${CMAKE_INSTALL_LIBDIR}/cmake\|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules\|' \	87	@${REINPLACE_CMD} -e 's\|$${CMAKE_INSTALL_LIBDIR}/cmake\|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules\|' \
92	${WRKSRC}/client/CMakeLists.txt \	88	${WRKSRC}/client/CMakeLists.txt \

Lines 1-32 Link Here

(-)net/freerdp/files/patch-libfreerdp_crypto_tls.c (-21 / +16 lines)
1	--- libfreerdp/crypto/tls.c.orig 2016-11-24 14:45:22 UTC	1	--- libfreerdp/crypto/tls.c.orig 2017-07-24 08:46:54 UTC
2	+++ libfreerdp/crypto/tls.c	2	+++ libfreerdp/crypto/tls.c
3	@@ -218,9 +218,9 @@ static long bio_rdp_tls_ctrl(BIO* bio, i	3	@@ -853,13 +853,13 @@ int tls_connect(rdpTls* tls, BIO* underlying)
4	case BIO_CTRL_RESET:	4	if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, TRUE))
5	SSL_shutdown(tls->ssl);	5	return FALSE;
6		6
7	- if (tls->ssl->handshake_func == tls->ssl->method->ssl_connect)	7	-#ifndef OPENSSL_NO_TLSEXT
8	+ if (SSL_in_connect_init(tls->ssl))	8	+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
9	SSL_set_connect_state(tls->ssl);	9	SSL_set_tlsext_host_name(tls->ssl, tls->hostname);
10	- else if (tls->ssl->handshake_func == tls->ssl->method->ssl_accept)	10	#endif
11	+ else if (SSL_in_accept_init(tls->ssl))
12	SSL_set_accept_state(tls->ssl);
13
14	SSL_clear(tls->ssl);
15	@@ -805,7 +805,7 @@ int tls_connect(rdpTls* tls, BIO* underl
16	return tls_do_handshake(tls, TRUE);	11	return tls_do_handshake(tls, TRUE);
17	}	12	}
18		13
19	-#ifndef OPENSSL_NO_TLSEXT	14	-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
20	+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)	15	+#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
21	static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server,	16	static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server,
22	int type, unsigned char* data, int len, void* arg)	17	int type, unsigned char* data, int len, void* arg)
23	{	18	{
24	@@ -949,7 +949,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underl	19	@@ -1002,7 +1002,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underlying, rdpSetti
25	return FALSE;	20	return FALSE;
26	}	21	}
27		22
28	-#ifndef OPENSSL_NO_TLSEXT	23	-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
29	+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)	24	+#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
30	/**	25	SSL_set_tlsext_debug_callback(tls->ssl, tls_openssl_tlsext_debug_callback);
31	* The Microsoft iOS clients eventually send a null or even double null	26	#endif
32	* terminated hostname in the SNI TLS extension!	27	return tls_do_handshake(tls, FALSE) > 0;

Line 0 Link Here

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

Line 0 Link Here

(-)net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (+56 lines)
	1	--- winpr/libwinpr/utils/ssl.c.orig 2017-07-24 08:46:54 UTC
	2	+++ winpr/libwinpr/utils/ssl.c
	3	@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value
	4	};
	5
	6
	7	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
	8	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
	9	static unsigned long _winpr_openssl_id(void)
	10	{
	11	return (unsigned long)GetCurrentThreadId();
	12	@@ -172,7 +172,7 @@ static BOOL _winpr_openssl_initialize_locking(void)
	13	}
	14
	15	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */
	16	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
	17	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
	18
	19	if (CRYPTO_get_id_callback())
	20	{
	21	@@ -222,7 +222,7 @@ static BOOL _winpr_openssl_cleanup_locking(void)
	22	CRYPTO_set_dynlock_destroy_callback(NULL);
	23	}
	24
	25	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
	26	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
	27
	28	if (CRYPTO_get_id_callback() == _winpr_openssl_id)
	29	{
	30	@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_O
	31	}
	32	#endif
	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	{
	52	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
	53	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
	54	ERR_remove_state(0);
	55	#else
	56	ERR_remove_thread_state(NULL);

Line 0 Link Here

(-)net/freerdp/files/patch-winpr_tools_makecert_makecert.c (+38 lines)
	1	--- winpr/tools/makecert/makecert.c.orig 2017-07-24 08:46:54 UTC
	2	+++ winpr/tools/makecert/makecert.c
	3	@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_
	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
	32	X509_free(context->x509);
	33	EVP_PKEY_free(context->pkey);
	34	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
	35	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
	36	CRYPTO_cleanup_all_ex_data();
	37	#endif
	38	#endif