diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-18 15:56:53 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-26 10:50:30 +1000 |
commit | 19dbb742cdf68d8ada6338a025491a3b46b9ebe1 (patch) | |
tree | bf4d54751be7e826ad47f690990bde107d30b839 /include | |
parent | 94553e85b68af4513a8ee89cd2a0d4e044d75139 (diff) | |
download | openssl-new-19dbb742cdf68d8ada6338a025491a3b46b9ebe1.tar.gz |
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 <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/dh.h | 65 | ||||
-rw-r--r-- | include/crypto/evp.h | 4 |
2 files changed, 35 insertions, 34 deletions
diff --git a/include/crypto/dh.h b/include/crypto/dh.h index eca2a03056..d8b597a0f1 100644 --- a/include/crypto/dh.h +++ b/include/crypto/dh.h @@ -16,40 +16,41 @@ # include <openssl/dh.h> # include "internal/ffc.h" -DH *dh_new_by_nid_ex(OSSL_LIB_CTX *libctx, int nid); -DH *dh_new_ex(OSSL_LIB_CTX *libctx); +DH *ossl_dh_new_by_nid_ex(OSSL_LIB_CTX *libctx, int nid); +DH *ossl_dh_new_ex(OSSL_LIB_CTX *libctx); void ossl_dh_set0_libctx(DH *d, OSSL_LIB_CTX *libctx); - -int dh_generate_ffc_parameters(DH *dh, int type, int pbits, int qbits, - BN_GENCB *cb); -int dh_generate_public_key(BN_CTX *ctx, const DH *dh, const BIGNUM *priv_key, - BIGNUM *pub_key); -int dh_get_named_group_uid_from_size(int pbits); -const char *dh_gen_type_id2name(int id); -int dh_gen_type_name2id(const char *name); -void dh_cache_named_group(DH *dh); +int ossl_dh_generate_ffc_parameters(DH *dh, int type, int pbits, int qbits, + BN_GENCB *cb); +int ossl_dh_generate_public_key(BN_CTX *ctx, const DH *dh, + const BIGNUM *priv_key, BIGNUM *pub_key); +int ossl_dh_get_named_group_uid_from_size(int pbits); +const char *ossl_dh_gen_type_id2name(int id); +int ossl_dh_gen_type_name2id(const char *name); +void ossl_dh_cache_named_group(DH *dh); int ossl_dh_is_named_safe_prime_group(const DH *dh); -FFC_PARAMS *dh_get0_params(DH *dh); -int dh_get0_nid(const DH *dh); -int dh_params_fromdata(DH *dh, const OSSL_PARAM params[]); -int dh_key_fromdata(DH *dh, const OSSL_PARAM params[]); -int dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]); -int dh_key_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]); - -int dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret); -int dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret); -int dh_check_pairwise(const DH *dh); - -const DH_METHOD *dh_get_method(const DH *dh); - -int dh_buf2key(DH *key, const unsigned char *buf, size_t len); -size_t dh_key2buf(const DH *dh, unsigned char **pbuf, size_t size, int alloc); - -int dh_KDF_X9_42_asn1(unsigned char *out, size_t outlen, - const unsigned char *Z, size_t Zlen, - const char *cek_alg, - const unsigned char *ukm, size_t ukmlen, const EVP_MD *md, - OSSL_LIB_CTX *libctx, const char *propq); +FFC_PARAMS *ossl_dh_get0_params(DH *dh); +int ossl_dh_get0_nid(const DH *dh); +int ossl_dh_params_fromdata(DH *dh, const OSSL_PARAM params[]); +int ossl_dh_key_fromdata(DH *dh, const OSSL_PARAM params[]); +int ossl_dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]); +int ossl_dh_key_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]); + +int ossl_dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret); +int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret); +int ossl_dh_check_pairwise(const DH *dh); + +const DH_METHOD *ossl_dh_get_method(const DH *dh); + +int ossl_dh_buf2key(DH *key, const unsigned char *buf, size_t len); +size_t ossl_dh_key2buf(const DH *dh, unsigned char **pbuf, size_t size, + int alloc); + +int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen, + const unsigned char *Z, size_t Zlen, + const char *cek_alg, + const unsigned char *ukm, size_t ukmlen, + const EVP_MD *md, + OSSL_LIB_CTX *libctx, const char *propq); #endif /* OSSL_CRYPTO_DH_H */ diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 0ed9a02396..e48afbf203 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -179,8 +179,8 @@ DEFINE_STACK_OF_CONST(EVP_PKEY_METHOD) void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); -const EVP_PKEY_METHOD *dh_pkey_method(void); -const EVP_PKEY_METHOD *dhx_pkey_method(void); +const EVP_PKEY_METHOD *ossl_dh_pkey_method(void); +const EVP_PKEY_METHOD *ossl_dhx_pkey_method(void); const EVP_PKEY_METHOD *dsa_pkey_method(void); const EVP_PKEY_METHOD *ec_pkey_method(void); const EVP_PKEY_METHOD *ecx25519_pkey_method(void); |