pkcs11: use ctx as variable name for ck_object_handle_t for clarity

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 6ca5abe8d947671f820ed2dee19caeef9c3fa07d..315a2ac490a8f4a3a08e78845c81c55e1930158a 100644 (file)
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -412,7 +412,7 @@ gnutls_pkcs11_obj_set_info(gnutls_pkcs11_obj_t obj,
        struct p11_kit_uri *info = obj->info;
        struct pkcs11_session_info sinfo;
        struct ck_attribute a[4];
-       ck_object_handle_t pkobj[2];
+       ck_object_handle_t ctx[2];
        ck_certificate_type_t type;
        ck_object_class_t class;
        unsigned long count;
@@ -448,7 +448,7 @@ gnutls_pkcs11_obj_set_info(gnutls_pkcs11_obj_t obj,
                goto cleanup;
        }
 
-       rv = pkcs11_find_objects(sinfo.module, sinfo.pks, pkobj, 2, &count);
+       rv = pkcs11_find_objects(sinfo.module, sinfo.pks, ctx, 2, &count);
        if (rv != CKR_OK) {
                gnutls_assert();
                _gnutls_debug_log("p11: FindObjects failed.\n");
@@ -480,7 +480,7 @@ gnutls_pkcs11_obj_set_info(gnutls_pkcs11_obj_t obj,
                a[0].value = (void*)data;
                a[0].value_len = data_size;
 
-               rv = pkcs11_set_attribute_value(sinfo.module, sinfo.pks, pkobj[0], a, 1);
+               rv = pkcs11_set_attribute_value(sinfo.module, sinfo.pks, ctx[0], a, 1);
                if (rv != CKR_OK) {
                        gnutls_assert();
                        _gnutls_debug_log("p11: set_attribute_value failed.\n");
@@ -494,7 +494,7 @@ gnutls_pkcs11_obj_set_info(gnutls_pkcs11_obj_t obj,
                a[0].value = (void*)data;
                a[0].value_len = data_size;
 
-               rv = pkcs11_set_attribute_value(sinfo.module, sinfo.pks, pkobj[0], a, 1);
+               rv = pkcs11_set_attribute_value(sinfo.module, sinfo.pks, ctx[0], a, 1);
                if (rv != CKR_OK) {
                        gnutls_assert();
                        _gnutls_debug_log("p11: set_attribute_value failed.\n");
@@ -1514,7 +1514,7 @@ pkcs11_obj_import(ck_object_class_t class, gnutls_pkcs11_obj_t obj,
 }
 
 int pkcs11_read_pubkey(struct ck_function_list *module,
-                      ck_session_handle_t pks, ck_object_handle_t obj,
+                      ck_session_handle_t pks, ck_object_handle_t ctx,
                       ck_key_type_t key_type, gnutls_pkcs11_obj_t pobj)
 {
        struct ck_attribute a[4];
@@ -1544,7 +1544,7 @@ int pkcs11_read_pubkey(struct ck_function_list *module,
                a[1].value = tmp2;
                a[1].value_len = tmp2_size;
 
-               if (pkcs11_get_attribute_value(module, pks, obj, a, 2) ==
+               if (pkcs11_get_attribute_value(module, pks, ctx, a, 2) ==
                    CKR_OK) {
 
                        pobj->pubkey[0].data = a[0].value;
@@ -1568,7 +1568,7 @@ int pkcs11_read_pubkey(struct ck_function_list *module,
                a[1].value = tmp2;
                a[1].value_len = tmp2_size;
 
-               if ((rv = pkcs11_get_attribute_value(module, pks, obj, a, 2)) ==
+               if ((rv = pkcs11_get_attribute_value(module, pks, ctx, a, 2)) ==
                    CKR_OK) {
                        ret =
                            _gnutls_set_datum(&pobj->pubkey[0], a[0].value,
@@ -1602,7 +1602,7 @@ int pkcs11_read_pubkey(struct ck_function_list *module,
                a[1].value = tmp2;
                a[1].value_len = tmp2_size;
 
-               if ((rv = pkcs11_get_attribute_value(module, pks, obj, a, 2)) ==
+               if ((rv = pkcs11_get_attribute_value(module, pks, ctx, a, 2)) ==
                    CKR_OK) {
                        pobj->pubkey[2].data = a[0].value;
                        pobj->pubkey[2].size = a[0].value_len;
@@ -1626,7 +1626,7 @@ int pkcs11_read_pubkey(struct ck_function_list *module,
                a[1].value = tmp2;
                a[1].value_len = tmp2_size;
 
-               if ((rv = pkcs11_get_attribute_value(module, pks, obj, a, 2)) ==
+               if ((rv = pkcs11_get_attribute_value(module, pks, ctx, a, 2)) ==
                    CKR_OK) {
 
                        pobj->pubkey[0].data = a[0].value;
@@ -1750,7 +1750,7 @@ pkcs11_obj_import_pubkey(struct ck_function_list *module,
 }
 
 static int
-pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
+pkcs11_import_object(ck_object_handle_t ctx, ck_object_class_t class,
                     struct pkcs11_session_info *sinfo,
                     struct ck_token_info *tinfo, struct ck_info *lib_info,
                     gnutls_pkcs11_obj_t pobj)
@@ -1769,7 +1769,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP;
 
@@ -1777,7 +1777,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP;
 
@@ -1785,7 +1785,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE;
 
@@ -1793,7 +1793,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED;
 
@@ -1801,7 +1801,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE;
 
@@ -1809,7 +1809,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_EXTRACTABLE;
 
@@ -1817,7 +1817,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_NEVER_EXTRACTABLE;
 
@@ -1825,7 +1825,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &category;
        a[0].value_len = sizeof(category);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && category == 2)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_CA;
 
@@ -1833,7 +1833,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
-       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv == CKR_OK && b != 0)
                pobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_ALWAYS_AUTH;
 
@@ -1842,7 +1842,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = label_tmp;
        a[0].value_len = sizeof(label_tmp);
        rv = pkcs11_get_attribute_value
-           (sinfo->module, sinfo->pks, obj, a, 1);
+           (sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv != CKR_OK) {
                gnutls_assert();
                label.data = NULL;
@@ -1856,7 +1856,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = id_tmp;
        a[0].value_len = sizeof(id_tmp);
        rv = pkcs11_get_attribute_value
-           (sinfo->module, sinfo->pks, obj, a, 1);
+           (sinfo->module, sinfo->pks, ctx, a, 1);
        if (rv != CKR_OK) {
                gnutls_assert();
                id.data = NULL;
@@ -1870,7 +1870,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
                return gnutls_assert_val(GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE);
 
        rv = pkcs11_get_attribute_avalue
-           (sinfo->module, sinfo->pks, obj, CKA_VALUE, &data);
+           (sinfo->module, sinfo->pks, ctx, CKA_VALUE, &data);
        if (rv != CKR_OK) {
                gnutls_assert();
                /* data will be null */
@@ -1880,7 +1880,7 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
                ret =
                    pkcs11_obj_import_pubkey(sinfo->module,
                                             sinfo->pks,
-                                            obj,
+                                            ctx,
                                             pobj,
                                             &data,
                                             &id, &label,
@@ -1915,7 +1915,7 @@ find_obj_url_cb(struct ck_function_list *module, struct pkcs11_session_info *sin
        ck_certificate_type_t type;
        ck_object_class_t class;
        ck_rv_t rv;
-       ck_object_handle_t objx = CK_INVALID_HANDLE;
+       ck_object_handle_t ctx = CK_INVALID_HANDLE;
        unsigned long count;
        unsigned a_vals;
        int found = 0, ret;
@@ -1950,9 +1950,9 @@ find_obj_url_cb(struct ck_function_list *module, struct pkcs11_session_info *sin
                goto cleanup;
        }
 
-       if (pkcs11_find_objects(sinfo->module, sinfo->pks, &objx, 1, &count) == CKR_OK &&
+       if (pkcs11_find_objects(sinfo->module, sinfo->pks, &ctx, 1, &count) == CKR_OK &&
            count == 1) {
-               ret = pkcs11_import_object(objx, class, sinfo, tinfo, lib_info, find_data->obj);
+               ret = pkcs11_import_object(ctx, class, sinfo, tinfo, lib_info, find_data->obj);
                if (ret >= 0) {
                        found = 1;
                }
@@ -1971,9 +1971,9 @@ find_obj_url_cb(struct ck_function_list *module, struct pkcs11_session_info *sin
       cleanup:
        pkcs11_find_objects_final(sinfo);
 
-       if (ret == 0 && find_data->overwrite_exts && find_data->obj->raw.size > 0 && objx != CK_INVALID_HANDLE) {
+       if (ret == 0 && find_data->overwrite_exts && find_data->obj->raw.size > 0 && ctx != CK_INVALID_HANDLE) {
                gnutls_datum_t spki;
-               rv = pkcs11_get_attribute_avalue(sinfo->module, sinfo->pks, objx, CKA_PUBLIC_KEY_INFO, &spki);
+               rv = pkcs11_get_attribute_avalue(sinfo->module, sinfo->pks, ctx, CKA_PUBLIC_KEY_INFO, &spki);
                if (rv == CKR_OK) {
                        ret = pkcs11_override_cert_exts(sinfo, &spki, &find_data->obj->raw);
                        gnutls_free(spki.data);
@@ -2609,7 +2609,7 @@ find_privkeys(struct pkcs11_session_info *sinfo,
        struct ck_attribute a[3];
        ck_object_class_t class;
        ck_rv_t rv;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        unsigned long count, current;
        char certid_tmp[PKCS11_ID_SIZE];
        int ret;
@@ -2631,7 +2631,7 @@ find_privkeys(struct pkcs11_session_info *sinfo,
 
        list->key_ids_size = 0;
        while (pkcs11_find_objects
-              (sinfo->module, sinfo->pks, &obj, 1, &count) == CKR_OK
+              (sinfo->module, sinfo->pks, &ctx, 1, &count) == CKR_OK
               && count == 1) {
                list->key_ids_size++;
        }
@@ -2663,7 +2663,7 @@ find_privkeys(struct pkcs11_session_info *sinfo,
 
        current = 0;
        while (pkcs11_find_objects
-              (sinfo->module, sinfo->pks, &obj, 1, &count) == CKR_OK
+              (sinfo->module, sinfo->pks, &ctx, 1, &count) == CKR_OK
               && count == 1) {
 
                a[0].type = CKA_ID;
@@ -2673,7 +2673,7 @@ find_privkeys(struct pkcs11_session_info *sinfo,
                _gnutls_buffer_init(&list->key_ids[current]);
 
                if (pkcs11_get_attribute_value
-                   (sinfo->module, sinfo->pks, obj, a, 1) == CKR_OK) {
+                   (sinfo->module, sinfo->pks, ctx, a, 1) == CKR_OK) {
                        ret = _gnutls_buffer_append_data(&list->key_ids[current],
                                                   a[0].value,
                                                   a[0].value_len);
@@ -2709,7 +2709,7 @@ find_objs_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
        ck_bool_t trusted;
        unsigned long category;
        ck_rv_t rv;
-       ck_object_handle_t *objs = NULL;
+       ck_object_handle_t *ctx = NULL;
        unsigned long count;
        char certid_tmp[PKCS11_ID_SIZE];
        int ret;
@@ -2847,14 +2847,14 @@ find_objs_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
                return pkcs11_rv_to_err(rv);
        }
 
-       objs = gnutls_malloc(OBJECTS_A_TIME*sizeof(objs[0]));
-       if (objs == NULL) {
+       ctx = gnutls_malloc(OBJECTS_A_TIME*sizeof(ctx[0]));
+       if (ctx == NULL) {
                ret = gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
                goto fail;
        }
 
        while (pkcs11_find_objects
-              (sinfo->module, sinfo->pks, objs, OBJECTS_A_TIME, &count) == CKR_OK
+              (sinfo->module, sinfo->pks, ctx, OBJECTS_A_TIME, &count) == CKR_OK
               && count > 0) {
                unsigned j;
                gnutls_datum_t id;
@@ -2871,7 +2871,7 @@ find_objs_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
                        a[0].value_len = sizeof certid_tmp;
 
                        if (pkcs11_get_attribute_value
-                           (sinfo->module, sinfo->pks, objs[j], a, 1) == CKR_OK) {
+                           (sinfo->module, sinfo->pks, ctx[j], a, 1) == CKR_OK) {
                                id.data = a[0].value;
                                id.size = a[0].value_len;
                        } else {
@@ -2885,7 +2885,7 @@ find_objs_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
                                a[0].value_len = sizeof class;
 
                                rv = pkcs11_get_attribute_value(sinfo->module,
-                                                          sinfo->pks, objs[j], a, 1);
+                                                          sinfo->pks, ctx[j], a, 1);
                                if (rv != CKR_OK) {
                                        class = -1;
                                }
@@ -2912,7 +2912,7 @@ find_objs_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
                                goto fail;
                        }
 
-                       ret = pkcs11_import_object(objs[j], class, sinfo,
+                       ret = pkcs11_import_object(ctx[j], class, sinfo,
                                             tinfo, lib_info,
                                             find_data->p_list[find_data->current]);
                        if (ret < 0) {
@@ -2925,13 +2925,13 @@ find_objs_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
                }
        }
 
-       gnutls_free(objs);
+       gnutls_free(ctx);
        pkcs11_find_objects_final(sinfo);
 
        return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;   /* continue until all tokens have been checked */
 
       fail:
-       gnutls_free(objs);
+       gnutls_free(ctx);
        pkcs11_find_objects_final(sinfo);
        if (plist.key_ids != NULL) {
                for (i = 0; i < plist.key_ids_size; i++) {
@@ -3478,7 +3478,7 @@ find_cert_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
        ck_object_class_t class = -1;
        ck_certificate_type_t type = (ck_certificate_type_t) - 1;
        ck_rv_t rv;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        unsigned long count, a_vals;
        int found = 0, ret;
        struct find_cert_st *priv = input;
@@ -3586,7 +3586,7 @@ find_cert_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
                }
 
                while (pkcs11_find_objects
-                      (sinfo->module, sinfo->pks, &obj, 1,
+                      (sinfo->module, sinfo->pks, &ctx, 1,
                        &count) == CKR_OK && count == 1) {
 
                        if (priv->need_import == 0 && !(priv->flags & GNUTLS_PKCS11_OBJ_FLAG_COMPARE)
@@ -3604,10 +3604,10 @@ find_cert_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
                        a[1].value_len = sizeof(id_tmp);
 
                        /* data will contain the certificate */
-                       rv = pkcs11_get_attribute_avalue(sinfo->module, sinfo->pks, obj, CKA_VALUE, &data);
+                       rv = pkcs11_get_attribute_avalue(sinfo->module, sinfo->pks, ctx, CKA_VALUE, &data);
 
                        if (rv == CKR_OK && pkcs11_get_attribute_value
-                           (sinfo->module, sinfo->pks, obj, a,
+                           (sinfo->module, sinfo->pks, ctx, a,
                             2) == CKR_OK) {
                                label.data = a[0].value;
                                label.size = a[0].value_len;
@@ -3636,7 +3636,7 @@ find_cert_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo,
 
                        if (priv->flags & GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT) {
                                gnutls_datum_t spki;
-                               rv = pkcs11_get_attribute_avalue(sinfo->module, sinfo->pks, obj, CKA_PUBLIC_KEY_INFO, &spki);
+                               rv = pkcs11_get_attribute_avalue(sinfo->module, sinfo->pks, ctx, CKA_PUBLIC_KEY_INFO, &spki);
                                if (rv == CKR_OK) {
                                        ret = pkcs11_override_cert_exts(sinfo, &spki, &data);
                                        gnutls_free(spki.data);

diff --git a/lib/pkcs11_int.c b/lib/pkcs11_int.c
index e8517d5cfdceb2177e6f783d73637bd38e5d87b0..c66a08cece0ef76d13b7ef5e90b18ba8e36b3518 100644 (file)
--- a/lib/pkcs11_int.c
+++ b/lib/pkcs11_int.c
@@ -203,21 +203,21 @@ pkcs11_generate_key_pair(struct ck_function_list * module,
                         unsigned long pub_templ_count,
                         struct ck_attribute * priv_templ,
                         unsigned long priv_templ_count,
-                        ck_object_handle_t * pub,
-                        ck_object_handle_t * priv)
+                        ck_object_handle_t * pub_ctx,
+                        ck_object_handle_t * priv_ctx)
 {
        return (module)->C_GenerateKeyPair(sess, mechanism, pub_templ,
                                           pub_templ_count, priv_templ,
-                                          priv_templ_count, pub, priv);
+                                          priv_templ_count, pub_ctx, priv_ctx);
 }
 
 ck_rv_t
 pkcs11_decrypt_init(struct ck_function_list * module,
                    ck_session_handle_t sess,
                    struct ck_mechanism * mechanism,
-                   ck_object_handle_t key)
+                   ck_object_handle_t key_ctx)
 {
-       return (module)->C_DecryptInit(sess, mechanism, key);
+       return (module)->C_DecryptInit(sess, mechanism, key_ctx);
 }
 
 ck_rv_t
@@ -235,16 +235,16 @@ ck_rv_t
 pkcs11_create_object(struct ck_function_list * module,
                     ck_session_handle_t sess,
                     struct ck_attribute * templ,
-                    unsigned long count, ck_object_handle_t * object)
+                    unsigned long count, ck_object_handle_t * ctx)
 {
-       return (module)->C_CreateObject(sess, templ, count, object);
+       return (module)->C_CreateObject(sess, templ, count, ctx);
 }
 
 ck_rv_t
 pkcs11_destroy_object(struct ck_function_list * module,
-                     ck_session_handle_t sess, ck_object_handle_t object)
+                     ck_session_handle_t sess, ck_object_handle_t ctx)
 {
-       return (module)->C_DestroyObject(sess, object);
+       return (module)->C_DestroyObject(sess, ctx);
 }
 
 ck_rv_t

diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 531f646f5a697c70091f0744997f1c489fd25e00..84de556734dd1b09fea8bee94df4e648059bb486 100644 (file)
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -183,11 +183,11 @@ gnutls_pkcs11_privkey_get_info(gnutls_pkcs11_privkey_t pkey,
 static int
 find_object(struct pkcs11_session_info *sinfo,
            struct pin_info_st *pin_info,
-           ck_object_handle_t * _obj,
+           ck_object_handle_t * _ctx,
            struct p11_kit_uri *info, unsigned int flags)
 {
        int ret;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        struct ck_attribute *attrs;
        unsigned long attr_count;
        unsigned long count;
@@ -211,9 +211,9 @@ find_object(struct pkcs11_session_info *sinfo,
                goto fail;
        }
 
-       if (pkcs11_find_objects(sinfo->module, sinfo->pks, &obj, 1, &count)
+       if (pkcs11_find_objects(sinfo->module, sinfo->pks, &ctx, 1, &count)
            == CKR_OK && count == 1) {
-               *_obj = obj;
+               *_ctx = ctx;
                pkcs11_find_objects_final(sinfo);
                return 0;
        }
@@ -752,7 +752,7 @@ gnutls_pkcs11_privkey_generate3(const char *url, gnutls_pk_algorithm_t pk,
        struct p11_kit_uri *info = NULL;
        ck_rv_t rv;
        struct ck_attribute a[22], p[22];
-       ck_object_handle_t pub, priv;
+       ck_object_handle_t pub_ctx, priv_ctx;
        unsigned long _bits = bits;
        int a_val, p_val;
        struct ck_mechanism mech;
@@ -988,7 +988,7 @@ gnutls_pkcs11_privkey_generate3(const char *url, gnutls_pk_algorithm_t pk,
        }
 
        rv = pkcs11_generate_key_pair(sinfo.module, sinfo.pks, &mech, a,
-                                     a_val, p, p_val, &pub, &priv);
+                                     a_val, p, p_val, &pub_ctx, &priv_ctx);
        if (rv != CKR_OK) {
                gnutls_assert();
                _gnutls_debug_log("p11: %s\n", pkcs11_strerror(rv));
@@ -1014,7 +1014,7 @@ gnutls_pkcs11_privkey_generate3(const char *url, gnutls_pk_algorithm_t pk,
                obj->pk_algorithm = pk;
                obj->type = GNUTLS_PKCS11_OBJ_PUBKEY;
                ret =
-                   pkcs11_read_pubkey(sinfo.module, sinfo.pks, pub,
+                   pkcs11_read_pubkey(sinfo.module, sinfo.pks, pub_ctx,
                                       key_type, obj);
                if (ret < 0) {
                        gnutls_assert();

diff --git a/lib/pkcs11_secret.c b/lib/pkcs11_secret.c
index a53763e7dc7afa409efc4ca61c0bc8005d3abf37..aa3e5ce7cdf13db87bec82bab16cc902c190da50 100644 (file)
--- a/lib/pkcs11_secret.c
+++ b/lib/pkcs11_secret.c
@@ -54,7 +54,7 @@ gnutls_pkcs11_copy_secret_key(const char *token_url, gnutls_datum_t * key,
        ck_rv_t rv;
        struct ck_attribute a[12];
        ck_object_class_t class = CKO_SECRET_KEY;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        ck_key_type_t keytype = CKK_GENERIC_SECRET;
        ck_bool_t tval = 1;
        int a_val;
@@ -129,7 +129,7 @@ gnutls_pkcs11_copy_secret_key(const char *token_url, gnutls_datum_t * key,
        a[a_val].value_len = sizeof(tval);
        a_val++;
 
-       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &obj);
+       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &ctx);
        if (rv != CKR_OK) {
                gnutls_assert();
                _gnutls_debug_log("p11: %s\n", pkcs11_strerror(rv));

diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c
index 823ae7435b4c037165aafee7b3c1ca8faaaef1e6..c12d8ace732e2a4c19affa87bd00d269fb4c9ba3 100644 (file)
--- a/lib/pkcs11_write.c
+++ b/lib/pkcs11_write.c
@@ -103,7 +103,7 @@ gnutls_pkcs11_copy_x509_crt2(const char *token_url,
        struct ck_attribute a[MAX_ASIZE];
        ck_object_class_t class = CKO_CERTIFICATE;
        ck_certificate_type_t type = CKC_X_509;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        unsigned a_val;
        struct pkcs11_session_info sinfo;
        
@@ -216,7 +216,7 @@ gnutls_pkcs11_copy_x509_crt2(const char *token_url,
 
        mark_flags(flags, a, &a_val);
 
-       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &obj);
+       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &ctx);
        if (rv != CKR_OK) {
                gnutls_assert();
                _gnutls_debug_log("p11: %s\n", pkcs11_strerror(rv));
@@ -376,7 +376,7 @@ gnutls_pkcs11_copy_pubkey(const char *token_url,
        struct ck_attribute a[MAX_ASIZE];
        gnutls_pk_algorithm_t pk;
        ck_object_class_t class = CKO_PUBLIC_KEY;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        unsigned a_val;
        ck_key_type_t type;
        struct pkcs11_session_info sinfo;
@@ -475,7 +475,7 @@ gnutls_pkcs11_copy_pubkey(const char *token_url,
                a_val++;
        }
 
-       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &obj);
+       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &ctx);
        if (rv != CKR_OK) {
                gnutls_assert();
                _gnutls_debug_log("p11: %s\n", pkcs11_strerror(rv));
@@ -525,7 +525,7 @@ gnutls_pkcs11_copy_attached_extension(const char *token_url,
        struct p11_kit_uri *info = NULL;
        ck_rv_t rv;
        struct ck_attribute a[MAX_ASIZE];
-       ck_object_handle_t hobj;
+       ck_object_handle_t ctx;
        unsigned a_vals;
        struct pkcs11_session_info sinfo;
        ck_object_class_t class;
@@ -582,7 +582,7 @@ gnutls_pkcs11_copy_attached_extension(const char *token_url,
                a[a_vals++].value_len = strlen(label);
        }
 
-       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_vals, &hobj);
+       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_vals, &ctx);
        if (rv != CKR_OK) {
                gnutls_assert();
                _gnutls_debug_log("p11: %s\n", pkcs11_strerror(rv));
@@ -631,7 +631,7 @@ gnutls_pkcs11_copy_x509_privkey2(const char *token_url,
        uint8_t id[20];
        struct ck_attribute a[32];
        ck_object_class_t class = CKO_PRIVATE_KEY;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        ck_key_type_t type;
        int a_val;
        gnutls_pk_algorithm_t pk;
@@ -916,7 +916,7 @@ gnutls_pkcs11_copy_x509_privkey2(const char *token_url,
        a[a_val].value_len = sizeof(type);
        a_val++;
 
-       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &obj);
+       rv = pkcs11_create_object(sinfo.module, sinfo.pks, a, a_val, &ctx);
        if (rv != CKR_OK) {
                gnutls_assert();
                _gnutls_debug_log("p11: %s\n", pkcs11_strerror(rv));
@@ -984,7 +984,7 @@ delete_obj_url_cb(struct ck_function_list *module, struct pkcs11_session_info *s
        ck_object_class_t class;
        ck_certificate_type_t type = (ck_certificate_type_t) - 1;
        ck_rv_t rv;
-       ck_object_handle_t obj;
+       ck_object_handle_t ctx;
        unsigned long count, a_vals;
        int found = 0, ret;
 
@@ -1048,9 +1048,9 @@ delete_obj_url_cb(struct ck_function_list *module, struct pkcs11_session_info *s
        }
 
        while (pkcs11_find_objects
-              (sinfo->module, sinfo->pks, &obj, 1, &count) == CKR_OK
+              (sinfo->module, sinfo->pks, &ctx, 1, &count) == CKR_OK
               && count == 1) {
-               rv = pkcs11_destroy_object(sinfo->module, sinfo->pks, obj);
+               rv = pkcs11_destroy_object(sinfo->module, sinfo->pks, ctx);
                if (rv != CKR_OK) {
                        _gnutls_debug_log
                            ("p11: Cannot destroy object: %s\n",