diff options
Diffstat (limited to 'pkcs11.c')
| -rw-r--r-- | pkcs11.c | 18 |
1 files changed, 2 insertions, 16 deletions
@@ -1821,8 +1821,8 @@ static CK_RV p11_check_keypair_attributes(const p11_session_t *session, *public_flags = *private_flags = 0; - const CK_BBOOL * public_cka_private = NULL, * public_cka_token = NULL; - const CK_BBOOL *private_cka_private = NULL, *private_cka_token = NULL; + const CK_BBOOL * public_cka_private = NULL; + const CK_BBOOL *private_cka_private = NULL; const CK_BBOOL *private_cka_extractable = NULL; /* @@ -1838,9 +1838,6 @@ static CK_RV p11_check_keypair_attributes(const p11_session_t *session, P11_DESCRIPTOR_FORBIDDEN_BY_GENERATE)) != CKR_OK) goto fail; - if (type == CKA_TOKEN) - public_cka_token = val; - if (type == CKA_PRIVATE) public_cka_private = val; @@ -1856,9 +1853,6 @@ static CK_RV p11_check_keypair_attributes(const p11_session_t *session, P11_DESCRIPTOR_FORBIDDEN_BY_GENERATE)) != CKR_OK) goto fail; - if (type == CKA_TOKEN) - private_cka_token = val; - if (type == CKA_PRIVATE) private_cka_private = val; @@ -2218,8 +2212,6 @@ static CK_RV p11_check_create_attributes(const p11_session_t *session, const CK_ULONG ulCount, const p11_descriptor_t * const descriptor) { - const CK_BBOOL *cka_private = NULL; - const CK_BBOOL *cka_token = NULL; CK_RV rv = CKR_OK; int i; @@ -2237,12 +2229,6 @@ static CK_RV p11_check_create_attributes(const p11_session_t *session, if ((rv = p11_template_check_1(type, val, len, descriptor, P11_DESCRIPTOR_FORBIDDEN_BY_CREATEOBJECT)) != CKR_OK) goto fail; - - if (type == CKA_TOKEN) - cka_token = val; - - if (type == CKA_PRIVATE) - cka_private = val; } /* |