DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

wolfSSL: Add crypto_ecdh_init2()

Browse source 
Signed-off-by: Juliusz Sosinowicz <juliusz@wolfssl.com>
This commit is contained in:
Juliusz Sosinowicz 2023-03-08 18:18:48 +01:00 committed by Jouni Malinen
parent 15a7c9b9e3
commit 732ed5abe1
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/crypto/crypto_wolfssl.c
View file

@ -2012,6 +2012,12 @@ int crypto_ec_point_cmp(const struct crypto_ec *e,
return wc_ecc_cmp_point((ecc_point *) a, (ecc_point *) b);
}
struct crypto_ec_key {
ecc_key *eckey;
WC_RNG *rng; /* Needs to be initialized before use.
* *NOT* initialized in crypto_ec_key_init */
};
struct crypto_ecdh {
struct crypto_ec *ec;
@ -2082,6 +2088,36 @@ struct crypto_ecdh * crypto_ecdh_init(int group)
}
struct crypto_ecdh * crypto_ecdh_init2(int group, struct crypto_ec_key *own_key)
{
struct crypto_ecdh *ret = NULL;
if (!own_key || crypto_ec_key_group(own_key) != group) {
LOG_INVALID_PARAMETERS();
return NULL;
}
ret = _crypto_ecdh_init(group);
if (ret) {
/* Already init'ed to the right group. Enough to substitute the
* key. */
ecc_key_deinit(ret->ec->key);
ret->ec->key = own_key->eckey;
ret->ec->own_key = false;
#if defined(ECC_TIMING_RESISTANT) && !defined(WOLFSSL_OLD_FIPS)
if (!ret->ec->key->rng) {
int err = wc_ecc_set_rng(ret->ec->key, ret->rng);
if (err != 0)
LOG_WOLF_ERROR_FUNC(wc_ecc_set_rng, err);
}
#endif /* ECC_TIMING_RESISTANT && !CONFIG_FIPS */
}
return ret;
}
void crypto_ecdh_deinit(struct crypto_ecdh *ecdh)
{
if (ecdh) {
@ -2194,14 +2230,6 @@ size_t crypto_ecdh_prime_len(struct crypto_ecdh *ecdh)
return crypto_ec_prime_len(ecdh->ec);
}
struct crypto_ec_key {
ecc_key *eckey;
WC_RNG *rng; /* Needs to be initialized before use.
* *NOT* initialized in crypto_ec_key_init */
};
static struct crypto_ec_key * crypto_ec_key_init(void)
{
struct crypto_ec_key *key;