Introduced gnutls_*_privkey_sign_hash2() that is a high level function to produce signatures.

4 files changed, 30 insertions, 11 deletions

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index f80d136359..2e68632b23 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -104,9 +104,13 @@ int gnutls_privkey_sign_data (gnutls_privkey_t signer,
 			      unsigned int flags,
 			      const gnutls_datum_t * data,
 			      gnutls_datum_t * signature);
-int gnutls_privkey_sign_hash (gnutls_privkey_t key,
-			      const gnutls_datum_t * hash,
-			      gnutls_datum_t * signature);
+
+int
+gnutls_privkey_sign_hash2 (gnutls_privkey_t signer,
+				gnutls_digest_algorithm_t hash_algo,
+				unsigned int flags,
+				const gnutls_datum_t * hash_data,
+				gnutls_datum_t * signature);
 
 int gnutls_privkey_decrypt_data (gnutls_privkey_t signer,
 				 unsigned int flags,
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index a31f067485..aaee9d8f4e 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -223,9 +223,10 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
 				     gnutls_datum_t * signature)
 				     _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;
+  int gnutls_x509_crt_verify_hash (gnutls_x509_crt_t crt,
+				   unsigned int flags,
+				   const gnutls_datum_t * hash,
+				   const gnutls_datum_t * signature)
+				   _GNUTLS_GCC_ATTR_DEPRECATED;
 
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 4babbcc652..d6961458c1 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -169,6 +169,18 @@ extern "C"
 				     const char *password,
 				     unsigned int flags);
 
+  int gnutls_openpgp_privkey_sign_hash2 (gnutls_openpgp_privkey_t signer,
+				gnutls_digest_algorithm_t hash_algo,
+				unsigned int flags,
+				const gnutls_datum_t * hash_data,
+				gnutls_datum_t * signature);
+
+  int gnutls_openpgp_privkey_sign_data2 (gnutls_openpgp_privkey_t signer,
+				gnutls_digest_algorithm_t hash,
+				unsigned int flags,
+				const gnutls_datum_t * data,
+				gnutls_datum_t * signature);
+
   int gnutls_openpgp_privkey_decrypt_data (gnutls_openpgp_privkey_t key,
 					   unsigned int flags,
 					   const gnutls_datum_t * ciphertext,
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 80bb435999..21923a3ba4 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -729,10 +729,12 @@ extern "C"
 				   unsigned int flags,
 				   const gnutls_datum_t * data,
 				   const gnutls_datum_t * signature);
-  int gnutls_x509_crt_verify_hash (gnutls_x509_crt_t crt,
-				   unsigned int flags,
-				   const gnutls_datum_t * hash,
-				   const gnutls_datum_t * signature);
+
+  int gnutls_x509_privkey_sign_hash2 (gnutls_x509_privkey_t signer,
+				gnutls_digest_algorithm_t hash_algo,
+				unsigned int flags,
+				const gnutls_datum_t * hash_data,
+				gnutls_datum_t * signature);
 
   int gnutls_x509_crt_get_verify_algorithm (gnutls_x509_crt_t crt,
 					    const gnutls_datum_t * signature,