From: Antonio Radici <antonio@dyne.org>
Date: Sun, 19 Jun 2011 04:29:04 +0000 (-0700)
Subject: Remove the deprecated gnutls_certificate_verify_peers() in favour of the new
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a615fd36bdf74b885e1826bb47e4bf26105a4f6;p=mutt

Remove the deprecated gnutls_certificate_verify_peers() in favour of the new
gnutls_certificate_veirfy_peers2()

Reported on http://bugs.debian.org/624085

closes #3516
---

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index dbac87e3..2f2d0814 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -939,22 +939,23 @@ static int tls_check_one_certificate (const gnutls_datum_t *certdata,
 /* sanity-checking wrapper for gnutls_certificate_verify_peers */
 static gnutls_certificate_status tls_verify_peers (gnutls_session tlsstate)
 {
-  gnutls_certificate_status certstat;
+  int verify_ret;
+  unsigned int status;
 
-  certstat = gnutls_certificate_verify_peers (tlsstate);
-  if (!certstat)
-    return certstat;
+  verify_ret = gnutls_certificate_verify_peers2 (tlsstate, &status);
+  if (!verify_ret)
+    return status;
 
-  if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND)
+  if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
   {
     mutt_error (_("Unable to get certificate from peer"));
     mutt_sleep (2);
     return 0;
   }
-  if (certstat < 0)
+  if (verify_ret < 0)
   {
     mutt_error (_("Certificate verification error (%s)"),
-                gnutls_strerror (certstat));
+                gnutls_strerror (status));
     mutt_sleep (2);
     return 0;
   }
@@ -967,7 +968,7 @@ static gnutls_certificate_status tls_verify_peers (gnutls_session tlsstate)
     return 0;
   }
 
-  return certstat;
+  return status;
 }
 
 static int tls_check_certificate (CONNECTION* conn)