diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-06-06 13:07:13 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-06-06 13:07:13 +0000 |
| commit | 69cbf468119d6a85289e4720d609c38d4329de23 (patch) | |
| tree | 74b95aaf00f25cd802bc38b83c37e157bc117ae8 /crypto/pkcs12/p12_decr.c | |
| parent | 095ce35378bc42b1684c1fc29f6ceb3c17fdada3 (diff) | |
Rewrite PBE handling read to support PKCS#5 v2.0 and update the function
list for Win32.
Diffstat (limited to 'crypto/pkcs12/p12_decr.c')
| -rw-r--r-- | crypto/pkcs12/p12_decr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index 53fb8aad0f..8f502fae7f 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -82,7 +82,8 @@ unsigned char * PKCS12_pbe_crypt (X509_ALGOR *algor, const char *pass, } /* Decrypt data */ - if (!EVP_PBE_ALGOR_CipherInit (algor, pass, passlen, &ctx, en_de)) { + if (!EVP_PBE_CipherInit (algor->algorithm, pass, passlen, + algor->parameter, &ctx, en_de)) { PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR); return NULL; } |