From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 1 Jun 2011 12:20:58 +0000 (+0100)
Subject: Remove call to deprecated gnutls_certificate_type_set_priority
X-Git-Tag: CVE-2011-2178~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d191b801f3a5d123a931a649f48fa172707dc820;p=thirdparty%2Flibvirt.git

Remove call to deprecated gnutls_certificate_type_set_priority

The gnutls_certificate_type_set_priority method is deprecated.
Since we already set the default gnutls priority, and do not
support OpenGPG credentials in any case, it was not serving
any useful purpose and can be removed

* src/remote/remote_driver.c: Remove src/remote/remote_driver.c
  call
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 4817686590..8e3cd89bf2 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1293,11 +1293,6 @@ negotiate_gnutls_on_connection (virConnectPtr conn,
                                 struct private_data *priv,
                                 int no_verify)
 {
-    const int cert_type_priority[3] = {
-        GNUTLS_CRT_X509,
-        GNUTLS_CRT_OPENPGP,
-        0
-    };
     bool success = false;
     int err;
     gnutls_session_t session;
@@ -1320,15 +1315,6 @@ negotiate_gnutls_on_connection (virConnectPtr conn,
                     gnutls_strerror (err));
         goto cleanup;
     }
-    err =
-        gnutls_certificate_type_set_priority (session,
-                                              cert_type_priority);
-    if (err) {
-        remoteError(VIR_ERR_GNUTLS_ERROR,
-                    _("unable to set certificate priority: %s"),
-                    gnutls_strerror (err));
-        goto cleanup;
-    }
 
     /* put the x509 credentials to the current session
      */