Blame SOURCES/0001-Fix-installation_proxy-when-using-GnuTLS-instead-of-.patch
|
 |
97434d |
From 6070126868069f2ee01ea9414f4cfbe5de285267 Mon Sep 17 00:00:00 2001
|
|
|
97434d |
From: "Jay Freeman (saurik)" <saurik@saurik.com>
|
|
|
97434d |
Date: Wed, 21 Oct 2015 00:39:14 -0700
|
|
|
97434d |
Subject: [PATCH] Fix installation_proxy when using GnuTLS instead of OpenSSL
|
|
|
97434d |
|
|
|
97434d |
---
|
|
|
97434d |
src/idevice.c | 8 ++++----
|
|
|
97434d |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
97434d |
|
|
|
97434d |
diff --git a/src/idevice.c b/src/idevice.c
|
|
|
97434d |
index 7c33cdd..b776e84 100644
|
|
|
97434d |
--- a/src/idevice.c
|
|
|
97434d |
+++ b/src/idevice.c
|
|
|
97434d |
@@ -393,10 +393,13 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_receive_timeout(idevice_
|
|
|
97434d |
}
|
|
|
97434d |
|
|
|
97434d |
if (connection->ssl_data) {
|
|
|
97434d |
-#ifdef HAVE_OPENSSL
|
|
|
97434d |
uint32_t received = 0;
|
|
|
97434d |
while (received < len) {
|
|
|
97434d |
+#ifdef HAVE_OPENSSL
|
|
|
97434d |
int r = SSL_read(connection->ssl_data->session, (void*)((char*)(data+received)), (int)len-received);
|
|
|
97434d |
+#else
|
|
|
97434d |
+ ssize_t r = gnutls_record_recv(connection->ssl_data->session, (void*)(data+received), (size_t)len-received);
|
|
|
97434d |
+#endif
|
|
|
97434d |
if (r > 0) {
|
|
|
97434d |
received += r;
|
|
|
97434d |
} else {
|
|
|
97434d |
@@ -404,9 +407,6 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_receive_timeout(idevice_
|
|
|
97434d |
}
|
|
|
97434d |
}
|
|
|
97434d |
debug_info("SSL_read %d, received %d", len, received);
|
|
|
97434d |
-#else
|
|
|
97434d |
- ssize_t received = gnutls_record_recv(connection->ssl_data->session, (void*)data, (size_t)len);
|
|
|
97434d |
-#endif
|
|
|
97434d |
if (received > 0) {
|
|
|
97434d |
*recv_bytes = received;
|
|
|
97434d |
return IDEVICE_E_SUCCESS;
|
|
|
97434d |
--
|
|
|
97434d |
2.5.0
|
|
|
97434d |
|