From 19dbb742cdf68d8ada6338a025491a3b46b9ebe1 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Thu, 18 Feb 2021 15:56:53 +1000 Subject: Fix external symbols related to dh keys Partial fix for #12964 This adds ossl_ names for the following symbols: dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key, dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id, dh_cache_named_group, dh_get0_params, dh_get0_nid, dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata, dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise, dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1, dh_pkey_method, dhx_pkey_method Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14231) --- providers/implementations/encode_decode/encode_key2text.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'providers/implementations/encode_decode/encode_key2text.c') diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c index 8be3478102..4b4cfc8fa7 100644 --- a/providers/implementations/encode_decode/encode_key2text.c +++ b/providers/implementations/encode_decode/encode_key2text.c @@ -23,7 +23,7 @@ #include #include "internal/ffc.h" #include "crypto/bn.h" /* bn_get_words() */ -#include "crypto/dh.h" /* dh_get0_params() */ +#include "crypto/dh.h" /* ossl_dh_get0_params() */ #include "crypto/dsa.h" /* dsa_get0_params() */ #include "crypto/ec.h" /* ec_key_get_libctx */ #include "crypto/ecx.h" /* ECX_KEY, etc... */ @@ -245,7 +245,7 @@ static int dh_to_text(BIO *out, const void *key, int selection) } } if ((selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) != 0) { - params = dh_get0_params((DH *)dh); + params = ossl_dh_get0_params((DH *)dh); if (params == NULL) { ERR_raise(ERR_LIB_PROV, PROV_R_NOT_PARAMETERS); return 0; -- cgit v1.2.3