DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

ASN.1: Use the helper functions for recognizing tags and debug prints

Browse source 
Simplify the core ASN.1 parser implementation by using the helper
functions.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2021-03-13 23:13:05 +02:00
parent 9a990e8c4e
commit b421a7cf2a
1 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/tls/asn1.c
View file

@ -205,7 +205,11 @@ int asn1_get_next(const u8 *buf, size_t len, struct asn1_hdr *hdr)
hdr->payload = pos; hdr->payload = pos;
return asn1_valid_der(hdr) ? 0 : -1; if (!asn1_valid_der(hdr)) {
asn1_print_hdr(hdr, "ASN.1: Invalid DER encoding: ");
return -1;
}
return 0;
} }
@ -272,12 +276,9 @@ int asn1_get_oid(const u8 *buf, size_t len, struct asn1_oid *oid,
{ {
struct asn1_hdr hdr; struct asn1_hdr hdr;
if (asn1_get_next(buf, len, &hdr) < 0 || hdr.length == 0) if (asn1_get_next(buf, len, &hdr) < 0 || hdr.length == 0 ||
return -1; !asn1_is_oid(&hdr)) {
asn1_unexpected(&hdr, "ASN.1: Expected OID");
if (hdr.class != ASN1_CLASS_UNIVERSAL || hdr.tag != ASN1_TAG_OID) {
wpa_printf(MSG_DEBUG, "ASN.1: Expected OID - found class %d "
"tag 0x%x", hdr.class, hdr.tag);
return -1; return -1;
} }
@ -376,13 +377,9 @@ int asn1_get_integer(const u8 *buf, size_t len, int *integer, const u8 **next)
const u8 *pos; const u8 *pos;
int value; int value;
if (asn1_get_next(buf, len, &hdr) < 0 || hdr.length == 0) if (asn1_get_next(buf, len, &hdr) < 0 || hdr.length == 0 ||
return -1; !asn1_is_integer(&hdr)) {
asn1_unexpected(&hdr, "ASN.1: Expected INTEGER");
if (hdr.class != ASN1_CLASS_UNIVERSAL || hdr.tag != ASN1_TAG_INTEGER) {
wpa_printf(MSG_DEBUG,
"ASN.1: Expected INTEGER - found class %d tag 0x%x",
hdr.class, hdr.tag);
return -1; return -1;
} }
@ -409,12 +406,8 @@ int asn1_get_integer(const u8 *buf, size_t len, int *integer, const u8 **next)
int asn1_get_sequence(const u8 *buf, size_t len, struct asn1_hdr *hdr, int asn1_get_sequence(const u8 *buf, size_t len, struct asn1_hdr *hdr,
const u8 **next) const u8 **next)
{ {
if (asn1_get_next(buf, len, hdr) < 0 || if (asn1_get_next(buf, len, hdr) < 0 || !asn1_is_sequence(hdr)) {
hdr->class != ASN1_CLASS_UNIVERSAL || asn1_unexpected(hdr, "ASN.1: Expected SEQUENCE");
hdr->tag != ASN1_TAG_SEQUENCE) {
wpa_printf(MSG_DEBUG,
"ASN.1: Expected SEQUENCE - found class %d tag 0x%x",
hdr->class, hdr->tag);
return -1; return -1;
} }