removed gnutls_x509_crt_get_verify_algorithm()

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 6119f14ac68bbf19d0d2af8459bccecf2a3c6d1e..13c9bb89188aa253612774e6cd9ffac73d9edcd9 100644 (file)
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -183,14 +183,6 @@ int gnutls_x509_privkey_sign_data(gnutls_x509_privkey_t key,
                                  size_t * signature_size)
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
-       /* gnutls_pubkey_get_verify_algorithm() */
-int gnutls_x509_crt_get_verify_algorithm(gnutls_x509_crt_t crt,
-                                        const gnutls_datum_t *
-                                        signature,
-                                        gnutls_digest_algorithm_t
-                                        * hash)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
        /* gnutls_pubkey_get_preferred_hash_algorithm() */
 int gnutls_x509_crt_get_preferred_hash_algorithm(gnutls_x509_crt_t
                                                 crt,

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 9d76e20771ce4482112433c5667c250c0594ab62..127e2670600e11675dbdb0778144b41b8972bf79 100644 (file)
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -498,7 +498,6 @@ GNUTLS_3_4
        gnutls_x509_crq_set_key_purpose_oid;
        gnutls_x509_crq_set_key_usage;
        gnutls_x509_crq_set_subject_alt_name;
-       gnutls_x509_crt_get_verify_algorithm;
        gnutls_x509_crt_set_crq_extensions;
        gnutls_session_ticket_key_generate;
        gnutls_session_ticket_enable_client;

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 24532dd8ff596154b91ac8ac57dcd0cc69d2b763..e178c39b5b3389e1cac2b2f87a8115c1f7844163 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -2786,54 +2786,6 @@ gnutls_x509_crt_check_revocation(gnutls_x509_crt_t cert,
                                                 crl_list_length, NULL);
 }
 
-/**
- * gnutls_x509_crt_get_verify_algorithm:
- * @crt: Holds the certificate
- * @signature: contains the signature
- * @hash: The result of the call with the hash algorithm used for signature
- *
- * This function will read the certifcate and the signed data to
- * determine the hash algorithm used to generate the signature.
- *
- * Deprecated: Use gnutls_pubkey_get_verify_algorithm() instead.
- *
- * Returns: the 0 if the hash algorithm is found. A negative error code is
- * returned on error.
- *
- * Since: 2.8.0
- **/
-int
-gnutls_x509_crt_get_verify_algorithm(gnutls_x509_crt_t crt,
-                                    const gnutls_datum_t * signature,
-                                    gnutls_digest_algorithm_t * hash)
-{
-       gnutls_pk_params_st issuer_params;
-       int ret;
-
-       if (crt == NULL) {
-               gnutls_assert();
-               return GNUTLS_E_INVALID_REQUEST;
-       }
-
-       ret = _gnutls_x509_crt_get_mpis(crt, &issuer_params);
-       if (ret < 0) {
-               gnutls_assert();
-               return ret;
-       }
-
-       ret = _gnutls_x509_verify_algorithm(hash,
-                                           signature,
-                                           gnutls_x509_crt_get_pk_algorithm
-                                           (crt, NULL), &issuer_params);
-
-       /* release allocated mpis */
-       gnutls_pk_params_release(&issuer_params);
-
-       return ret;
-}
-
-
-
 /**
  * gnutls_x509_crt_get_preferred_hash_algorithm:
  * @crt: Holds the certificate