more sensible names in find data private structures.

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 829ca2b29d4ea25caca32e6e5886b14a124699c5..aa6e093a70c014f222d3ff9d32c39ff0aa048e58 100644 (file)
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -54,16 +54,16 @@ struct gnutls_pkcs11_provider_st {
        struct ck_info info;
 };
 
-struct flags_find_data_st {
+struct find_flags_data_st {
        struct p11_kit_uri *info;
        unsigned int slot_flags;
 };
 
-struct url_find_data_st {
+struct find_url_data_st {
        gnutls_pkcs11_obj_t crt;
 };
 
-struct crt_find_data_st {
+struct find_obj_data_st {
        gnutls_pkcs11_obj_t *p_list;
        unsigned int *n_list;
        unsigned int current;
@@ -71,6 +71,25 @@ struct crt_find_data_st {
        struct p11_kit_uri *info;
 };
 
+struct find_token_num {
+       struct p11_kit_uri *info;
+       unsigned int seq;       /* which one we are looking for */
+       unsigned int current;   /* which one are we now */
+};
+
+struct find_pkey_list_st {
+       gnutls_buffer_st *key_ids;
+       size_t key_ids_size;
+};
+
+struct find_cert_st {
+       gnutls_datum_t dn;
+       gnutls_datum_t key_id;
+
+       gnutls_pkcs11_obj_t crt;
+       unsigned flags;
+};
+
 
 static struct gnutls_pkcs11_provider_st providers[MAX_PROVIDERS];
 static unsigned int active_providers = 0;
@@ -1462,7 +1481,7 @@ find_obj_url(struct pkcs11_session_info *sinfo,
             struct token_info *info, struct ck_info *lib_info,
             void *input)
 {
-       struct url_find_data_st *find_data = input;
+       struct find_url_data_st *find_data = input;
        struct ck_attribute a[4];
        struct ck_attribute *attr;
        ck_object_class_t class = -1;
@@ -1642,7 +1661,7 @@ gnutls_pkcs11_obj_import_url(gnutls_pkcs11_obj_t obj, const char *url,
                             unsigned int flags)
 {
        int ret;
-       struct url_find_data_st find_data;
+       struct find_url_data_st find_data;
 
        PKCS11_CHECK_INIT;
 
@@ -1668,18 +1687,12 @@ gnutls_pkcs11_obj_import_url(gnutls_pkcs11_obj_t obj, const char *url,
        return 0;
 }
 
-struct token_num {
-       struct p11_kit_uri *info;
-       unsigned int seq;       /* which one we are looking for */
-       unsigned int current;   /* which one are we now */
-};
-
 static int
 find_token_num(struct pkcs11_session_info *sinfo,
               struct token_info *tinfo,
               struct ck_info *lib_info, void *input)
 {
-       struct token_num *find_data = input;
+       struct find_token_num *find_data = input;
 
        if (tinfo == NULL) {    /* we don't support multiple calls */
                gnutls_assert();
@@ -1721,7 +1734,7 @@ gnutls_pkcs11_token_get_url(unsigned int seq,
                            gnutls_pkcs11_url_type_t detailed, char **url)
 {
        int ret;
-       struct token_num tn;
+       struct find_token_num tn;
 
        PKCS11_CHECK_INIT;
 
@@ -1864,12 +1877,6 @@ gnutls_pkcs11_obj_get_type(gnutls_pkcs11_obj_t obj)
        return obj->type;
 }
 
-struct pkey_list {
-       gnutls_buffer_st *key_ids;
-       size_t key_ids_size;
-};
-
-
 static int
 retrieve_pin_from_source(const char *pinfile,
                         struct ck_token_info *token_info, int attempts,
@@ -2163,7 +2170,7 @@ int pkcs11_call_token_func(struct p11_kit_uri *info, const unsigned retry)
 
 static int
 find_privkeys(struct pkcs11_session_info *sinfo,
-             struct token_info *info, struct pkey_list *list)
+             struct token_info *info, struct find_pkey_list_st *list)
 {
        struct ck_attribute a[3];
        ck_object_class_t class;
@@ -2256,7 +2263,7 @@ static int
 find_objs(struct pkcs11_session_info *sinfo,
          struct token_info *info, struct ck_info *lib_info, void *input)
 {
-       struct crt_find_data_st *find_data = input;
+       struct find_obj_data_st *find_data = input;
        struct ck_attribute a[6];
        struct ck_attribute *attr;
        ck_object_class_t class = (ck_object_class_t) - 1;
@@ -2270,7 +2277,7 @@ find_objs(struct pkcs11_session_info *sinfo,
        char certid_tmp[PKCS11_ID_SIZE];
        char label_tmp[PKCS11_LABEL_SIZE];
        int ret;
-       struct pkey_list plist; /* private key holder */
+       struct find_pkey_list_st plist; /* private key holder */
        unsigned int i, tot_values = 0;
 
        if (info == NULL) {     /* final call */
@@ -2577,7 +2584,7 @@ gnutls_pkcs11_obj_list_import_url(gnutls_pkcs11_obj_t * p_list,
                                  unsigned int flags)
 {
        int ret;
-       struct crt_find_data_st priv;
+       struct find_obj_data_st priv;
 
        PKCS11_CHECK_INIT;
 
@@ -2802,7 +2809,7 @@ static int
 find_flags(struct pkcs11_session_info *sinfo,
           struct token_info *info, struct ck_info *lib_info, void *input)
 {
-       struct flags_find_data_st *find_data = input;
+       struct find_flags_data_st *find_data = input;
 
        if (info == NULL) {     /* we don't support multiple calls */
                gnutls_assert();
@@ -2838,7 +2845,7 @@ find_flags(struct pkcs11_session_info *sinfo,
  **/
 int gnutls_pkcs11_token_get_flags(const char *url, unsigned int *flags)
 {
-       struct flags_find_data_st find_data;
+       struct find_flags_data_st find_data;
        int ret;
 
        PKCS11_CHECK_INIT;
@@ -2961,16 +2968,8 @@ const char *gnutls_pkcs11_type_get_name(gnutls_pkcs11_obj_type_t type)
        }
 }
 
-struct find_issuer_st {
-       gnutls_datum_t issuer_dn;
-       gnutls_datum_t issuer_key_id;
-
-       gnutls_pkcs11_obj_t crt;
-       unsigned flags;
-};
-
 static int
-find_issuer(struct pkcs11_session_info *sinfo,
+find_cert(struct pkcs11_session_info *sinfo,
            struct token_info *info, struct ck_info *lib_info, void *input)
 {
        struct ck_attribute a[5];
@@ -2981,7 +2980,7 @@ find_issuer(struct pkcs11_session_info *sinfo,
        unsigned long count, a_vals;
        int found = 0, ret;
        uint8_t *cert_data = NULL;
-       struct find_issuer_st *fs = input;
+       struct find_cert_st *fs = input;
        char label_tmp[PKCS11_LABEL_SIZE];
        char id_tmp[PKCS11_ID_SIZE];
        unsigned tries, i, finalized;
@@ -2992,7 +2991,7 @@ find_issuer(struct pkcs11_session_info *sinfo,
                return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
        }
 
-       if (fs->issuer_dn.size == 0 && fs->issuer_key_id.size == 0)
+       if (fs->dn.size == 0 && fs->key_id.size == 0)
                return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
 
        /* search the token for the key ID */
@@ -3005,7 +3004,7 @@ find_issuer(struct pkcs11_session_info *sinfo,
 
        /* Find objects with given class and type */
 
-       if (fs->issuer_key_id.size > 0 && fs->issuer_dn.size > 0)
+       if (fs->key_id.size > 0 && fs->dn.size > 0)
                tries = 2;
        else
                tries = 1;
@@ -3032,15 +3031,15 @@ find_issuer(struct pkcs11_session_info *sinfo,
                a[a_vals].value_len = sizeof type;
                a_vals++;
 
-               if (i == 0 && fs->issuer_key_id.size > 0) {
+               if (i == 0 && fs->key_id.size > 0) {
                        a[a_vals].type = CKA_ID;
-                       a[a_vals].value = fs->issuer_key_id.data;
-                       a[a_vals].value_len = fs->issuer_key_id.size;
+                       a[a_vals].value = fs->key_id.data;
+                       a[a_vals].value_len = fs->key_id.size;
                        a_vals++;
                } else {
                        a[a_vals].type = CKA_SUBJECT;
-                       a[a_vals].value = fs->issuer_dn.data;
-                       a[a_vals].value_len = fs->issuer_dn.size;
+                       a[a_vals].value = fs->dn.data;
+                       a[a_vals].value_len = fs->dn.size;
                        a_vals++;
                }
 
@@ -3122,7 +3121,7 @@ find_issuer(struct pkcs11_session_info *sinfo,
 }
 
 /**
- * gnutls_pkcs11_get_issuer:
+ * gnutls_pkcs11_get_raw_issuer:
  * @url: A PKCS 11 url identifying a token
  * @cert: is the certificate to find issuer for
  * @issuer: Will hold the issuer if any in an allocated buffer. 
@@ -3144,7 +3143,7 @@ int gnutls_pkcs11_get_raw_issuer(const char *url, gnutls_x509_crt_t cert,
                                 unsigned int flags)
 {
        int ret;
-       struct find_issuer_st priv;
+       struct find_cert_st priv;
        uint8_t id[PKCS11_ID_SIZE];
        size_t id_size;
        struct p11_kit_uri *info = NULL;
@@ -3167,12 +3166,12 @@ int gnutls_pkcs11_get_raw_issuer(const char *url, gnutls_x509_crt_t cert,
        ret =
            gnutls_x509_crt_get_authority_key_id(cert, id, &id_size, NULL);
        if (ret >= 0) {
-               priv.issuer_key_id.data = id;
-               priv.issuer_key_id.size = id_size;
+               priv.key_id.data = id;
+               priv.key_id.size = id_size;
        }
 
-       priv.issuer_dn.data = cert->raw_issuer_dn.data;
-       priv.issuer_dn.size = cert->raw_issuer_dn.size;
+       priv.dn.data = cert->raw_issuer_dn.data;
+       priv.dn.size = cert->raw_issuer_dn.size;
        priv.flags = flags;
 
        ret = gnutls_pkcs11_obj_init(&priv.crt);
@@ -3182,7 +3181,7 @@ int gnutls_pkcs11_get_raw_issuer(const char *url, gnutls_x509_crt_t cert,
        }
 
        ret =
-           _pkcs11_traverse_tokens(find_issuer, &priv, info,
+           _pkcs11_traverse_tokens(find_cert, &priv, info,
                                    NULL, pkcs11_obj_flags_to_int(flags));
        if (ret < 0) {
                gnutls_assert();