diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-18 20:27:26 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-26 10:53:01 +1000 |
| commit | 32ab57cbb4877ce7e6b4eb3f9b3cfbb0ff7cd10b (patch) | |
| tree | 91e75951efa936b26e3a636b9a0daf90d60182b0 /crypto/evp/ctrl_params_translate.c | |
| parent | 5af02212a5331cc30389246bb94f97fbcdebc23a (diff) | |
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 <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
Diffstat (limited to 'crypto/evp/ctrl_params_translate.c')
| -rw-r--r-- | crypto/evp/ctrl_params_translate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c index 04f8fdbcab..e0f849d236 100644 --- a/crypto/evp/ctrl_params_translate.c +++ b/crypto/evp/ctrl_params_translate.c @@ -1023,7 +1023,7 @@ static int fix_dh_paramgen_type(enum state state, return 0; if (state == PRE_CTRL_TO_PARAMS) { - ctx->p2 = (char *)dh_gen_type_id2name(ctx->p1); + ctx->p2 = (char *)ossl_dh_gen_type_id2name(ctx->p1); ctx->p1 = 0; } @@ -1031,7 +1031,7 @@ static int fix_dh_paramgen_type(enum state state, return ret; if (state == PRE_PARAMS_TO_CTRL) { - ctx->p1 = dh_gen_type_name2id(ctx->p2); + ctx->p1 = ossl_dh_gen_type_name2id(ctx->p2); ctx->p2 = NULL; } @@ -1504,7 +1504,7 @@ static int get_payload_group_name(enum state state, if (grp != NULL) nid = EC_GROUP_get_curve_name(grp); if (nid != NID_undef) - ctx->p2 = (char *)ec_curve_nid2name(nid); + ctx->p2 = (char *)ossl_ec_curve_nid2name(nid); } break; #endif @@ -1569,7 +1569,7 @@ static int get_payload_public_key(enum state state, case EVP_PKEY_DH: switch (ctx->params->data_type) { case OSSL_PARAM_OCTET_STRING: - ctx->sz = dh_key2buf(EVP_PKEY_get0_DH(pkey), &buf, 0, 1); + ctx->sz = ossl_dh_key2buf(EVP_PKEY_get0_DH(pkey), &buf, 0, 1); ctx->p2 = buf; break; case OSSL_PARAM_UNSIGNED_INTEGER: @@ -1592,7 +1592,7 @@ static int get_payload_public_key(enum state state, case EVP_PKEY_EC: if (ctx->params->data_type == OSSL_PARAM_OCTET_STRING) { EC_KEY *eckey = EVP_PKEY_get0_EC_KEY(pkey); - BN_CTX *bnctx = BN_CTX_new_ex(ec_key_get_libctx(eckey)); + BN_CTX *bnctx = BN_CTX_new_ex(ossl_ec_key_get_libctx(eckey)); const EC_GROUP *ecg = EC_KEY_get0_group(eckey); const EC_POINT *point = EC_KEY_get0_public_key(eckey); |