diff options
Diffstat (limited to 'src/lib/libssl/src/crypto/pkcs12/p12_crt.c')
-rw-r--r-- | src/lib/libssl/src/crypto/pkcs12/p12_crt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c index a8f7b48882..4c36c643ce 100644 --- a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c +++ b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c | |||
@@ -94,7 +94,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
94 | } | 94 | } |
95 | 95 | ||
96 | /* Add user certificate */ | 96 | /* Add user certificate */ |
97 | if(!(bag = M_PKCS12_x5092certbag(cert))) return NULL; | 97 | if(!(bag = PKCS12_x5092certbag(cert))) return NULL; |
98 | if(name && !PKCS12_add_friendlyname(bag, name, -1)) return NULL; | 98 | if(name && !PKCS12_add_friendlyname(bag, name, -1)) return NULL; |
99 | X509_digest(cert, EVP_sha1(), keyid, &keyidlen); | 99 | X509_digest(cert, EVP_sha1(), keyid, &keyidlen); |
100 | if(!PKCS12_add_localkeyid(bag, keyid, keyidlen)) return NULL; | 100 | if(!PKCS12_add_localkeyid(bag, keyid, keyidlen)) return NULL; |
@@ -108,7 +108,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
108 | if(ca) { | 108 | if(ca) { |
109 | for(i = 0; i < sk_X509_num(ca); i++) { | 109 | for(i = 0; i < sk_X509_num(ca); i++) { |
110 | tcert = sk_X509_value(ca, i); | 110 | tcert = sk_X509_value(ca, i); |
111 | if(!(bag = M_PKCS12_x5092certbag(tcert))) return NULL; | 111 | if(!(bag = PKCS12_x5092certbag(tcert))) return NULL; |
112 | if(!sk_PKCS12_SAFEBAG_push(bags, bag)) { | 112 | if(!sk_PKCS12_SAFEBAG_push(bags, bag)) { |
113 | PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE); | 113 | PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE); |
114 | return NULL; | 114 | return NULL; |
@@ -152,7 +152,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
152 | 152 | ||
153 | if(!(p12 = PKCS12_init (NID_pkcs7_data))) return NULL; | 153 | if(!(p12 = PKCS12_init (NID_pkcs7_data))) return NULL; |
154 | 154 | ||
155 | if(!M_PKCS12_pack_authsafes (p12, safes)) return NULL; | 155 | if(!PKCS12_pack_authsafes (p12, safes)) return NULL; |
156 | 156 | ||
157 | sk_PKCS7_pop_free(safes, PKCS7_free); | 157 | sk_PKCS7_pop_free(safes, PKCS7_free); |
158 | 158 | ||