diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-06-03 14:29:45 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-06-03 14:31:58 +0200 |
| commit | 21149c23b5ba1db6de9252943437d314a0a6b235 (patch) | |
| tree | f8553c27f911ae5be14267f4c99ce16edeaf5fed /lib/pkcs11_privkey.c | |
| parent | 7d454dd0a847f2d7d6dffc88a4775af0f2984bb0 (diff) | |
| download | gnutls-21149c23b5ba1db6de9252943437d314a0a6b235.tar.gz | |
pkcs11: use ctx as variable name for ck_object_handle_t for clarity
Diffstat (limited to 'lib/pkcs11_privkey.c')
| -rw-r--r-- | lib/pkcs11_privkey.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c index 531f646f5a..84de556734 100644 --- 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(); |