giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

framework-pkcs15: Avoid strict aliasing issues

This commit is contained in:
Jakub Jelen 2021-03-22 17:07:30 +01:00 committed by Jakub Jelen
parent 5f9085fedb
commit 370eda4bd8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pkcs11/framework-pkcs15.c
View File

@ -5564,7 +5564,7 @@ static CK_RV
get_ec_pubkey_params(struct sc_pkcs15_pubkey *key, CK_ATTRIBUTE_PTR attr)
{
struct sc_ec_parameters *ecp;
unsigned long value_len = 0;
size_t value_size = 0;
unsigned char *value = NULL;
int r;
@ -5577,22 +5577,22 @@ get_ec_pubkey_params(struct sc_pkcs15_pubkey *key, CK_ATTRIBUTE_PTR attr)
switch (key->algorithm) {
case SC_ALGORITHM_EDDSA:
case SC_ALGORITHM_XEDDSA:
r = sc_encode_oid(context, &key->alg_id->oid, &value, (size_t *)&value_len);
r = sc_encode_oid(context, &key->alg_id->oid, &value, &value_size);
if (r != SC_SUCCESS) {
return sc_to_cryptoki_error(r, NULL);
}
attr->ulValueLen = value_len;
attr->ulValueLen = (unsigned long)value_size;
if (attr->pValue == NULL_PTR) {
free(value);
return CKR_OK;
}
if (attr->ulValueLen < value_len) {
if (attr->ulValueLen < (unsigned long)value_size) {
free(value);
return CKR_BUFFER_TOO_SMALL;
}
memcpy(attr->pValue, value, value_len);
memcpy(attr->pValue, value, value_size);
free(value);
return CKR_OK;