Yet more PKCS#12 integration: add lots of files under crypto/pkcs12 and add

[openssl.git] / crypto / x509 / x509.h

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index c4677be1eecdb4e35f0059125e39dab7659b6422..8cdfe0fc9d27afbaf0399ec395bf11da2331f941 100644 (file)
--- 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