From 3166d0dfa402dc775298c3a3e0b1c214e5b109b1 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Sun, 17 May 2020 20:08:26 +0200 Subject: idevice: [OpenSSL] Fix SSL_read with non-blocking sockets --- src/idevice.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/idevice.c b/src/idevice.c index 3c312d2..0a62907 100644 --- a/src/idevice.c +++ b/src/idevice.c @@ -590,14 +590,23 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_receive_timeout(idevice_ #ifdef HAVE_OPENSSL int r = SSL_read(connection->ssl_data->session, (void*)((char*)(data+received)), (int)len-received); + if (r > 0) { + received += r; + } else { + int sslerr = SSL_get_error(connection->ssl_data->session, r); + if (sslerr == SSL_ERROR_WANT_READ) { + continue; + } + break; + } #else ssize_t r = gnutls_record_recv(connection->ssl_data->session, (void*)(data+received), (size_t)len-received); -#endif if (r > 0) { received += r; } else { break; } +#endif } debug_info("SSL_read %d, received %d", len, received); -- cgit v1.1-32-gdbae