From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 1 Apr 2015 07:55:09 +0000 (+0200)
Subject: gnutls_privkey_sign_raw_data: converted to macro over gnutls_privkey_sign_hash
X-Git-Tag: gnutls_3_4_0~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4f49cd898bdc8f7ddfc10068e2b3ce8893da642;p=thirdparty%2Fgnutls.git

gnutls_privkey_sign_raw_data: converted to macro over gnutls_privkey_sign_hash
---

diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 0cd9ff481e..2f54683ad0 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -38,6 +38,12 @@
 #include "urls.h"
 #include <abstract_int.h>
 
+static int
+_gnutls_privkey_sign_raw_data(gnutls_privkey_t key,
+			     unsigned flags,
+			     const gnutls_datum_t * data,
+			     gnutls_datum_t * signature);
+
 /**
  * gnutls_privkey_get_type:
  * @key: should contain a #gnutls_privkey_t type
@@ -979,7 +985,7 @@ gnutls_privkey_sign_data(gnutls_privkey_t signer,
 		goto cleanup;
 	}
 
-	ret = gnutls_privkey_sign_raw_data(signer, flags, &digest, signature);
+	ret = _gnutls_privkey_sign_raw_data(signer, flags, &digest, signature);
 	_gnutls_free_datum(&digest);
 
 	if (ret < 0) {
@@ -1029,7 +1035,7 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer,
 	gnutls_datum_t digest;
 
 	if (flags & GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA)
-		return gnutls_privkey_sign_raw_data(signer, flags,
+		return _gnutls_privkey_sign_raw_data(signer, flags,
 						    hash_data, signature);
 
 	digest.data = gnutls_malloc(hash_data->size);
@@ -1048,7 +1054,7 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer,
 		goto cleanup;
 	}
 
-	ret = gnutls_privkey_sign_raw_data(signer, flags, &digest, signature);
+	ret = _gnutls_privkey_sign_raw_data(signer, flags, &digest, signature);
 	if (ret < 0) {
 		gnutls_assert();
 		goto cleanup;
@@ -1061,7 +1067,7 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer,
 	return ret;
 }
 
-/**
+/*-
  * gnutls_privkey_sign_raw_data:
  * @key: Holds the key
  * @flags: should be zero
@@ -1081,9 +1087,9 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer,
  * negative error value.
  *
  * Since: 3.1.10
- **/
-int
-gnutls_privkey_sign_raw_data(gnutls_privkey_t key,
+ -*/
+static int
+_gnutls_privkey_sign_raw_data(gnutls_privkey_t key,
 			     unsigned flags,
 			     const gnutls_datum_t * data,
 			     gnutls_datum_t * signature)
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 13c9bb8918..4e36c07a10 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -205,11 +205,8 @@ int gnutls_x509_crl_sign(gnutls_x509_crl_t crl,
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
 	/* use gnutls_privkey_sign_hash() with the GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA flag */
-int gnutls_privkey_sign_raw_data(gnutls_privkey_t key,
-				 unsigned flags,
-				 const gnutls_datum_t * data,
-				 gnutls_datum_t *
-				 signature) _GNUTLS_GCC_ATTR_DEPRECATED;
+#define gnutls_privkey_sign_raw_data(key, flags, data, sig) \
+	gnutls_privkey_sign_hash(key, 0, GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA, data, sig)
 
 #ifdef _ISOC99_SOURCE
 /* we provide older functions for compatibility as inline functions that
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 6ede4d9fe1..78e9efbdf2 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -828,7 +828,6 @@ GNUTLS_3_4
 	gnutls_x509_trust_list_remove_trust_file;
 	gnutls_x509_trust_list_remove_cas;
 	gnutls_session_get_desc;
-	gnutls_privkey_sign_raw_data;
 	gnutls_privkey_status;
 	gnutls_cipher_get_iv_size;
 	gnutls_hmac_set_nonce;