Skip to content

Commit dfc714d

Browse files
use wc_ecc_key_get_priv macro
1 parent 5f74cb1 commit dfc714d

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

src/wp_ecc_kmgmt.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,8 @@ static wp_Ecc* wp_ecc_dup(const wp_Ecc *src, int selection)
428428
if (ok && src->hasPriv &&
429429
((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)) {
430430
dst->hasPriv = 1;
431-
rc = mp_copy(&(src->key.k), &(dst->key.k));
431+
rc = mp_copy(wc_ecc_key_get_priv(&src->key),
432+
wc_ecc_key_get_priv(&dst->key));
432433
if (rc != 0) {
433434
ok = 0;
434435
}
@@ -770,7 +771,7 @@ static int wp_ecc_get_params(wp_Ecc* ecc, OSSL_PARAM params[])
770771
ok = 0;
771772
}
772773
if (ok && (!wp_params_set_mp(params, OSSL_PKEY_PARAM_PRIV_KEY,
773-
&(ecc->key.k)))) {
774+
wc_ecc_key_get_priv(&ecc->key)))) {
774775
ok = 0;
775776
}
776777
/* Private key. */
@@ -837,7 +838,8 @@ static int wp_ecc_match(wp_Ecc* ecc1, wp_Ecc* ecc2, int selection)
837838
ok = 0;
838839
}
839840
if (ok && ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) &&
840-
(mp_cmp(&(ecc1->key.k), &(ecc2->key.k)) != MP_EQ)) {
841+
(mp_cmp(wc_ecc_key_get_priv(&ecc1->key),
842+
wc_ecc_key_get_priv(&ecc2->key)) != MP_EQ)) {
841843
ok = 0;
842844
}
843845
if (ok && ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) &&
@@ -993,10 +995,10 @@ static int wp_ecc_import_keypair(wp_Ecc* ecc, const OSSL_PARAM params[],
993995
OSSL_PKEY_PARAM_PUB_KEY);
994996
}
995997
if (ok && priv && (!wp_params_get_mp(params, OSSL_PKEY_PARAM_PRIV_KEY,
996-
&(ecc->key.k)))) {
998+
wc_ecc_key_get_priv(&ecc->key)))) {
997999
ok = 0;
9981000
}
999-
if (ok && (!mp_iszero(&(ecc->key.k)))) {
1001+
if (ok && (!mp_iszero(wc_ecc_key_get_priv(&ecc->key)))) {
10001002
ecc->key.type = ECC_PRIVATEKEY;
10011003
ecc->hasPriv = 1;
10021004
}
@@ -1255,7 +1257,7 @@ static size_t wp_ecc_export_keypair_alloc_size(wp_Ecc* ecc, int priv)
12551257
/* Public key. */
12561258
size_t len = WP_ECC_PUBLIC_KEY_SIZE(ecc);
12571259
if (priv) {
1258-
len += mp_unsigned_bin_size(&(ecc->key.k));
1260+
len += mp_unsigned_bin_size(wc_ecc_key_get_priv(&ecc->key));
12591261
}
12601262
return len;
12611263
}
@@ -1291,7 +1293,8 @@ static int wp_ecc_export_keypair(wp_Ecc* ecc, OSSL_PARAM* params, int* pIdx,
12911293
data + *idx, outLen);
12921294
*idx += outLen;
12931295
if (priv && (!wp_param_set_mp(&params[i++],
1294-
OSSL_PKEY_PARAM_PRIV_KEY, &(ecc->key.k), data, idx))) {
1296+
OSSL_PKEY_PARAM_PRIV_KEY, wc_ecc_key_get_priv(&ecc->key), data,
1297+
idx))) {
12951298
ok = 0;
12961299
}
12971300
}

0 commit comments

Comments
 (0)