early-access version 2698

This commit is contained in:
pineappleEA
2022-04-24 22:29:35 +02:00
parent c96f949832
commit caa0c2911b
486 changed files with 37806 additions and 14362 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: p12_init.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */
/* $OpenBSD: p12_init.c,v 1.13 2022/01/20 11:18:49 inoguchi Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@@ -72,8 +72,10 @@ PKCS12_init(int mode)
PKCS12error(ERR_R_MALLOC_FAILURE);
return NULL;
}
ASN1_INTEGER_set(pkcs12->version, 3);
pkcs12->authsafes->type = OBJ_nid2obj(mode);
if (!ASN1_INTEGER_set(pkcs12->version, 3))
goto err;
if ((pkcs12->authsafes->type = OBJ_nid2obj(mode)) == NULL)
goto err;
switch (mode) {
case NID_pkcs7_data:
if (!(pkcs12->authsafes->d.data =