removed flag GNUTLS_PKCS11_TOKEN_TRUSTED_UINT

diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index ade02502b2cbaf8933a24c59c47860461cddbff5..f4efd9ccd479948abb6d9ccb158e50190a90e7d9 100644 (file)
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -234,7 +234,6 @@ typedef enum {
        GNUTLS_PKCS11_TOKEN_SERIAL,
        GNUTLS_PKCS11_TOKEN_MANUFACTURER,
        GNUTLS_PKCS11_TOKEN_MODEL,
-       GNUTLS_PKCS11_TOKEN_TRUSTED_UINT,
 } gnutls_pkcs11_token_info_t;
 
 /**

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 6fb0a59add31db72f73d19c9ef649cc6df0787bd..b00d5d39f545fc5657e5122e28656e37212bec0f 100644 (file)
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1786,9 +1786,6 @@ gnutls_pkcs11_token_get_url(unsigned int seq,
  * This function will return information about the PKCS 11 token such
  * as the label, id, etc.
  *
- * All types are strings, except the type %GNUTLS_PKCS11_TOKEN_TRUSTED_UINT which
- * returns an integer with true (1) or false (0) value.
- *
  * Returns: %GNUTLS_E_SUCCESS (0) on success or a negative error code
  * on error.
  *
@@ -1800,8 +1797,6 @@ gnutls_pkcs11_token_get_info(const char *url,
                             void *output, size_t * output_size)
 {
        struct p11_kit_uri *info = NULL;
-       struct ck_function_list *module;
-       ck_slot_id_t slot;
        const uint8_t *str;
        size_t str_max;
        size_t len;
@@ -1832,26 +1827,6 @@ gnutls_pkcs11_token_get_info(const char *url,
                str = p11_kit_uri_get_token_info(info)->model;
                str_max = 16;
                break;
-       case GNUTLS_PKCS11_TOKEN_TRUSTED_UINT:
-               if (*output_size < sizeof(ret)) {
-                       *output_size = sizeof(ret);
-                       return gnutls_assert_val(GNUTLS_E_SHORT_MEMORY_BUFFER);
-               }
-
-               ret = pkcs11_find_slot(&module, &slot, info, NULL);
-               if (ret < 0) {
-                       gnutls_assert();
-                       goto cleanup;
-               }
-
-               if (p11_kit_module_get_flags(module) & P11_KIT_MODULE_TRUSTED) {
-                       ret = 1;
-               } else {
-                       ret = 0;
-               }
-               memcpy(output, &ret, sizeof(ret));
-               ret = 0;
-               goto cleanup;
        default:
                p11_kit_uri_free(info);
                gnutls_assert();
@@ -1871,7 +1846,7 @@ gnutls_pkcs11_token_get_info(const char *url,
        *output_size = len;
 
        ret = 0;
-cleanup:
+
        p11_kit_uri_free(info);
        return ret;
 }