jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

BoringSSL: Implement crypto_ecdh_init()

Browse source 
BoringSSL does not provide some of the OpenSSL API that was used here,
so update this to use similar design to what was already done with DPP
key derivation.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-11-17 20:41:25 +02:00 committed by Jouni Malinen
parent 7721fe082b
commit f29761297b
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/crypto/crypto_openssl.c
View file

@ -1701,7 +1701,12 @@ struct crypto_ecdh * crypto_ecdh_init(int group)
{ {
struct crypto_ecdh *ecdh; struct crypto_ecdh *ecdh;
EVP_PKEY *params = NULL; EVP_PKEY *params = NULL;
#ifdef OPENSSL_IS_BORINGSSL
const EC_GROUP *ec_group;
EC_KEY *ec_params;
#else /* OPENSSL_IS_BORINGSSL */
EVP_PKEY_CTX *pctx = NULL; EVP_PKEY_CTX *pctx = NULL;
#endif /* OPENSSL_IS_BORINGSSL */
EVP_PKEY_CTX *kctx = NULL; EVP_PKEY_CTX *kctx = NULL;
ecdh = os_zalloc(sizeof(*ecdh)); ecdh = os_zalloc(sizeof(*ecdh));
@ -1712,6 +1717,22 @@ struct crypto_ecdh * crypto_ecdh_init(int group)
if (!ecdh->ec) if (!ecdh->ec)
goto fail; goto fail;
#ifdef OPENSSL_IS_BORINGSSL
ec_group = EC_GROUP_new_by_curve_name(ecdh->ec->nid);
ec_params = EC_KEY_new();
if (!ec_params || EC_KEY_set_group(ec_params, ec_group) != 1) {
wpa_printf(MSG_ERROR,
"BoringSSL: Failed to generate EC_KEY parameters");
goto fail;
}
EC_KEY_set_asn1_flag(ec_params, OPENSSL_EC_NAMED_CURVE);
params = EVP_PKEY_new();
if (!params || EVP_PKEY_set1_EC_KEY(params, ec_params) != 1) {
wpa_printf(MSG_ERROR,
"BoringSSL: Failed to generate EVP_PKEY parameters");
goto fail;
}
#else /* OPENSSL_IS_BORINGSSL */
pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL); pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL);
if (!pctx) if (!pctx)
goto fail; goto fail;
@ -1735,6 +1756,7 @@ struct crypto_ecdh * crypto_ecdh_init(int group)
ERR_error_string(ERR_get_error(), NULL)); ERR_error_string(ERR_get_error(), NULL));
goto fail; goto fail;
} }
#endif /* OPENSSL_IS_BORINGSSL */
kctx = EVP_PKEY_CTX_new(params, NULL); kctx = EVP_PKEY_CTX_new(params, NULL);
if (!kctx) if (!kctx)
@ -1755,7 +1777,9 @@ struct crypto_ecdh * crypto_ecdh_init(int group)
done: done:
EVP_PKEY_free(params); EVP_PKEY_free(params);
#ifndef OPENSSL_IS_BORINGSSL
EVP_PKEY_CTX_free(pctx); EVP_PKEY_CTX_free(pctx);
#endif /* OPENSSL_IS_BORINGSSL */
EVP_PKEY_CTX_free(kctx); EVP_PKEY_CTX_free(kctx);
return ecdh; return ecdh;