summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/pkcs12.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/pkcs12.h')
-rw-r--r--src/lib/libcrypto/pkcs12/pkcs12.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index e30f9ac790..c588aeb819 100644
--- a/src/lib/libcrypto/pkcs12/pkcs12.h
+++ b/src/lib/libcrypto/pkcs12/pkcs12.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.h,v 1.17 2016/12/30 15:08:58 jsing Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.18 2018/05/13 13:46:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -264,15 +264,15 @@ extern const ASN1_ITEM PKCS12_AUTHSAFES_it;
264void PKCS12_PBE_add(void); 264void PKCS12_PBE_add(void);
265int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, 265int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
266 STACK_OF(X509) **ca); 266 STACK_OF(X509) **ca);
267PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, 267PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey,
268 STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, 268 X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
269 int mac_iter, int keytype); 269 int mac_iter, int keytype);
270 270
271PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert); 271PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
272PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, 272PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key,
273 int key_usage, int iter, int key_nid, char *pass); 273 int key_usage, int iter, int key_nid, const char *pass);
274int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags, 274int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
275 int safe_nid, int iter, char *pass); 275 int safe_nid, int iter, const char *pass);
276PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid); 276PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
277 277
278int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12); 278int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);