|
@@ -78,6 +78,12 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7)
|
|
|
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CONTENT_TYPE_NOT_DATA);
|
|
|
return NULL;
|
|
|
}
|
|
|
+
|
|
|
+ if (p7->d.data == NULL) {
|
|
|
+ ERR_raise(ERR_LIB_PKCS12, PKCS12_R_DECODE_ERROR);
|
|
|
+ return NULL;
|
|
|
+ }
|
|
|
+
|
|
|
return ASN1_item_unpack_ex(p7->d.data, ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
|
|
|
ossl_pkcs7_ctx_get0_libctx(&p7->ctx),
|
|
|
ossl_pkcs7_ctx_get0_propq(&p7->ctx));
|
|
@@ -152,6 +158,12 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
|
|
|
{
|
|
|
if (!PKCS7_type_is_encrypted(p7))
|
|
|
return NULL;
|
|
|
+
|
|
|
+ if (p7->d.encrypted == NULL) {
|
|
|
+ ERR_raise(ERR_LIB_PKCS12, PKCS12_R_DECODE_ERROR);
|
|
|
+ return NULL;
|
|
|
+ }
|
|
|
+
|
|
|
return PKCS12_item_decrypt_d2i_ex(p7->d.encrypted->enc_data->algorithm,
|
|
|
ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
|
|
|
pass, passlen,
|
|
@@ -191,6 +203,12 @@ STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12)
|
|
|
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CONTENT_TYPE_NOT_DATA);
|
|
|
return NULL;
|
|
|
}
|
|
|
+
|
|
|
+ if (p12->authsafes->d.data == NULL) {
|
|
|
+ ERR_raise(ERR_LIB_PKCS12, PKCS12_R_DECODE_ERROR);
|
|
|
+ return NULL;
|
|
|
+ }
|
|
|
+
|
|
|
p7ctx = &p12->authsafes->ctx;
|
|
|
p7s = ASN1_item_unpack_ex(p12->authsafes->d.data,
|
|
|
ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
|