diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-06-06 18:41:52 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-06-06 18:41:52 +0000 |
| commit | 2bd83ca1c95405fe03b33cdc98e6fa43e7258246 (patch) | |
| tree | 77db8e8be62a27adf992fa4d36d7f66b7a39a207 /crypto/pkcs12/pkcs12.h | |
| parent | 69cbf468119d6a85289e4720d609c38d4329de23 (diff) | |
| download | openssl-2bd83ca1c95405fe03b33cdc98e6fa43e7258246.tar.gz | |
Change PBE handling a bit more: now the key and iv generator does calls
EVP_CipherInit() this because the IV wont be easily available when doing
PKCS#5 v2.0
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 12ef0e5146..1ab91a3c8f 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -230,9 +230,9 @@ int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type); int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type); -int PKCS12_PBE_keyivgen(const char *pass, int passlen, ASN1_TYPE *param, - EVP_CIPHER *cipher, EVP_MD *md_type, - unsigned char *key, unsigned char *iv); +int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, + ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md_type, + int en_de); int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *mac, unsigned int *maclen); int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen); |