From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 9 May 2012 18:09:38 +0000 (+0200)
Subject: align with 3.0.x
X-Git-Tag: gnutls_3_0_21~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9dee48fcdff0516718a19933e5be6d99090323f;p=thirdparty%2Fgnutls.git

align with 3.0.x
---

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 7498633734..7ac20a4ede 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -786,6 +786,8 @@ GNUTLS_3_0_0 {
 	gnutls_x509_crt_set_private_key_usage_period;
 	gnutls_x509_crq_set_private_key_usage_period;
 	gnutls_session_get_random;
+	gnutls_pubkey_verify_hash2;
+	gnutls_pk_to_sign;
 } GNUTLS_2_12;
 
 GNUTLS_3_1_0 {
@@ -795,8 +797,6 @@ GNUTLS_3_1_0 {
 	gnutls_x509_trust_list_add_system_trust;
 	gnutls_x509_trust_list_add_trust_file;
 	gnutls_x509_trust_list_add_trust_mem;
-	gnutls_pubkey_verify_hash2;
-	gnutls_pk_to_sign;
 } GNUTLS_3_0_0;
 
 GNUTLS_PRIVATE {
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index c8b0cec0b0..8ebec1f721 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -2693,7 +2693,7 @@ gnutls_x509_crt_verify_data (gnutls_x509_crt_t crt, unsigned int flags,
  * This function will verify the given signed digest, using the
  * parameters from the certificate.
  *
- * Deprecated. Please use gnutls_pubkey_verify_data().
+ * Deprecated. Please use gnutls_pubkey_verify_data2() or gnutls_pubkey_verify_hash2().
  *
  * Returns: In case of a verification failure %GNUTLS_E_PK_SIG_VERIFY_FAILED 
  * is returned, and zero or positive code on success.