diff options
| author | Jon Spillett <jon.spillett@oracle.com> | 2021-05-06 15:25:29 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-24 15:21:25 +1000 |
| commit | 8bb6fdfc9971557f3aaa4e5dfc4cab0e5e9220a6 (patch) | |
| tree | 7151ffe947ac709db23b80952bca3a97f4722d7d /include | |
| parent | 0f183675b8ea2490ca5e0b4e66baa27a3e6478ba (diff) | |
Added PKCS5_PBE_keyivgen_ex() to allow PBKDF1 algorithms to be fetched for a specific library context
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14326)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 27e14d07b6..a793db6e0e 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1438,6 +1438,10 @@ int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type); int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de); +int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, + ASN1_TYPE *param, const EVP_CIPHER *cipher, + const EVP_MD *md, int en_de, OSSL_LIB_CTX *libctx, + const char *propq); int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, int keylen, unsigned char *out); |