diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-10-09 15:28:02 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-10-09 15:28:02 +0000 |
| commit | dc100d87b5746d80e762ee6a414c75cb694ceb50 (patch) | |
| tree | 593d4359138484efc391951adc6a87f0f3e9cb10 /crypto/x509 | |
| parent | 6f6b31dadcaae74a2527311f6d47364286eef3bf (diff) | |
Backport of password based CMS support from HEAD.
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 62740ebc57..243748c4d3 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -1162,6 +1162,9 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt, int saltlen, unsigned char *aiv, int prf_nid); +X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, + int prf_nid, int keylen); + /* PKCS#8 utilities */ DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO) |