diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-03-18 13:13:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-03-19 16:46:39 +0100 |
| commit | 695c96ba5160a8053c2ff98c0f8971b44c195cbb (patch) | |
| tree | e057c74008ca2fc61bbe1021a04ffb4233ddf234 /crypto | |
| parent | 55d9ccca8eec8ec57ab85175dea908f8b76fd4e1 (diff) | |
Make evp_privatekey_from_binary() completely libcrypto internal
We also rename it to d2i_PrivateKey_legacy(), to match d2i_PrivateKey_decoder()
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14314)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/d2i_pr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index 4da5a0c9be..5d95c9e042 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -69,9 +69,9 @@ err: return NULL; } -EVP_PKEY *evp_privatekey_from_binary(int keytype, EVP_PKEY **a, - const unsigned char **pp, long length, - OSSL_LIB_CTX *libctx, const char *propq) +static EVP_PKEY * +d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp, + long length, OSSL_LIB_CTX *libctx, const char *propq) { EVP_PKEY *ret; const unsigned char *p = *pp; @@ -144,7 +144,7 @@ EVP_PKEY *d2i_PrivateKey_ex(int keytype, EVP_PKEY **a, const unsigned char **pp, ret = d2i_PrivateKey_decoder(keytype, a, pp, length, libctx, propq); /* try the legacy path if the decoder failed */ if (ret == NULL) - ret = evp_privatekey_from_binary(keytype, a, pp, length, libctx, propq); + ret = d2i_PrivateKey_legacy(keytype, a, pp, length, libctx, propq); return ret; } @@ -203,7 +203,7 @@ static EVP_PKEY *d2i_AutoPrivateKey_legacy(EVP_PKEY **a, keytype = EVP_PKEY_RSA; } sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free); - return evp_privatekey_from_binary(keytype, a, pp, length, libctx, propq); + return d2i_PrivateKey_legacy(keytype, a, pp, length, libctx, propq); } /* |