gnutls_x509_crl_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 2dbc04a9ebd7eb4725e48f22365f2f60022f62ab..aa5c5cb10dd617e3542fb3cb086288a437d67ddc 100644 (file)
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -187,13 +187,6 @@ int gnutls_x509_crq_sign(gnutls_x509_crq_t crq,
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
 
-
-       /* gnutls_x509_crl_privkey_sign */
-int gnutls_x509_crl_sign(gnutls_x509_crl_t crl,
-                        gnutls_x509_crt_t issuer,
-                        gnutls_x509_privkey_t issuer_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 86d45dd5c4016f6615fbdefe1d575e9b36850371..23593fd23592c89ad9b67ce563d9d716743447ce 100644 (file)
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -399,6 +399,10 @@ int gnutls_x509_crt_set_crl_dist_points(gnutls_x509_crt_t crt,
 int gnutls_x509_crt_cpy_crl_dist_points(gnutls_x509_crt_t dst,
                                        gnutls_x509_crt_t src);
 
+int gnutls_x509_crl_sign(gnutls_x509_crl_t crl,
+                        gnutls_x509_crt_t issuer,
+                        gnutls_x509_privkey_t issuer_key);
+
 int gnutls_x509_crl_sign2(gnutls_x509_crl_t crl,
                          gnutls_x509_crt_t issuer,
                          gnutls_x509_privkey_t issuer_key,

diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index b09887486a36f7c6e8b61caad9bb429a6d77c6dc..b384aa02c32bb87748e9dd32c4c1181eebfd4c33 100644 (file)
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -151,8 +151,6 @@ gnutls_x509_crl_sign2(gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer,
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value.
- *
- * Deprecated: Use gnutls_x509_crl_privkey_sign().
  */
 int
 gnutls_x509_crl_sign(gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer,