]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Remove call to deprecated gnutls_certificate_type_set_priority (again)
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 21 Jul 2011 17:25:22 +0000 (18:25 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 22 Jul 2011 10:39:44 +0000 (11:39 +0100)
The gnutls_certificate_type_set_priority method is deprecated.
Since we already set the default gnutls priority, it was not
serving any useful purpose and can be removed

* src/rpc/virnettlscontext.c: Remove gnutls_certificate_type_set_priority
  call

src/rpc/virnettlscontext.c

index 7d271bc808996e2cf973bbb40552bcddd57502a7..10cfa51984afcea68653306e5fafaa0ae66f2972 100644 (file)
@@ -1006,7 +1006,6 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt,
 {
     virNetTLSSessionPtr sess;
     int err;
-    static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 };
 
     VIR_DEBUG("ctxt=%p hostname=%s isServer=%d", ctxt, NULLSTR(hostname), ctxt->isServer);
 
@@ -1033,9 +1032,7 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt,
     /* avoid calling all the priority functions, since the defaults
      * are adequate.
      */
-    if ((err = gnutls_set_default_priority(sess->session)) != 0 ||
-        (err = gnutls_certificate_type_set_priority(sess->session,
-                                                    cert_type_priority))) {
+    if ((err = gnutls_set_default_priority(sess->session)) != 0) {
         virNetError(VIR_ERR_SYSTEM_ERROR,
                     _("Failed to set TLS session priority %s"),
                     gnutls_strerror(err));