diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crt.c | 8 |
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 f8ba3357e7..dbcfd25478 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.18 2018/05/13 13:46:55 tb Exp $ */ | 1 | /* $OpenBSD: p12_crt.c,v 1.19 2022/08/03 20:16:06 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 | */ |
@@ -232,12 +232,12 @@ PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, int key_usage, | |||
232 | if (key_usage && !PKCS8_add_keyusage(p8, key_usage)) | 232 | if (key_usage && !PKCS8_add_keyusage(p8, key_usage)) |
233 | goto err; | 233 | goto err; |
234 | if (nid_key != -1) { | 234 | if (nid_key != -1) { |
235 | bag = PKCS12_MAKE_SHKEYBAG(nid_key, pass, -1, NULL, 0, | 235 | bag = PKCS12_SAFEBAG_create_pkcs8_encrypt(nid_key, pass, -1, |
236 | iter, p8); | 236 | NULL, 0, iter, p8); |
237 | PKCS8_PRIV_KEY_INFO_free(p8); | 237 | PKCS8_PRIV_KEY_INFO_free(p8); |
238 | p8 = NULL; | 238 | p8 = NULL; |
239 | } else { | 239 | } else { |
240 | bag = PKCS12_MAKE_KEYBAG(p8); | 240 | bag = PKCS12_SAFEBAG_create0_p8inf(p8); |
241 | if (bag != NULL) | 241 | if (bag != NULL) |
242 | p8 = NULL; | 242 | p8 = NULL; |
243 | } | 243 | } |