Skip to content

Accept CMS OCTET STRING encoding for SpcIndirectDataContent #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtrojnar merged 1 commit into from
Sep 24, 2026
Merged

Accept CMS OCTET STRING encoding for SpcIndirectDataContent #506

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,11 @@ SpcIndirectDataContent *pkcs7_get_indirect_data_content(PKCS7 *p7)

/*
* Decode SpcIndirectDataContent from an ASN1_TYPE object.
* The ASN1_TYPE is expected to contain a V_ASN1_SEQUENCE value.
*
* RFC 5652 section 5.2.1 defines PKCS#7 content as EXPLICIT ANY,
* while CMS defines eContent as EXPLICIT OCTET STRING. Therefore,
* Authenticode content may appear directly as a SEQUENCE or be
* carried inside a CMS OCTET STRING.
*
* [in] content: ASN1_TYPE containing DER-encoded SpcIndirectDataContent
* [returns] newly allocated SpcIndirectDataContent, or NULL on error
Expand All @@ -413,10 +417,16 @@ SpcIndirectDataContent *asn1_type_get_indirect_data_content(ASN1_TYPE *content)
const unsigned char *data;
int len;

if (!content || content->type != V_ASN1_SEQUENCE)
if (!content)
return NULL;

if (content->type == V_ASN1_SEQUENCE)
value = content->value.sequence;
else if (content->type == V_ASN1_OCTET_STRING)
value = content->value.octet_string;
else
return NULL;

value = content->value.sequence;
if (!value)
return NULL;

Expand Down
Loading