aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/x509
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-03-28 23:17:34 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-03-28 23:17:34 +0000
commit8d8c7266d4de9887fb0190a0770df9dc254a16a3 (patch)
tree53266f3f48875973f3c7f96abf912c5084155a23 /crypto/x509
parentcfcefcbe2aff81c1735c788ca6ae26b7c16cc453 (diff)
downloadopenssl-8d8c7266d4de9887fb0190a0770df9dc254a16a3.tar.gz
Yet more PKCS#12 integration: add lots of files under crypto/pkcs12 and add
them to the build environment.
Diffstat (limited to 'crypto/x509')
-rw-r--r--crypto/x509/x509.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index c4677be1ee..8cdfe0fc9d 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -863,6 +863,7 @@ int i2d_PBEPARAM(PBEPARAM *a, unsigned char **pp);
PBEPARAM *PBEPARAM_new(void);
PBEPARAM *d2i_PBEPARAM(PBEPARAM **a, unsigned char **pp, long length);
void PBEPARAM_free(PBEPARAM *a);
+X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt, int saltlen);
/* PKCS#8 utilities */
@@ -1198,6 +1199,7 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken();
int EVP_PBE_ALGOR_CipherInit();
int EVP_PBE_alg_add();
+X509_ALGOR *PKCS5_pbe_set();
#endif