summaryrefslogtreecommitdiffstats
path: root/src/lockdown.c
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2019-09-05 19:50:24 +0200
committerGravatar Nikias Bassen2019-09-05 19:50:24 +0200
commita9e69b1252e5918b6d8ada1209ccefde301cfa26 (patch)
tree2428ae909f123e48dac2afead248089ae1c531fd /src/lockdown.c
parent6d5a3d6a35a8610f83d6a69156cfe1b64da4f2bd (diff)
downloadlibimobiledevice-a9e69b1252e5918b6d8ada1209ccefde301cfa26.tar.gz
libimobiledevice-a9e69b1252e5918b6d8ada1209ccefde301cfa26.tar.bz2
idevice: Fix handling SSL/TLS version selection for OpenSSL 1.1.0+ and for older devices
Diffstat (limited to 'src/lockdown.c')
-rw-r--r--src/lockdown.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lockdown.c b/src/lockdown.c
index 23f2782..694fb47 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -715,7 +715,7 @@ LIBIMOBILEDEVICE_API lockdownd_error_t lockdownd_client_new_with_handshake(idevi
char *s_version = NULL;
plist_get_string_val(p_version, &s_version);
if (s_version && sscanf(s_version, "%d.%d.%d", &vers[0], &vers[1], &vers[2]) >= 2) {
- device->version = ((vers[0] & 0xFF) << 16) | ((vers[1] & 0xFF) << 8) | (vers[2] & 0xFF);
+ device->version = DEVICE_VERSION(vers[0], vers[1], vers[2]);
}
free(s_version);
}
@@ -738,7 +738,7 @@ LIBIMOBILEDEVICE_API lockdownd_error_t lockdownd_client_new_with_handshake(idevi
plist_free(pair_record);
pair_record = NULL;
- if (device->version < 0x070000) {
+ if (device->version < DEVICE_VERSION(7,0,0)) {
/* for older devices, we need to validate pairing to receive trusted host status */
ret = lockdownd_validate_pair(client_loc, NULL);