diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 09:48:16 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | adf7e6d1d63890f037625031789ed042187c3947 (patch) | |
| tree | 48c61a773e33b6df45664d1a46e8be54e0a9092d /crypto/dh | |
| parent | 1335ca4b0799d1714a2f8e21525cb23edf660e93 (diff) | |
Add ossl_asn1 symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_ameth.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index cccd880c20..08656877f3 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -35,7 +35,7 @@ static DH *d2i_dhp(const EVP_PKEY *pkey, const unsigned char **pp, long length) { DH *dh = NULL; - int is_dhx = (pkey->ameth == &dhx_asn1_meth); + int is_dhx = (pkey->ameth == &ossl_dhx_asn1_meth); if (is_dhx) dh = d2i_DHxparams(NULL, pp, length); @@ -47,7 +47,7 @@ static DH *d2i_dhp(const EVP_PKEY *pkey, const unsigned char **pp, static int i2d_dhp(const EVP_PKEY *pkey, const DH *a, unsigned char **pp) { - if (pkey->ameth == &dhx_asn1_meth) + if (pkey->ameth == &ossl_dhx_asn1_meth) return i2d_DHxparams(a, pp); return i2d_DHparams(a, pp); } @@ -350,7 +350,7 @@ static int dh_security_bits(const EVP_PKEY *pkey) static int dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) { return ossl_ffc_params_cmp(&a->pkey.dh->params, &a->pkey.dh->params, - a->ameth != &dhx_asn1_meth); + a->ameth != &ossl_dhx_asn1_meth); } static int int_dh_param_copy(DH *to, const DH *from, int is_x942) @@ -386,7 +386,7 @@ static int dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) return 0; } return int_dh_param_copy(to->pkey.dh, from->pkey.dh, - from->ameth == &dhx_asn1_meth); + from->ameth == &ossl_dhx_asn1_meth); } static int dh_missing_parameters(const EVP_PKEY *a) @@ -574,7 +574,7 @@ static int dhx_pkey_import_from(const OSSL_PARAM params[], void *vpctx) return dh_pkey_import_from_type(params, vpctx, EVP_PKEY_DHX); } -const EVP_PKEY_ASN1_METHOD dh_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_dh_asn1_meth = { EVP_PKEY_DH, EVP_PKEY_DH, 0, @@ -619,7 +619,7 @@ const EVP_PKEY_ASN1_METHOD dh_asn1_meth = { dh_pkey_import_from, }; -const EVP_PKEY_ASN1_METHOD dhx_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_dhx_asn1_meth = { EVP_PKEY_DHX, EVP_PKEY_DHX, 0, |