From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 1 Apr 2015 17:08:33 +0000 (+0200)
Subject: doc update: account for new functions
X-Git-Tag: gnutls_3_4_0~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25fa52cb2faff59ce80196dd779ff293bad2692c;p=thirdparty%2Fgnutls.git

doc update: account for new functions
---

diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index 190dd982ea..b3e9700ab6 100644
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -434,9 +434,9 @@ to prevent its extraction. An object can be marked as private using the flag
 @code{GNUTLS_@-PKCS11_OBJ_@-FLAG_@-MARK_@-PRIVATE}, to require PIN to be
 entered before accessing the object (for operations or otherwise).
 
-@showfuncdesc{gnutls_pkcs11_copy_x509_privkey}
+@showfuncdesc{gnutls_pkcs11_copy_x509_privkey2}
 
-@showfuncdesc{gnutls_pkcs11_copy_x509_crt}
+@showfuncdesc{gnutls_pkcs11_copy_x509_crt2}
 @showfuncdesc{gnutls_pkcs11_delete_url}
 
 
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index c3cf7e957c..9f8532cea3 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -381,6 +381,9 @@ int gnutls_privkey_sign_data(gnutls_privkey_t signer,
 			     const gnutls_datum_t * data,
 			     gnutls_datum_t * signature);
 
+#define gnutls_privkey_sign_raw_data(key, flags, data, sig) \
+	gnutls_privkey_sign_hash ( key, 0, GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA, data, sig)
+
 int gnutls_privkey_sign_hash(gnutls_privkey_t signer,
 			     gnutls_digest_algorithm_t hash_algo,
 			     unsigned int flags,
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 4e36c07a10..537aef0c61 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -205,8 +205,6 @@ 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 */
-#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