projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3d63b39
)
Add PBKFD2 prototype.
author
Dr. Stephen Henson
<steve@openssl.org>
Wed, 25 Nov 2009 22:07:22 +0000
(22:07 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Wed, 25 Nov 2009 22:07:22 +0000
(22:07 +0000)
crypto/x509/x509.h
patch
|
blob
|
history
diff --git
a/crypto/x509/x509.h
b/crypto/x509/x509.h
index 3beb69965b4647ef7995bbd2bb0ec54d6784cd4f..25f536d06845e8b7718d12f4a00fac295581a6bc 100644
(file)
--- a/
crypto/x509/x509.h
+++ b/
crypto/x509/x509.h
@@
-1154,6
+1154,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)