summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_crt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_crt.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_crt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c
index af2c6afc37..f8ba3357e7 100644
--- a/src/lib/libcrypto/pkcs12/p12_crt.c
+++ b/src/lib/libcrypto/pkcs12/p12_crt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_crt.c,v 1.17 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: p12_crt.c,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. 3 * project.
4 */ 4 */
@@ -80,7 +80,7 @@ copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
80} 80}
81 81
82PKCS12 * 82PKCS12 *
83PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, 83PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey, X509 *cert,
84 STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, int mac_iter, 84 STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, int mac_iter,
85 int keytype) 85 int keytype)
86{ 86{
@@ -221,7 +221,7 @@ err:
221 221
222PKCS12_SAFEBAG * 222PKCS12_SAFEBAG *
223PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, int key_usage, 223PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, int key_usage,
224 int iter, int nid_key, char *pass) 224 int iter, int nid_key, const char *pass)
225{ 225{
226 PKCS12_SAFEBAG *bag = NULL; 226 PKCS12_SAFEBAG *bag = NULL;
227 PKCS8_PRIV_KEY_INFO *p8 = NULL; 227 PKCS8_PRIV_KEY_INFO *p8 = NULL;
@@ -261,7 +261,7 @@ err:
261 261
262int 262int
263PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags, 263PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
264 int nid_safe, int iter, char *pass) 264 int nid_safe, int iter, const char *pass)
265{ 265{
266 PKCS7 *p7 = NULL; 266 PKCS7 *p7 = NULL;
267 int free_safes = 0; 267 int free_safes = 0;