提交 e395ba22 编写于 作者: M Matt Caswell

When calling EC_POINT_point2buf we must use a libctx

In a similar way to commit 76e23fc5 we must ensure that we use a libctx
whenever we call EC_POINT_point2buf because it can end up using crypto
algorithms.
Reviewed-by: NShane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11535)
上级 137b274a
...@@ -116,6 +116,7 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl, ...@@ -116,6 +116,7 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
const EC_GROUP *ecg = NULL; const EC_GROUP *ecg = NULL;
size_t pub_key_len = 0; size_t pub_key_len = 0;
int ret = 0; int ret = 0;
BN_CTX *bnctx = NULL;
if (eckey == NULL if (eckey == NULL
|| (ecg = EC_KEY_get0_group(eckey)) == NULL) || (ecg = EC_KEY_get0_group(eckey)) == NULL)
...@@ -125,10 +126,18 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl, ...@@ -125,10 +126,18 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
pub_point = EC_KEY_get0_public_key(eckey); pub_point = EC_KEY_get0_public_key(eckey);
if (pub_point != NULL) { if (pub_point != NULL) {
/*
* EC_POINT_point2buf() can generate random numbers in some
* implementations so we need to ensure we use the correct libctx.
*/
bnctx = BN_CTX_new_ex(ec_key_get_libctx(eckey));
if (bnctx == NULL)
goto err;
/* convert pub_point to a octet string according to the SECG standard */ /* convert pub_point to a octet string according to the SECG standard */
if ((pub_key_len = EC_POINT_point2buf(ecg, pub_point, if ((pub_key_len = EC_POINT_point2buf(ecg, pub_point,
POINT_CONVERSION_COMPRESSED, POINT_CONVERSION_COMPRESSED,
pub_key, NULL)) == 0 pub_key, bnctx)) == 0
|| !ossl_param_build_set_octet_string(tmpl, params, || !ossl_param_build_set_octet_string(tmpl, params,
OSSL_PKEY_PARAM_PUB_KEY, OSSL_PKEY_PARAM_PUB_KEY,
*pub_key, pub_key_len)) *pub_key, pub_key_len))
...@@ -184,6 +193,7 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl, ...@@ -184,6 +193,7 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
} }
ret = 1; ret = 1;
err: err:
BN_CTX_free(bnctx);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册