diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 09:59:13 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | 2858156e0309031da8476e51fe76f0ce8c15010f (patch) | |
| tree | 5a6539b03e48efd2abc14a73bfb2227ee3fbdd32 /providers | |
| parent | adf7e6d1d63890f037625031789ed042187c3947 (diff) | |
Add ossl_encode symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/common/der/der_sm2.h.in | 6 | ||||
| -rw-r--r-- | providers/common/der/der_sm2_key.c | 2 | ||||
| -rw-r--r-- | providers/common/der/der_sm2_sig.c | 4 | ||||
| -rw-r--r-- | providers/implementations/signature/sm2sig.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/providers/common/der/der_sm2.h.in b/providers/common/der/der_sm2.h.in index 1cc330fcea..fe21095e59 100644 --- a/providers/common/der/der_sm2.h.in +++ b/providers/common/der/der_sm2.h.in @@ -18,7 +18,7 @@ -} /* Subject Public Key Info */ -int DER_w_algorithmIdentifier_SM2(WPACKET *pkt, int cont, EC_KEY *ec); +int ossl_DER_w_algorithmIdentifier_SM2(WPACKET *pkt, int cont, EC_KEY *ec); /* Signature */ -int DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont, - EC_KEY *ec, int mdnid); +int ossl_DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont, + EC_KEY *ec, int mdnid); diff --git a/providers/common/der/der_sm2_key.c b/providers/common/der/der_sm2_key.c index a766bb4f3d..5889f2ba0e 100644 --- a/providers/common/der/der_sm2_key.c +++ b/providers/common/der/der_sm2_key.c @@ -12,7 +12,7 @@ #include "prov/der_ec.h" #include "prov/der_sm2.h" -int DER_w_algorithmIdentifier_SM2(WPACKET *pkt, int cont, EC_KEY *ec) +int ossl_DER_w_algorithmIdentifier_SM2(WPACKET *pkt, int cont, EC_KEY *ec) { return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ diff --git a/providers/common/der/der_sm2_sig.c b/providers/common/der/der_sm2_sig.c index 7b710cfa53..1e904bb5cd 100644 --- a/providers/common/der/der_sm2_sig.c +++ b/providers/common/der/der_sm2_sig.c @@ -20,8 +20,8 @@ precompiled_sz = sizeof(ossl_der_oid_id_sm2_with_##name); \ break; -int DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont, - EC_KEY *ec, int mdnid) +int ossl_DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont, + EC_KEY *ec, int mdnid) { const unsigned char *precompiled = NULL; size_t precompiled_sz = 0; diff --git a/providers/implementations/signature/sm2sig.c b/providers/implementations/signature/sm2sig.c index 4201e825b1..6fb0ff919b 100644 --- a/providers/implementations/signature/sm2sig.c +++ b/providers/implementations/signature/sm2sig.c @@ -201,7 +201,7 @@ static int sm2sig_digest_signverify_init(void *vpsm2ctx, const char *mdname, */ ctx->aid_len = 0; if (WPACKET_init_der(&pkt, ctx->aid_buf, sizeof(ctx->aid_buf)) - && DER_w_algorithmIdentifier_SM2_with_MD(&pkt, -1, ctx->ec, md_nid) + && ossl_DER_w_algorithmIdentifier_SM2_with_MD(&pkt, -1, ctx->ec, md_nid) && WPACKET_finish(&pkt)) { WPACKET_get_total_written(&pkt, &ctx->aid_len); ctx->aid = WPACKET_get_curr(&pkt); |