feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for PKCS11 not properly exporting the public key due to a missing key type field. This broke due to changes in PR #3687. Also resolved mismatch of enum types for the key type check.

Browse Source
This commit is contained in:
David Garske
2021-02-05 11:49:31 -08:00
parent 714aa97490
commit 70b382e6cf
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/ecc.c
View File

@@ -7178,7 +7178,7 @@ int wc_ecc_export_x963(ecc_key* key, byte* out, word32* outLen)
if (key->type == ECC_PRIVATEKEY_ONLY) if (key->type == ECC_PRIVATEKEY_ONLY)
return ECC_PRIVATEONLY_E; return ECC_PRIVATEONLY_E;
if (key->type == ECC_STATE_NONE || if (key->type == 0 ||
wc_ecc_is_valid_idx(key->idx) == 0 || wc_ecc_is_valid_idx(key->idx) == 0 ||
key->dp == NULL) { key->dp == NULL) {
return ECC_BAD_ARG_E; return ECC_BAD_ARG_E;
@@ -11297,7 +11297,7 @@ static int wc_ecc_export_x963_compressed(ecc_key* key, byte* out, word32* outLen
if (key->type == ECC_PRIVATEKEY_ONLY) if (key->type == ECC_PRIVATEKEY_ONLY)
return ECC_PRIVATEONLY_E; return ECC_PRIVATEONLY_E;
if (key->type == ECC_STATE_NONE || if (key->type == 0 ||
wc_ecc_is_valid_idx(key->idx) == 0 || wc_ecc_is_valid_idx(key->idx) == 0 ||
key->dp == NULL) { key->dp == NULL) {
return ECC_BAD_ARG_E; return ECC_BAD_ARG_E;

4
wolfcrypt/src/wc_pkcs11.c
View File

@@ -935,6 +935,8 @@ static int Pkcs11CreateEccPublicKey(CK_OBJECT_HANDLE* publicKey,
if (len >= ASN_LONG_LENGTH) if (len >= ASN_LONG_LENGTH)
ecPoint[i++] = ASN_LONG_LENGTH | 1; ecPoint[i++] = ASN_LONG_LENGTH | 1;
ecPoint[i++] = len; ecPoint[i++] = len;
if (public_key->type == 0)
public_key->type = ECC_PUBLICKEY;
ret = wc_ecc_export_x963(public_key, ecPoint + i, &len); ret = wc_ecc_export_x963(public_key, ecPoint + i, &len);
} }
if (ret == 0) { if (ret == 0) {
@@ -1936,6 +1938,8 @@ static int Pkcs11FindEccKey(CK_OBJECT_HANDLE* key, CK_OBJECT_CLASS keyClass,
if (len >= ASN_LONG_LENGTH) if (len >= ASN_LONG_LENGTH)
ecPoint[i++] = (ASN_LONG_LENGTH | 1); ecPoint[i++] = (ASN_LONG_LENGTH | 1);
ecPoint[i++] = len; ecPoint[i++] = len;
if (public_key->type == 0)
public_key->type = ECC_PUBLICKEY;
ret = wc_ecc_export_x963(eccKey, ecPoint + i, &len); ret = wc_ecc_export_x963(eccKey, ecPoint + i, &len);
} }
if (ret == 0 && keyClass == CKO_PUBLIC_KEY) { if (ret == 0 && keyClass == CKO_PUBLIC_KEY) {