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/ec | |
| 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/ec')
| -rw-r--r-- | crypto/ec/ec_ameth.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ecx_meth.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 694fcb3789..2c86af22f0 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -708,7 +708,7 @@ static int ec_pkey_import_from(const OSSL_PARAM params[], void *vpctx) return 1; } -const EVP_PKEY_ASN1_METHOD eckey_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_eckey_asn1_meth = { EVP_PKEY_EC, EVP_PKEY_EC, 0, @@ -759,7 +759,7 @@ const EVP_PKEY_ASN1_METHOD eckey_asn1_meth = { }; #if !defined(OPENSSL_NO_SM2) -const EVP_PKEY_ASN1_METHOD sm2_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_sm2_asn1_meth = { EVP_PKEY_SM2, EVP_PKEY_EC, ASN1_PKEY_ALIAS diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c index 9a812c875b..789610cac5 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -469,7 +469,7 @@ static int x25519_import_from(const OSSL_PARAM params[], void *vpctx) return ecx_generic_import_from(params, vpctx, EVP_PKEY_X25519); } -const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_ecx25519_asn1_meth = { EVP_PKEY_X25519, EVP_PKEY_X25519, 0, @@ -522,7 +522,7 @@ static int x448_import_from(const OSSL_PARAM params[], void *vpctx) return ecx_generic_import_from(params, vpctx, EVP_PKEY_X448); } -const EVP_PKEY_ASN1_METHOD ecx448_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_ecx448_asn1_meth = { EVP_PKEY_X448, EVP_PKEY_X448, 0, @@ -649,7 +649,7 @@ static int ed25519_import_from(const OSSL_PARAM params[], void *vpctx) return ecx_generic_import_from(params, vpctx, EVP_PKEY_ED25519); } -const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_ed25519_asn1_meth = { EVP_PKEY_ED25519, EVP_PKEY_ED25519, 0, @@ -701,7 +701,7 @@ static int ed448_import_from(const OSSL_PARAM params[], void *vpctx) return ecx_generic_import_from(params, vpctx, EVP_PKEY_ED448); } -const EVP_PKEY_ASN1_METHOD ed448_asn1_meth = { +const EVP_PKEY_ASN1_METHOD ossl_ed448_asn1_meth = { EVP_PKEY_ED448, EVP_PKEY_ED448, 0, |