libckteec: Fix CK_ULONG conversions in C_GetTokenInfo() #367
Conversation
libckteec/src/pkcs11_token.c
Outdated
| info->ulTotalPublicMemory = TO_CK_ULONG(ta_info->total_public_memory); | ||
| info->ulFreePublicMemory = TO_CK_ULONG(ta_info->free_public_memory); | ||
| info->ulTotalPrivateMemory = TO_CK_ULONG(ta_info->total_private_memory); | ||
| info->ulFreePrivateMemory = TO_CK_ULONG(ta_info->free_private_memory); |
There was a problem hiding this comment.
I'm not found of using singed signed/unsigned conversion to treat 32b/64b special case CK_UNAVAILABLE_INFORMATION.
I would prefer an explicit conversion here:
static CK_ULONG maybe_unavail(uint32_t ta_value)
{
if (ta_value == PKCS11_CK_UNAVAILABLE_INFORMATION)
return CK_UNAVAILABLE_INFORMATION;
else
return ta_value;
}(edited: fix typo + i think the cast is useless)
Also, as per the spec, this specific value does not apply to ulMaxPinLen and ulMinPinLen.
There was a problem hiding this comment.
OK. Moved helper also to pkcs11_token.c.
Thanks for spotting the "small print" about CK_UNAVAILABLE_INFORMATION in CK_TOKEN_INFO.
Also fixed the pin fields.
|
My laptop got broken and is in service and my dev environment is in there. I try to do the changes as soon as possible. |
vesajaaskelainen
force-pushed
the
pkcs11-fix-get-token-info
branch
from
9b76a10 to
01c69d8
Compare
|
Addressed review comments and rebased the PR. |
|
|
On 64 bit systems uint32_t cannot handle CK_ULONG defined CK_UNAVAILABLE_INFORMATION. This adds helper maybe_unavail() to assist in conversion. Signed-off-by: Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com> Reviewed-by: Etienne Carriere <etienne.carriere@foss.st.com>
When running in 64 bit CPU things like ulMaxSessionCount would get value of 4294967295 instead of ~0. Adjust all other CK_ULONG fields supporting CK_UNAVAILABLE_INFORMATION. Signed-off-by: Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com> Reviewed-by: Etienne Carriere <etienne.carriere@foss.st.com>
vesajaaskelainen
force-pushed
the
pkcs11-fix-get-token-info
branch
from
01c69d8 to
3ea8ba2
Compare
Thanks for the review! Applied tags and rebased on top of master and tested it. |
When running in 64 bit CPU things like
ulMaxSessionCountwould get value of4294967295instead of~0.This fixes problem with https://github.com/latchset/pkcs11-provider usage.
Related issue in
pkcs11-providerproject:latchset/pkcs11-provider#312
Test case for this:
OP-TEE/optee_test#718