diff options
| author |  Nikos Mavrogiannopoulos | 2016-04-29 22:58:34 +0200 |
|---|---|---|
| committer |  Nikias Bassen | 2016-04-29 22:58:34 +0200 |
| commit | 2a5868411c57e25802d2f16fd6b77601f10d0b72 (patch) | |
| tree | f5bc5672e6176cb39add5842d808532468a43851 /src | |
| parent | e6486dbd29470939ed032972ca693888465e9ff4 (diff) | |
| download | libimobiledevice-2a5868411c57e25802d2f16fd6b77601f10d0b72.tar.gz libimobiledevice-2a5868411c57e25802d2f16fd6b77601f10d0b72.tar.bz2 | |
Updated gnutls certificate callback to new API (backwards compatible)
Diffstat (limited to 'src')
| -rw-r--r-- | src/idevice.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/idevice.c b/src/idevice.c index 5912aeb..f2de6a3 100644 --- a/src/idevice.c +++ b/src/idevice.c @@ -642,7 +642,11 @@ static const char *ssl_error_to_string(int e) /** * Internally used gnutls callback function that gets called during handshake. */ +#if GNUTLS_VERSION_NUMBER >= 0x020b07 +static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr2_st * st) +#else static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr_st * st) +#endif { int res = -1; gnutls_certificate_type_t type = gnutls_certificate_type_get(session); @@ -650,7 +654,12 @@ static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t ssl_data_t ssl_data = (ssl_data_t)gnutls_session_get_ptr(session); if (ssl_data && ssl_data->host_privkey && ssl_data->host_cert) { debug_info("Passing certificate"); +#if GNUTLS_VERSION_NUMBER >= 0x020b07 + st->cert_type = type; + st->key_type = GNUTLS_PRIVKEY_X509; +#else st->type = type; +#endif st->ncerts = 1; st->cert.x509 = &ssl_data->host_cert; st->key.x509 = ssl_data->host_privkey; @@ -759,7 +768,11 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne debug_info("enabling SSL mode"); errno = 0; gnutls_certificate_allocate_credentials(&ssl_data_loc->certificate); +#if GNUTLS_VERSION_NUMBER >= 0x020b07 + gnutls_certificate_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback); +#else gnutls_certificate_client_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback); +#endif gnutls_init(&ssl_data_loc->session, GNUTLS_CLIENT); 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); |