gnutls_x509_crq_sign: undeprecate

After the updates of the function semantics, it is no longer
needed to deprecate it.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index aa5c5cb10dd617e3542fb3cb086288a437d67ddc..732b9dbeb4c6b544d91e57ba2eedf2b3925cbd2e 100644 (file)
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -181,12 +181,6 @@ int gnutls_x509_crt_get_preferred_hash_algorithm(gnutls_x509_crt_t
                                                 *mand)
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
-       /* gnutls_x509_crq_privkey_sign() */
-int gnutls_x509_crq_sign(gnutls_x509_crq_t crq,
-                        gnutls_x509_privkey_t key)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-
        /* use gnutls_privkey_sign_hash() with the GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA flag */
 
 #ifdef _ISOC99_SOURCE

diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 23593fd23592c89ad9b67ce563d9d716743447ce..c4eb8f84186fb31985b345af43067d62d89422ce 100644 (file)
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -1285,6 +1285,8 @@ int gnutls_x509_privkey_sign_data(gnutls_x509_privkey_t key,
 
 /* Certificate request stuff.
  */
+int gnutls_x509_crq_sign(gnutls_x509_crq_t crq,
+                        gnutls_x509_privkey_t key);
 
 int gnutls_x509_crq_sign2(gnutls_x509_crq_t crq,
                          gnutls_x509_privkey_t key,

diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 96e0a3265b2b1405b25b63821b8d541a61298a2f..8d1ecbcd556117044d94e7943d7cd1dc4924c3be 100644 (file)
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -933,8 +933,6 @@ gnutls_x509_crq_sign2(gnutls_x509_crq_t crq, gnutls_x509_privkey_t key,
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value.
- *
- * Deprecated: Use gnutls_x509_crq_privkey_sign() instead.
  */
 int gnutls_x509_crq_sign(gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
 {