diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-18 16:30:37 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-26 10:50:30 +1000 |
| commit | 5af02212a5331cc30389246bb94f97fbcdebc23a (patch) | |
| tree | 9ab888f6216de22d3e3532d2e6083755401452d3 /include | |
| parent | 19dbb742cdf68d8ada6338a025491a3b46b9ebe1 (diff) | |
Fix external symbols related to dsa keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dsa_check_pairwise, dsa_check_params, dsa_check_priv_key, dsa_check_pub_key, dsa_check_pub_key_partial,
dsa_do_sign_int, dsa_ffc_params_fromdata,
dsa_generate_ffc_parameters, dsa_generate_public_key,
dsa_get0_params, dsa_key_fromdata, dsa_new_with_ctx, dsa_pkey_method, dsa_sign_int
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/dsa.h | 31 | ||||
| -rw-r--r-- | include/crypto/evp.h | 2 |
2 files changed, 17 insertions, 16 deletions
diff --git a/include/crypto/dsa.h b/include/crypto/dsa.h index a47fbcd841..331baf320e 100644 --- a/include/crypto/dsa.h +++ b/include/crypto/dsa.h @@ -18,25 +18,26 @@ #define DSA_PARAMGEN_TYPE_FIPS_186_4 0 /* Use FIPS186-4 standard */ #define DSA_PARAMGEN_TYPE_FIPS_186_2 1 /* Use legacy FIPS186-2 standard */ -DSA *dsa_new_with_ctx(OSSL_LIB_CTX *libctx); +DSA *ossl_dsa_new(OSSL_LIB_CTX *libctx); void ossl_dsa_set0_libctx(DSA *d, OSSL_LIB_CTX *libctx); -int dsa_generate_ffc_parameters(DSA *dsa, int type, int pbits, int qbits, - BN_GENCB *cb); +int ossl_dsa_generate_ffc_parameters(DSA *dsa, int type, int pbits, int qbits, + BN_GENCB *cb); -int dsa_sign_int(int type, const unsigned char *dgst, - int dlen, unsigned char *sig, unsigned int *siglen, DSA *dsa); +int ossl_dsa_sign_int(int type, const unsigned char *dgst, int dlen, + unsigned char *sig, unsigned int *siglen, DSA *dsa); -FFC_PARAMS *dsa_get0_params(DSA *dsa); -int dsa_ffc_params_fromdata(DSA *dsa, const OSSL_PARAM params[]); -int dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[]); +FFC_PARAMS *ossl_dsa_get0_params(DSA *dsa); +int ossl_dsa_ffc_params_fromdata(DSA *dsa, const OSSL_PARAM params[]); +int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[]); -int dsa_generate_public_key(BN_CTX *ctx, const DSA *dsa, const BIGNUM *priv_key, - BIGNUM *pub_key); -int dsa_check_params(const DSA *dsa, int checktype, int *ret); -int dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret); -int dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret); -int dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret); -int dsa_check_pairwise(const DSA *dsa); +int ossl_dsa_generate_public_key(BN_CTX *ctx, const DSA *dsa, + const BIGNUM *priv_key, BIGNUM *pub_key); +int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret); +int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret); +int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, + int *ret); +int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret); +int ossl_dsa_check_pairwise(const DSA *dsa); #endif diff --git a/include/crypto/evp.h b/include/crypto/evp.h index e48afbf203..1b0a00dac2 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -181,7 +181,7 @@ void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); 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 *ossl_dsa_pkey_method(void); const EVP_PKEY_METHOD *ec_pkey_method(void); const EVP_PKEY_METHOD *ecx25519_pkey_method(void); const EVP_PKEY_METHOD *ecx448_pkey_method(void); |