View | Details | Raw Unified | Return to bug 232969 | Differences between
and this patch

Collapse All | Expand All

(-)emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_ssl.c (+35 lines)
Line 0 Link Here
1
--- src/VBox/RDP/client-1.8.4/ssl.c.orig	2019-01-25 21:31:48.000000000 +0300
2
+++ src/VBox/RDP/client-1.8.4/ssl.c	2019-02-11 12:38:31.251992000 +0300
3
@@ -97,7 +97,7 @@
4
 rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
5
 		  uint8 * exponent)
6
 {
7
-#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
8
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
9
 	BN_CTX *ctx;
10
 	BIGNUM *mod, *exp, *x, *y;
11
 	uint8 inr[SEC_MAX_MODULUS_SIZE];
12
@@ -128,7 +128,7 @@
13
 	BN_free(exp);
14
 	BN_free(mod);
15
 	BN_CTX_free(ctx);
16
-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) */
17
+#else
18
 	BN_CTX *ctx;
19
 	BIGNUM mod, exp, x, y;
20
 	uint8 inr[SEC_MAX_MODULUS_SIZE];
21
@@ -316,12 +316,12 @@
22
 rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len,
23
 	       unsigned char *md)
24
 {
25
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
26
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(LIBRESSL_VERSION_NUMBER)
27
 	HMAC_CTX ctx;
28
 	HMAC_CTX_init(&ctx);
29
 #endif
30
 	HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL);
31
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
32
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(LIBRESSL_VERSION_NUMBER)
33
 	HMAC_CTX_cleanup(&ctx);
34
 #endif
35
 }
(-)emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_tcp.c (+13 lines)
Line 0 Link Here
1
--- src/VBox/RDP/client-1.8.4/tcp.c.orig	2019-01-25 21:31:48.000000000 +0300
2
+++ src/VBox/RDP/client-1.8.4/tcp.c	2019-02-11 12:39:02.556043000 +0300
3
@@ -311,8 +311,10 @@
4
 
5
 	if (!g_ssl_initialized)
6
 	{
7
+#ifndef LIBRESSL_VERSION_NUMBER
8
 		SSL_load_error_strings();
9
 		SSL_library_init();
10
+#endif
11
 		g_ssl_initialized = True;
12
 	}
13
 

Return to bug 232969