1 |
commit: 57025e01875215631c175b708153d2ddaa91978a |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jul 14 12:27:36 2018 +0000 |
4 |
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 16 13:45:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57025e01 |
7 |
|
8 |
app-pda/libimobiledevice: remove unused patch(es) |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/9224 |
11 |
|
12 |
app-pda/libimobiledevice/files/gnutls-3.4.patch | 51 ------------------------- |
13 |
1 file changed, 51 deletions(-) |
14 |
|
15 |
diff --git a/app-pda/libimobiledevice/files/gnutls-3.4.patch b/app-pda/libimobiledevice/files/gnutls-3.4.patch |
16 |
deleted file mode 100644 |
17 |
index 9b4b8337210..00000000000 |
18 |
--- a/app-pda/libimobiledevice/files/gnutls-3.4.patch |
19 |
+++ /dev/null |
20 |
@@ -1,51 +0,0 @@ |
21 |
-From 2a5868411c57e25802d2f16fd6b77601f10d0b72 Mon Sep 17 00:00:00 2001 |
22 |
-From: Nikos Mavrogiannopoulos <nmav@××××××.com> |
23 |
-Date: Fri, 29 Apr 2016 22:58:34 +0200 |
24 |
-Subject: [PATCH] Updated gnutls certificate callback to new API (backwards |
25 |
- compatible) |
26 |
- |
27 |
---- |
28 |
- src/idevice.c | 13 +++++++++++++ |
29 |
- 1 file changed, 13 insertions(+) |
30 |
- |
31 |
-diff --git a/src/idevice.c b/src/idevice.c |
32 |
-index 5912aeb..f2de6a3 100644 |
33 |
---- a/src/idevice.c |
34 |
-+++ b/src/idevice.c |
35 |
-@@ -642,7 +642,11 @@ static const char *ssl_error_to_string(int e) |
36 |
- /** |
37 |
- * Internally used gnutls callback function that gets called during handshake. |
38 |
- */ |
39 |
-+#if GNUTLS_VERSION_NUMBER >= 0x020b07 |
40 |
-+static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr2_st * st) |
41 |
-+#else |
42 |
- static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr_st * st) |
43 |
-+#endif |
44 |
- { |
45 |
- int res = -1; |
46 |
- gnutls_certificate_type_t type = gnutls_certificate_type_get(session); |
47 |
-@@ -650,7 +654,12 @@ static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t |
48 |
- ssl_data_t ssl_data = (ssl_data_t)gnutls_session_get_ptr(session); |
49 |
- if (ssl_data && ssl_data->host_privkey && ssl_data->host_cert) { |
50 |
- debug_info("Passing certificate"); |
51 |
-+#if GNUTLS_VERSION_NUMBER >= 0x020b07 |
52 |
-+ st->cert_type = type; |
53 |
-+ st->key_type = GNUTLS_PRIVKEY_X509; |
54 |
-+#else |
55 |
- st->type = type; |
56 |
-+#endif |
57 |
- st->ncerts = 1; |
58 |
- st->cert.x509 = &ssl_data->host_cert; |
59 |
- st->key.x509 = ssl_data->host_privkey; |
60 |
-@@ -759,7 +768,11 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne |
61 |
- debug_info("enabling SSL mode"); |
62 |
- errno = 0; |
63 |
- gnutls_certificate_allocate_credentials(&ssl_data_loc->certificate); |
64 |
-+#if GNUTLS_VERSION_NUMBER >= 0x020b07 |
65 |
-+ gnutls_certificate_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback); |
66 |
-+#else |
67 |
- gnutls_certificate_client_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback); |
68 |
-+#endif |
69 |
- gnutls_init(&ssl_data_loc->session, GNUTLS_CLIENT); |
70 |
- gnutls_priority_set_direct(ssl_data_loc->session, "NONE:+VERS-SSL3.0:+ANON-DH:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA1:+MD5:+COMP-NULL", NULL); |
71 |
- gnutls_credentials_set(ssl_data_loc->session, GNUTLS_CRD_CERTIFICATE, ssl_data_loc->certificate); |