summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinoguchi <>2022-01-20 11:15:39 +0000
committerinoguchi <>2022-01-20 11:15:39 +0000
commit323a2e41e712066327b8adb07991a7fa32921910 (patch)
tree4a2f29703a4d7df2ed3a12e8368d0de5aba6c04e
parent16d4a60b8641ac0612a3e7f2bbbaad39ab88c974 (diff)
downloadopenbsd-323a2e41e712066327b8adb07991a7fa32921910.tar.gz
openbsd-323a2e41e712066327b8adb07991a7fa32921910.tar.bz2
openbsd-323a2e41e712066327b8adb07991a7fa32921910.zip
Add check for ASN1_INTEGER_set
CID 24893 ok jsing@ millert@ tb@
-rw-r--r--src/lib/libcrypto/pkcs12/p12_init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c
index 637c430bf4..7ae8d635bc 100644
--- a/src/lib/libcrypto/pkcs12/p12_init.c
+++ b/src/lib/libcrypto/pkcs12/p12_init.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_init.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: p12_init.c,v 1.12 2022/01/20 11:15:39 inoguchi 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 */
@@ -72,7 +72,8 @@ PKCS12_init(int mode)
72 PKCS12error(ERR_R_MALLOC_FAILURE); 72 PKCS12error(ERR_R_MALLOC_FAILURE);
73 return NULL; 73 return NULL;
74 } 74 }
75 ASN1_INTEGER_set(pkcs12->version, 3); 75 if (!ASN1_INTEGER_set(pkcs12->version, 3))
76 goto err;
76 pkcs12->authsafes->type = OBJ_nid2obj(mode); 77 pkcs12->authsafes->type = OBJ_nid2obj(mode);
77 switch (mode) { 78 switch (mode) {
78 case NID_pkcs7_data: 79 case NID_pkcs7_data: