diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-06-08 00:09:51 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-06-08 00:09:51 +0000 |
| commit | 8eb57af5fed7a133cdb2a968081c355249c00b98 (patch) | |
| tree | 90c43c1df2e1c3ef81f4c6f4643ba8b561830aad /crypto/pkcs12/pkcs12.h | |
| parent | 1aad3392e531aa9d32583b435ba4f0b296ee4d27 (diff) | |
| download | openssl-8eb57af5fed7a133cdb2a968081c355249c00b98.tar.gz | |
Complete support for PKCS#5 v2.0. Still needs extensive testing.
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 1ab91a3c8f..5f3b1148fa 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -197,7 +197,8 @@ ASN1_seq_unpack((p12)->authsafes->d.data->data, \ PKCS12_SAFEBAG *PKCS12_pack_safebag(char *obj, int (*i2d)(), int nid1, int nid2); PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8); -X509_SIG *PKCS8_encrypt(int pbe_nid, const char *pass, int passlen, +X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, + const char *pass, int passlen, unsigned char *salt, int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8); PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass, |