summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2011-04-30 16:46:54 +0200
committerGravatar Martin Szulecki2012-03-22 18:48:33 +0100
commite16fc4b4be279e1a7be7760191263e0bb40cdd28 (patch)
tree978ac52dfdbe1c6f20ebb04f1ed38035f3a991c9 /src
parent1e13d7d1420ba8353d8056a5dccaa76cbd3f9ac5 (diff)
downloadlibimobiledevice-e16fc4b4be279e1a7be7760191263e0bb40cdd28.tar.gz
libimobiledevice-e16fc4b4be279e1a7be7760191263e0bb40cdd28.tar.bz2
Remove deprecated gnutls_*_set_priority() and use gnutls_priority_set_direct()
This change requires gnutls >= 2.2.0 for the latter to be available. With deprecation starts with gnutls 2.12.0.
Diffstat (limited to 'src')
-rw-r--r--src/idevice.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/idevice.c b/src/idevice.c
index 5a9d49b..3676b5c 100644
--- a/src/idevice.c
+++ b/src/idevice.c
@@ -586,19 +586,7 @@ idevice_error_t idevice_connection_enable_ssl(idevice_connection_t connection)
gnutls_certificate_allocate_credentials(&ssl_data_loc->certificate);
gnutls_certificate_client_set_retrieve_function (ssl_data_loc->certificate, internal_cert_callback);
gnutls_init(&ssl_data_loc->session, GNUTLS_CLIENT);
- {
- int protocol_priority[16] = { GNUTLS_SSL3, 0 };
- int kx_priority[16] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, 0 };
- int cipher_priority[16] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, 0 };
- int mac_priority[16] = { GNUTLS_MAC_SHA1, GNUTLS_MAC_MD5, 0 };
- int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
-
- gnutls_cipher_set_priority(ssl_data_loc->session, cipher_priority);
- gnutls_compression_set_priority(ssl_data_loc->session, comp_priority);
- gnutls_kx_set_priority(ssl_data_loc->session, kx_priority);
- gnutls_protocol_set_priority(ssl_data_loc->session, protocol_priority);
- gnutls_mac_set_priority(ssl_data_loc->session, mac_priority);
- }
+ 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);
gnutls_credentials_set(ssl_data_loc->session, GNUTLS_CRD_CERTIFICATE, ssl_data_loc->certificate);
gnutls_session_set_ptr(ssl_data_loc->session, ssl_data_loc);