ASN.1: Handle 'ANY OPTIONAL' in grammar
authorDavid Howells <dhowells@redhat.com>
Wed, 5 Aug 2015 11:54:46 +0000 (12:54 +0100)
committerDavid Howells <dhowells@redhat.com>
Wed, 5 Aug 2015 12:38:07 +0000 (13:38 +0100)
commit233ce79db4b23a174bcf30bde5d6ad913d5f46d3
treefdf3021db1ab8f6d71908b6cc2a2e3afba94fb21
parent0d62e9dd6da45bbf0f33a8617afc5fe774c8f45f
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 <dhowells@redhat.com>
Tested-by: Marcel Holtmann <marcel@holtmann.org>
Reviewed-by: David Woodhouse <David.Woodhouse@intel.com>
include/linux/asn1_ber_bytecode.h
lib/asn1_decoder.c
scripts/asn1_compiler.c