From e20550fddf295607fbc26ba34e9998acd30c875e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 18 Mar 2012 13:24:20 +0000 Subject: [crypto] Add more ASN.1 functions for X.509 certificate parsing Signed-off-by: Michael Brown --- src/include/ipxe/asn1.h | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'src/include/ipxe/asn1.h') diff --git a/src/include/ipxe/asn1.h b/src/include/ipxe/asn1.h index 7d8f66704..be344c9cb 100644 --- a/src/include/ipxe/asn1.h +++ b/src/include/ipxe/asn1.h @@ -20,6 +20,9 @@ struct asn1_cursor { /** ASN.1 end */ #define ASN1_END 0x00 +/** ASN.1 boolean */ +#define ASN1_BOOLEAN 0x01 + /** ASN.1 integer */ #define ASN1_INTEGER 0x02 @@ -48,7 +51,7 @@ struct asn1_cursor { #define ASN1_SET 0x31 /** ASN.1 explicit tag */ -#define ASN1_EXPLICIT_TAG 0xa0 +#define ASN1_EXPLICIT_TAG( number) ( 0xa0 | (number) ) /** ASN.1 "any tag" magic value */ #define ASN1_ANY -1U @@ -79,15 +82,14 @@ struct asn1_cursor { /** ASN.1 OID for iso(1) member-body(2) */ #define ASN1_OID_ISO_MEMBERBODY ASN1_OID_INITIAL ( 1, 2 ) +/** ASN.1 OID for iso(1) identified-organization(3) */ +#define ASN1_OID_IDENTIFIED_ORGANIZATION ASN1_OID_INITIAL ( 1, 3 ) + /** ASN.1 OID for joint-iso-itu-t(2) ds(5) */ #define ASN1_OID_DIRECTORY_SERVICES ASN1_OID_INITIAL ( 2, 5 ) -/** ASN.1 OID for joint-iso-itu-t(2) ds(5) attributeType(4) */ -#define ASN1_OID_ATTRIBUTE_TYPE \ - ASN1_OID_DIRECTORY_SERVICES, ASN1_OID_SINGLE ( 4 ) - -/** ASN.1 OID for joint-iso-itu-t(2) ds(5) attributeType(4) commonName(3) */ -#define ASN1_OID_COMMON_NAME ASN1_OID_ATTRIBUTE_TYPE, ASN1_OID_SINGLE ( 3 ) +/** ASN.1 OID for joint-iso-itu-t(2) country(16) */ +#define ASN1_OID_COUNTRY ASN1_OID_INITIAL ( 2, 16 ) /** Define an ASN.1 cursor containing an OID */ #define ASN1_OID_CURSOR( oid_value ) { \ @@ -95,6 +97,12 @@ struct asn1_cursor { .len = sizeof ( oid_value ), \ } +/** An ASN.1 boolean */ +struct asn1_boolean { + /** Value */ + uint8_t value; +} __attribute__ (( packed )); + /** An ASN.1 bit string */ struct asn1_bit_string { /** Number of unused bits */ @@ -119,8 +127,12 @@ extern int asn1_enter ( struct asn1_cursor *cursor, unsigned int type ); extern int asn1_skip_if_exists ( struct asn1_cursor *cursor, unsigned int type ); extern int asn1_skip ( struct asn1_cursor *cursor, unsigned int type ); +extern int asn1_shrink ( struct asn1_cursor *cursor, unsigned int type ); extern int asn1_enter_any ( struct asn1_cursor *cursor ); extern int asn1_skip_any ( struct asn1_cursor *cursor ); +extern int asn1_shrink_any ( struct asn1_cursor *cursor ); +extern int asn1_boolean ( const struct asn1_cursor *cursor ); +extern int asn1_integer ( const struct asn1_cursor *cursor, int *value ); extern int asn1_compare ( const struct asn1_cursor *cursor1, const struct asn1_cursor *cursor2 ); -- cgit v1.2.3-55-g7522