path: root/scripts/asn1_compiler.c
diff options
authorDavid Howells <>2015-08-05 12:54:46 +0100
committerDavid Howells <>2015-08-05 13:38:07 +0100
commit233ce79db4b23a174bcf30bde5d6ad913d5f46d3 (patch)
treefdf3021db1ab8f6d71908b6cc2a2e3afba94fb21 /scripts/asn1_compiler.c
parent0d62e9dd6da45bbf0f33a8617afc5fe774c8f45f (diff)
ASN.1: Handle 'ANY OPTIONAL' in grammar
An ANY object in an ASN.1 grammar that is marked OPTIONAL should be skipped if there is no more data to be had. This can be tested by editing X.509 certificates or PKCS#7 messages to remove the NULL from subobjects that look like the following: SEQUENCE { OBJECT(2a864886f70d01010b); NULL(); } This is an algorithm identifier plus an optional parameter. The modified DER can be passed to one of: keyctl padd asymmetric "" @s </tmp/modified.x509 keyctl padd pkcs7_test foo @s </tmp/modified.pkcs7 It should work okay with the patch and produce EBADMSG without. Signed-off-by: David Howells <> Tested-by: Marcel Holtmann <> Reviewed-by: David Woodhouse <>
Diffstat (limited to 'scripts/asn1_compiler.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
index 0515bced929a..1c75e22b6385 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -1401,7 +1401,8 @@ static void render_element(FILE *out, struct element *e, struct element *tag)
act = e->action ? "_ACT" : "";
switch (e->compound) {
case ANY:
- render_opcode(out, "ASN1_OP_%sMATCH_ANY%s,", cond, act);
+ render_opcode(out, "ASN1_OP_%sMATCH_ANY%s%s,",
+ cond, act, skippable ? "_OR_SKIP" : "");
if (e->name)
render_more(out, "\t\t// %*.*s",
(int)e->name->size, (int)e->name->size,