Skip to content

Add FIPS private lock handling to ECC key encoding #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SparkiDev merged 1 commit into from
Jun 23, 2025
Merged

Add FIPS private lock handling to ECC key encoding #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/wp_ecc_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,7 +2377,9 @@ static int wp_ecc_encode_pki_size(const wp_Ecc *ecc, size_t* keyLen)
int rc;
word32 len;

PRIVATE_KEY_UNLOCK();
rc = wc_EccKeyToPKCS8((ecc_key*)&ecc->key, NULL, &len);
PRIVATE_KEY_LOCK();
if (rc != LENGTH_ONLY_E) {
ok = 0;
}
Expand Down Expand Up @@ -2407,7 +2409,9 @@ static int wp_ecc_encode_pki(const wp_Ecc *ecc, unsigned char* keyData,
word32 len = (word32)*keyLen;

/* TODO: for older versions, curve is always included! */
PRIVATE_KEY_UNLOCK();
rc = wc_EccKeyToPKCS8((ecc_key*)&ecc->key, keyData, &len);
PRIVATE_KEY_LOCK();
if (rc <= 0) {
ok = 0;
}
Expand All @@ -2434,7 +2438,9 @@ static int wp_ecc_encode_epki_size(const wp_Ecc *ecc, size_t* keyLen)
int rc;
word32 len;

PRIVATE_KEY_UNLOCK();
rc = wc_EccKeyToPKCS8((ecc_key*)&ecc->key, NULL, &len);
PRIVATE_KEY_LOCK();
if (rc != LENGTH_ONLY_E) {
ok = 0;
}
Expand Down Expand Up @@ -2469,7 +2475,9 @@ static int wp_ecc_encode_epki(const wp_EccEncDecCtx* ctx, const wp_Ecc *ecc,
word32 len = (word32)*keyLen;

/* Encode key. */
PRIVATE_KEY_UNLOCK();
rc = wc_EccKeyToPKCS8((ecc_key*)&ecc->key, keyData, &len);
PRIVATE_KEY_LOCK();
if (rc <= 0) {
ok = 0;
}
Expand Down