diff options
| author |  Martin Szulecki | 2010-01-10 23:30:32 +0100 |
|---|---|---|
| committer |  Matt Colyer | 2010-01-10 19:22:11 -0800 |
| commit | 53a2b6ae429abc6979e6adab107f24d14c0f5a20 (patch) | |
| tree | c98332b7043e542f6b53e014b2e84f55f9c916f6 /src | |
| parent | 69b4015bea6c32e523404e9784c225be8bfc0ef3 (diff) | |
| download | libimobiledevice-53a2b6ae429abc6979e6adab107f24d14c0f5a20.tar.gz libimobiledevice-53a2b6ae429abc6979e6adab107f24d14c0f5a20.tar.bz2 | |
Fix receiving encrypted plists due to missing gnutls_record_read call
[#106 state:resolved]
Signed-off-by: Matt Colyer <matt@colyer.name>
Diffstat (limited to 'src')
| -rw-r--r-- | src/iphone.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/iphone.c b/src/iphone.c index 3c13859..4a54848 100644 --- a/src/iphone.c +++ b/src/iphone.c @@ -403,7 +403,7 @@ static iphone_error_t internal_plist_send(iphone_connection_t connection, plist_ iphone_device_send(connection, content, length, (uint32_t*)&bytes); } if (bytes > 0) { - log_debug_msg("%s: received %d bytes\n", __func__, bytes); + log_debug_msg("%s: sent %d bytes\n", __func__, bytes); log_debug_buffer(content, bytes); if ((uint32_t)bytes == length) { res = IPHONE_E_SUCCESS; @@ -508,7 +508,11 @@ static iphone_error_t internal_plist_recv_timeout(iphone_connection_t connection return IPHONE_E_INVALID_ARG; } - iphone_device_recv_timeout(connection, (char*)&pktlen, sizeof(pktlen), &bytes, timeout); + if (ssl_session) { + bytes = gnutls_record_recv(ssl_session, (char*)&pktlen, sizeof(pktlen)); + } else { + iphone_device_recv_timeout(connection, (char*)&pktlen, sizeof(pktlen), &bytes, timeout); + } log_debug_msg("%s: initial read=%i\n", __func__, bytes); if (bytes < 4) { log_debug_msg("%s: initial read failed!\n", __func__); @@ -522,7 +526,11 @@ static iphone_error_t internal_plist_recv_timeout(iphone_connection_t connection content = (char*)malloc(pktlen); while (curlen < pktlen) { - iphone_device_recv(connection, content+curlen, pktlen-curlen, &bytes); + if (ssl_session) { + bytes = gnutls_record_recv(ssl_session, content+curlen, pktlen-curlen); + } else { + iphone_device_recv(connection, content+curlen, pktlen-curlen, &bytes); + } if (bytes <= 0) { res = IPHONE_E_UNKNOWN_ERROR; break; |