Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/
Date: Sun, 31 Dec 2017 17:08:16
Message-Id: 1514740075.dba1cb37dfe1c77fdfff7bf9145abf0b638389d7.floppym@gentoo
1 commit: dba1cb37dfe1c77fdfff7bf9145abf0b638389d7
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Dec 27 08:56:26 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 31 17:07:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba1cb37
7
8 net-misc/freerdp: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/6655
11
12 net-misc/freerdp/files/freerdp-libressl.patch | 148 --------------------------
13 1 file changed, 148 deletions(-)
14
15 diff --git a/net-misc/freerdp/files/freerdp-libressl.patch b/net-misc/freerdp/files/freerdp-libressl.patch
16 deleted file mode 100644
17 index cbb79bcc1d3..00000000000
18 --- a/net-misc/freerdp/files/freerdp-libressl.patch
19 +++ /dev/null
20 @@ -1,148 +0,0 @@
21 -From 70ab61c8e6083080093fc42e8e7172969864e2bd Mon Sep 17 00:00:00 2001
22 -From: Aric Belsito <lluixhi@×××××.com>
23 -Date: Sun, 19 Mar 2017 13:58:24 -0700
24 -Subject: [PATCH] Support LibreSSL
25 -
26 -Broken by the addition of OpenSSL 1.1.0 support.
27 ----
28 - libfreerdp/crypto/opensslcompat.c | 4 ++--
29 - libfreerdp/crypto/opensslcompat.h | 4 ++--
30 - libfreerdp/crypto/tls.c | 8 ++++----
31 - winpr/libwinpr/crypto/hash.c | 8 ++++----
32 - winpr/libwinpr/utils/ssl.c | 2 +-
33 - 5 files changed, 13 insertions(+), 13 deletions(-)
34 -
35 -diff --git a/libfreerdp/crypto/opensslcompat.c b/libfreerdp/crypto/opensslcompat.c
36 -index bb5aff7..701902d 100644
37 ---- a/libfreerdp/crypto/opensslcompat.c
38 -+++ b/libfreerdp/crypto/opensslcompat.c
39 -@@ -19,7 +19,7 @@
40 -
41 - #include "opensslcompat.h"
42 -
43 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
44 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
45 -
46 - BIO_METHOD* BIO_meth_new(int type, const char* name)
47 - {
48 -@@ -41,4 +41,4 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM
49 - *d = r->d;
50 - }
51 -
52 --#endif /* OPENSSL < 1.1.0 */
53 -+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
54 -diff --git a/libfreerdp/crypto/opensslcompat.h b/libfreerdp/crypto/opensslcompat.h
55 -index a599863..b42d32f 100644
56 ---- a/libfreerdp/crypto/opensslcompat.h
57 -+++ b/libfreerdp/crypto/opensslcompat.h
58 -@@ -30,7 +30,7 @@
59 -
60 - #include <openssl/opensslv.h>
61 -
62 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
63 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
64 -
65 - #include <openssl/bio.h>
66 - #include <openssl/rsa.h>
67 -@@ -59,7 +59,7 @@
68 - BIO_METHOD* BIO_meth_new(int type, const char* name);
69 - void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d);
70 -
71 --#endif /* OPENSSL < 1.1.0 */
72 -+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
73 - #endif /* WITH_OPENSSL */
74 -
75 - #endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */
76 -diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
77 -index 1071a2e..c415763 100644
78 ---- a/libfreerdp/crypto/tls.c
79 -+++ b/libfreerdp/crypto/tls.c
80 -@@ -323,7 +323,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
81 - case BIO_CTRL_PUSH:
82 - if (next_bio && (next_bio != ssl_rbio))
83 - {
84 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
85 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
86 - SSL_set_bio(tls->ssl, next_bio, next_bio);
87 - CRYPTO_add(&(bio->next_bio->references), 1, CRYPTO_LOCK_BIO);
88 - #else
89 -@@ -346,7 +346,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
90 - if (ssl_rbio != ssl_wbio)
91 - BIO_free_all(ssl_wbio);
92 -
93 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
94 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
95 - if (next_bio)
96 - CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO);
97 - tls->ssl->wbio = tls->ssl->rbio = NULL;
98 -@@ -384,7 +384,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
99 - BIO_push(ssl_rbio, next_bio);
100 -
101 - BIO_set_next(bio, ssl_rbio);
102 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
103 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
104 - CRYPTO_add(&(ssl_rbio->references), 1, CRYPTO_LOCK_BIO);
105 - #else
106 - BIO_up_ref(ssl_rbio);
107 -@@ -1021,7 +1021,7 @@ BOOL tls_send_alert(rdpTls* tls)
108 - * SSL struct is opaqe now
109 - */
110 -
111 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
112 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
113 - if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
114 - {
115 - /**
116 -diff --git a/winpr/libwinpr/crypto/hash.c b/winpr/libwinpr/crypto/hash.c
117 -index 949d687..27eb434 100644
118 ---- a/winpr/libwinpr/crypto/hash.c
119 -+++ b/winpr/libwinpr/crypto/hash.c
120 -@@ -146,7 +146,7 @@ WINPR_HMAC_CTX* winpr_HMAC_New(void)
121 -
122 - #if defined(WITH_OPENSSL)
123 - HMAC_CTX* hmac = NULL;
124 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
125 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
126 - if (!(hmac = (HMAC_CTX*) calloc(1, sizeof(HMAC_CTX))))
127 - return NULL;
128 - HMAC_CTX_init(hmac);
129 -@@ -267,7 +267,7 @@ void winpr_HMAC_Free(WINPR_HMAC_CTX* ctx)
130 - HMAC_CTX* hmac = (HMAC_CTX*) ctx;
131 - if (hmac)
132 - {
133 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
134 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
135 - HMAC_CTX_cleanup(hmac);
136 - free(hmac);
137 - #else
138 -@@ -317,7 +317,7 @@ WINPR_DIGEST_CTX* winpr_Digest_New(void)
139 -
140 - #if defined(WITH_OPENSSL)
141 - EVP_MD_CTX* mdctx;
142 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
143 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
144 - mdctx = EVP_MD_CTX_create();
145 - #else
146 - mdctx = EVP_MD_CTX_new();
147 -@@ -406,7 +406,7 @@ void winpr_Digest_Free(WINPR_DIGEST_CTX* ctx)
148 - EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx;
149 - if (mdctx)
150 - {
151 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
152 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
153 - EVP_MD_CTX_destroy(mdctx);
154 - #else
155 - EVP_MD_CTX_free(mdctx);
156 -diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
157 -index 2f8100f..5fd6ac6 100644
158 ---- a/winpr/libwinpr/utils/ssl.c
159 -+++ b/winpr/libwinpr/utils/ssl.c
160 -@@ -45,7 +45,7 @@ static BOOL g_winpr_openssl_initialized_by_winpr = FALSE;
161 - * set locking callbacks to use OpenSSL in a multi-threaded environment.
162 - */
163 -
164 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
165 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
166 -
167 - #define WINPR_OPENSSL_LOCKING_REQUIRED 1
168 -
Report Message
Find on MARC Find on Google Groups