diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-09-07 09:23:28 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-09-08 08:55:38 +0200 |
| commit | a2a7e382cfbd86ab2aadf0e97e26fa0aaa69a704 (patch) | |
| tree | bb5a325d2ff11652856fa1e39a6e44575e1fb131 | |
| parent | f65ff8a7a19dd3f959bf2bb3ebe1592cce02aceb (diff) | |
| download | gnutls-a2a7e382cfbd86ab2aadf0e97e26fa0aaa69a704.tar.gz | |
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>
| -rw-r--r-- | lib/includes/gnutls/compat.h | 6 | ||||
| -rw-r--r-- | lib/includes/gnutls/x509.h | 2 | ||||
| -rw-r--r-- | lib/x509/crq.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h index aa5c5cb10d..732b9dbeb4 100644 --- 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 23593fd235..c4eb8f8418 100644 --- 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 96e0a3265b..8d1ecbcd55 100644 --- 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) { |