diff options
| author | Pauli <pauli@openssl.org> | 2021-04-15 10:42:01 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-04-21 09:27:51 +1000 |
| commit | 2ec6491669d1a93a5c4a445715aae6b1582cb2a4 (patch) | |
| tree | 94e4ddcb479314160fb256ff218d175213d92359 | |
| parent | c4685815bf7edbc546add24b9fa99b632a2ba366 (diff) | |
asn1: fix indentation
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14881)
| -rw-r--r-- | crypto/asn1/a_digest.c | 4 | ||||
| -rw-r--r-- | crypto/evp/p5_crpt2.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index cac6c327da..9d7efcdb70 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -75,8 +75,8 @@ int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *md, void *asn, #endif fetched_md = EVP_MD_fetch(libctx, EVP_MD_name(md), propq); } - if (fetched_md == NULL) - goto err; + if (fetched_md == NULL) + goto err; ret = EVP_Digest(str, i, data, len, fetched_md, NULL); err: diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index d2fe56a87f..b8edf4b5a8 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -92,8 +92,14 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, int keylen, unsigned char *out) { - return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter, EVP_sha1(), - keylen, out); + EVP_MD *digest; + int r = 0; + + if ((digest = EVP_MD_fetch(NULL, SN_sha1, NULL)) != NULL) + r = ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, + digest, keylen, out, NULL, NULL); + EVP_MD_free(digest); + return r; } /* |