From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 16 Jan 2011 00:54:21 +0000 (+0100)
Subject: Reverted removal of gnutls_openpgp_privkey_sign_hash() to retain compatibility with... 
X-Git-Tag: gnutls_2_11_7~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c82982437256db0a95f2daa28a3cfa0575f84fef;p=thirdparty%2Fgnutls.git

Reverted removal of gnutls_openpgp_privkey_sign_hash() to retain compatibility with 2.10.x. That function is now deprecated instead.
---

diff --git a/NEWS b/NEWS
index 773a4fc9f1..ca94e43975 100644
--- a/NEWS
+++ b/NEWS
@@ -53,11 +53,10 @@ gnutls_x509_crt_verify_hash: DEPRECATED (use: gnutls_pubkey_verify_hash)
 gnutls_x509_crt_verify_data: DEPRECATED (use: gnutls_pubkey_verify_data)
 gnutls_x509_crt_get_verify_algorithm: DEPRECATED (use: gnutls_pubkey_get_verify_algorithm)
 gnutls_x509_crt_get_preferred_hash_algorithm: DEPRECATED (use: gnutls_pubkey_get_preferred_hash_algorithm)
-gnutls_openpgp_privkey_sign_hash: REMOVED
-gnutls_openpgp_privkey_decrypt_data: REMOVED
-gnutls_pkcs11_privkey_sign_hash: REMOVED
-gnutls_pkcs11_privkey_decrypt_data: REMOVED
-gnutls_privkey_sign_hash: REMOVED
+gnutls_openpgp_privkey_sign_hash: DEPRECATED (use: gnutls_privkey_sign_hash2)
+gnutls_pkcs11_privkey_sign_hash: REMOVED (was added in 2.11.0)
+gnutls_pkcs11_privkey_decrypt_data: REMOVED (was added in 2.11.0)
+gnutls_privkey_sign_hash: REMOVED (was added in 2.11.0)
 
 * Version 2.11.6 (released 2010-12-06)
 
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index b9ccc1914d..083ce11642 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -539,7 +539,7 @@ _gnutls_privkey_sign_hash (gnutls_privkey_t key,
     {
 #ifdef ENABLE_OPENPGP
     case GNUTLS_PRIVKEY_OPENPGP:
-      return _gnutls_openpgp_privkey_sign_hash (key->key.openpgp,
+      return gnutls_openpgp_privkey_sign_hash (key->key.openpgp,
                                                 hash, signature);
 #endif
     case GNUTLS_PRIVKEY_PKCS11:
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 51d304cfcc..f283f8f20e 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -222,10 +222,16 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
 /* This is a very dangerous and error-prone function.
  * Use gnutls_privkey_sign_hash2() instead.
  */
-     int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
+  int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
                                         const gnutls_datum_t * hash,
                                         gnutls_datum_t * signature)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
+                                        _GNUTLS_GCC_ATTR_DEPRECATED;
+
+  int gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
+                                       const gnutls_datum_t * hash,
+                                       gnutls_datum_t * signature)
+                                       _GNUTLS_GCC_ATTR_DEPRECATED;
+
 
 /* Deprecated because verify_* functions are moved to public
  * keys. Check abstract.h for similar functionality.
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index b727635c7b..2ebcb99dbb 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -1226,7 +1226,7 @@ gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t key,
 }
 
 /*-
- * _gnutls_openpgp_privkey_sign_hash:
+ * gnutls_openpgp_privkey_sign_hash:
  * @key: Holds the key
  * @hash: holds the data to be signed
  * @signature: will contain newly allocated signature
@@ -1239,7 +1239,7 @@ gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t key,
  *   negative error value.
  -*/
 int
-_gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
+gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
                                    const gnutls_datum_t * hash,
                                    gnutls_datum_t * signature)
 {