From 32ab57cbb4877ce7e6b4eb3f9b3cfbb0ff7cd10b Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Thu, 18 Feb 2021 20:27:26 +1000 Subject: Fix external symbols related to ec & sm2 keys Partial fix for #12964 This adds ossl_ names for the following symbols: ec_*, ecx_*, ecdh_*, ecdsa_*, sm2_* Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14231) --- crypto/ec/ec_ameth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crypto/ec/ec_ameth.c') diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index fe1e1c9a8f..89241b97c1 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -584,7 +584,7 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata, BN_CTX_start(bnctx); /* export the domain parameters */ - if (!ec_group_todata(ecg, tmpl, NULL, libctx, propq, bnctx, &gen_buf)) + if (!ossl_ec_group_todata(ecg, tmpl, NULL, libctx, propq, bnctx, &gen_buf)) goto err; selection |= OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS; @@ -695,9 +695,9 @@ static int ec_pkey_import_from(const OSSL_PARAM params[], void *vpctx) return 0; } - if (!ec_group_fromdata(ec, params) - || !ec_key_otherparams_fromdata(ec, params) - || !ec_key_fromdata(ec, params, 1) + if (!ossl_ec_group_fromdata(ec, params) + || !ossl_ec_key_otherparams_fromdata(ec, params) + || !ossl_ec_key_fromdata(ec, params, 1) || !EVP_PKEY_assign_EC_KEY(pkey, ec)) { EC_KEY_free(ec); return 0; -- cgit v1.2.3