From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 19 Dec 2010 04:31:02 +0000 (+0100)
Subject: gnutls_x509_privkey_verify_data() was deprecated.
X-Git-Tag: gnutls_2_11_7~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cdde2dedcd67cf2a8de5972ffd5f21401d9de64;p=thirdparty%2Fgnutls.git

gnutls_x509_privkey_verify_data() was deprecated.
---

diff --git a/NEWS b/NEWS
index 2a927ff918..8ed595dab1 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ gnutls_privkey_sign_hash2: ADDED
 gnutls_x509_privkey_sign_hash2: ADDED
 gnutls_x509_privkey_sign_data2: ADDED
 gnutls_x509_privkey_sign_hash: DEPRECATED
+gnutls_x509_privkey_verify_data: DEPRECATED
 gnutls_psk_netconf_derive_key: DEPRECATED
 gnutls_session_set_finished_function: DEPRECATED
 gnutls_ext_register: DEPRECATED
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index e0191e14ab..0053c5f535 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -223,4 +223,13 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
                                         gnutls_datum_t * signature)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 
+/* Deprecated because verify_* functions are moved to public
+ * keys. Check abstract.h for similar functionality.
+ */
+  int gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
+                                       unsigned int flags,
+                                       const gnutls_datum_t * data,
+                                       const gnutls_datum_t * signature)
+                                       _GNUTLS_GCC_ATTR_DEPRECATED;
+
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 646c5843e1..5221b9594d 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -721,10 +721,6 @@ extern "C"
                                       unsigned int flags,
                                       const gnutls_datum_t * data,
                                       gnutls_datum_t * signature);
-  int gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
-                                       unsigned int flags,
-                                       const gnutls_datum_t * data,
-                                       const gnutls_datum_t * signature);
   int gnutls_x509_crt_verify_data (gnutls_x509_crt_t crt,
                                    unsigned int flags,
                                    const gnutls_datum_t * data,
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index b5ad997d8e..1ab6b28c31 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1879,7 +1879,7 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
 }
 
 
-/**
+/*-
  * gnutls_x509_privkey_verify_data:
  * @key: Holds the key
  * @flags: should be 0 for now
@@ -1891,7 +1891,7 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
  *
  * Returns: In case of a verification failure %GNUTLS_E_PK_SIG_VERIFY_FAILED 
  * is returned, and a positive code on success.
- **/
+ -*/
 int
 gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
                                  unsigned int flags,