From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 7 Sep 2017 07:13:54 +0000 (+0200)
Subject: gnutls_x509_crl_sign: undeprecate
X-Git-Tag: gnutls_3_6_1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f65ff8a7a19dd3f959bf2bb3ebe1592cce02aceb;p=thirdparty%2Fgnutls.git

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 2dbc04a9eb..aa5c5cb10d 100644
--- 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 86d45dd5c4..23593fd235 100644
--- 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 b09887486a..b384aa02c3 100644
--- 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,