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

(-)net/freerdp/Makefile (-2 / +4 lines)
Lines 26-37 Link Here
26
CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
26
CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
27
CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
27
CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
28
28
29
OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11
29
OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO X11
30
OPTIONS_DEFAULT=	CUPS GSTREAMER X11
30
OPTIONS_DEFAULT=	CUPS GSTREAMER X11
31
OPTIONS_SUB=		yes
31
OPTIONS_SUB=		yes
32
32
33
OPTIONS_DEFINE_armv6=	NEON
33
OPTIONS_DEFINE_armv6=	NEON
34
OPTIONS_EXCLUDE_armv6=	SSE
34
OPTIONS_DEFINE_amd64=	SSE
35
OPTIONS_DEFINE_i386=	SSE
36
OPTIONS_DEFAULT_amd64=	SSE
35
37
36
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
38
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
37
ALSA_CMAKE_BOOL=	WITH_ALSA
39
ALSA_CMAKE_BOOL=	WITH_ALSA
(-)net/freerdp/files/patch-libfreerdp_crypto_tls.c (+32 lines)
Line 0 Link Here
1
--- libfreerdp/crypto/tls.c.orig	2016-11-24 14:45:22 UTC
2
+++ libfreerdp/crypto/tls.c
3
@@ -218,9 +218,9 @@ static long bio_rdp_tls_ctrl(BIO* bio, i
4
 		case BIO_CTRL_RESET:
5
 			SSL_shutdown(tls->ssl);
6
 
7
-			if (tls->ssl->handshake_func == tls->ssl->method->ssl_connect)
8
+			if (SSL_in_connect_init(tls->ssl))
9
 				SSL_set_connect_state(tls->ssl);
10
-			else if (tls->ssl->handshake_func == tls->ssl->method->ssl_accept)
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);
17
 }
18
 
19
-#ifndef OPENSSL_NO_TLSEXT
20
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
21
 static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server,
22
         int type, unsigned char* data, int len, void* arg)
23
 {
24
@@ -949,7 +949,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underl
25
 		return FALSE;
26
 	}
27
 
28
-#ifndef OPENSSL_NO_TLSEXT
29
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
30
 	/**
31
 	 * The Microsoft iOS clients eventually send a null or even double null
32
 	 * terminated hostname in the SNI TLS extension!

Return to bug 216980