From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 7 Feb 2011 19:04:00 +0000 (+0100)
Subject: Removed gnutls_certificate_verify_peers.
X-Git-Tag: gnutls_2_99_0~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55b5a945f924dcd7565d9333ae455ee439925d57;p=thirdparty%2Fgnutls.git

Removed gnutls_certificate_verify_peers.
---

diff --git a/NEWS b/NEWS
index 18589a0b36..4c6b45a73a 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ it can verify a certificate chain against a list of certificates.
 ** API and ABI modifications:
 gnutls_cipher_add_auth: ADDED
 gnutls_cipher_tag: ADDED
+gnutls_certificate_verify_peers: REMOVED
 gnutls_session_set_finished_function: REMOVED
 gnutls_ext_register: REMOVED
 gnutls_certificate_get_x509_crls: REMOVED
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index da80735174..47f029c49e 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -616,39 +616,6 @@ gnutls_certificate_verify_peers2 (gnutls_session_t session,
     }
 }
 
-/**
- * gnutls_certificate_verify_peers:
- * @session: is a gnutls session
- *
- * This function will try to verify the peer's certificate and return
- * its status (trusted, invalid etc.).  However you must also check
- * the peer's name in order to check if the verified certificate
- * belongs to the actual peer.
- *
- * This function uses gnutls_x509_crt_list_verify().
- *
- * Returns: one or more of the #gnutls_certificate_status_t
- * enumerated elements bitwise or'd, or a negative value on error.
- *
- * Deprecated: Use gnutls_certificate_verify_peers2() instead.
- **/
-int
-gnutls_certificate_verify_peers (gnutls_session_t session)
-{
-  unsigned int status;
-  int ret;
-
-  ret = gnutls_certificate_verify_peers2 (session, &status);
-
-  if (ret < 0)
-    {
-      gnutls_assert ();
-      return ret;
-    }
-
-  return status;
-}
-
 /**
  * gnutls_certificate_expiration_time_peers:
  * @session: is a gnutls session
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 8ea52e0987..46673cb2d8 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -273,8 +273,4 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
                              unsigned int flags)
                              _GNUTLS_GCC_ATTR_DEPRECATED;
 
-  /* this is obsolete (?). */
-  int gnutls_certificate_verify_peers (gnutls_session_t session)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-
 #endif /* _GNUTLS_COMPAT_H */