diff options
Diffstat (limited to 'src/lib/libcrypto/evp/evp_pbe.c')
-rw-r--r-- | src/lib/libcrypto/evp/evp_pbe.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index a9f5b8fb12..532c924a9e 100644 --- a/src/lib/libcrypto/evp/evp_pbe.c +++ b/src/lib/libcrypto/evp/evp_pbe.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_pbe.c,v 1.45 2024/03/02 10:17:37 tb Exp $ */ | 1 | /* $OpenBSD: evp_pbe.c,v 1.46 2024/03/02 10:20:27 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -73,9 +73,15 @@ | |||
73 | #include "x509_local.h" | 73 | #include "x509_local.h" |
74 | 74 | ||
75 | /* Password based encryption (PBE) functions */ | 75 | /* Password based encryption (PBE) functions */ |
76 | int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | ||
77 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de); | ||
78 | int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | ||
79 | ASN1_TYPE *param, const EVP_CIPHER *c, const EVP_MD *md, int en_de); | ||
76 | int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | 80 | int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, |
77 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md_type, | 81 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md_type, |
78 | int en_de); | 82 | int en_de); |
83 | int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | ||
84 | ASN1_TYPE *param, const EVP_CIPHER *c, const EVP_MD *md, int en_de); | ||
79 | 85 | ||
80 | static const struct pbe_config { | 86 | static const struct pbe_config { |
81 | int pbe_nid; | 87 | int pbe_nid; |