jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

DPP2: Use ASN.1 helper functions

Browse source 
Simplify ASN.1 parser operations by using the shared helper functions.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2021-03-12 23:24:54 +02:00
parent 626035bec7
commit 57550cb27a
1 changed files with 38 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/common/dpp_backup.c
View file

@ -592,11 +592,9 @@ static int dpp_parse_recipient_infos(const u8 *pos, size_t len,
* Shall always use the pwri CHOICE. * Shall always use the pwri CHOICE.
*/ */
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 || !hdr.constructed ||
hdr.class != ASN1_CLASS_CONTEXT_SPECIFIC || hdr.tag != 3) { !asn1_is_cs_tag(&hdr, 3)) {
wpa_printf(MSG_DEBUG, asn1_unexpected(&hdr, "DPP: Expected CHOICE [3] (pwri)");
"DPP: Expected CHOICE [3] (pwri) - found class %d tag 0x%x",
hdr.class, hdr.tag);
return -1; return -1;
} }
wpa_hexdump(MSG_MSGDUMP, "DPP: PasswordRecipientInfo", wpa_hexdump(MSG_MSGDUMP, "DPP: PasswordRecipientInfo",
@ -629,11 +627,10 @@ static int dpp_parse_recipient_infos(const u8 *pos, size_t len,
wpa_hexdump(MSG_MSGDUMP, "DPP: Remaining PasswordRecipientInfo after version", wpa_hexdump(MSG_MSGDUMP, "DPP: Remaining PasswordRecipientInfo after version",
pos, end - pos); pos, end - pos);
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 || !hdr.constructed ||
hdr.class != ASN1_CLASS_CONTEXT_SPECIFIC || hdr.tag != 0) { !asn1_is_cs_tag(&hdr, 0)) {
wpa_printf(MSG_DEBUG, asn1_unexpected(&hdr,
"DPP: Expected keyDerivationAlgorithm [0] - found class %d tag 0x%x", "DPP: Expected keyDerivationAlgorithm [0]");
hdr.class, hdr.tag);
return -1; return -1;
} }
pos = hdr.payload; pos = hdr.payload;
@ -672,11 +669,9 @@ static int dpp_parse_recipient_infos(const u8 *pos, size_t len,
pos = hdr.payload; pos = hdr.payload;
if (asn1_get_next(pos, e_end - pos, &hdr) < 0 || if (asn1_get_next(pos, e_end - pos, &hdr) < 0 ||
hdr.class != ASN1_CLASS_UNIVERSAL || !asn1_is_octetstring(&hdr)) {
hdr.tag != ASN1_TAG_OCTETSTRING) { asn1_unexpected(&hdr,
wpa_printf(MSG_DEBUG, "DPP: Expected OCTETSTRING (salt.specified)");
"DPP: Expected OCTETSTRING (salt.specified) - found class %d tag 0x%x",
hdr.class, hdr.tag);
return -1; return -1;
} }
wpa_hexdump(MSG_MSGDUMP, "DPP: salt.specified", wpa_hexdump(MSG_MSGDUMP, "DPP: salt.specified",
@ -752,11 +747,9 @@ static int dpp_parse_recipient_infos(const u8 *pos, size_t len,
* EncryptedKey ::= OCTET STRING * EncryptedKey ::= OCTET STRING
*/ */
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 ||
hdr.class != ASN1_CLASS_UNIVERSAL || !asn1_is_octetstring(&hdr)) {
hdr.tag != ASN1_TAG_OCTETSTRING) { asn1_unexpected(&hdr,
wpa_printf(MSG_DEBUG, "DPP: Expected OCTETSTRING (pwri.encryptedKey)");
"DPP: Expected OCTETSTRING (pwri.encryptedKey) - found class %d tag 0x%x",
hdr.class, hdr.tag);
return -1; return -1;
} }
wpa_hexdump(MSG_MSGDUMP, "DPP: pwri.encryptedKey", wpa_hexdump(MSG_MSGDUMP, "DPP: pwri.encryptedKey",
@ -825,11 +818,10 @@ static int dpp_parse_encrypted_content_info(const u8 *pos, const u8 *end,
/* encryptedContent [0] IMPLICIT EncryptedContent OPTIONAL /* encryptedContent [0] IMPLICIT EncryptedContent OPTIONAL
* EncryptedContent ::= OCTET STRING */ * EncryptedContent ::= OCTET STRING */
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 || hdr.constructed ||
hdr.class != ASN1_CLASS_CONTEXT_SPECIFIC || hdr.tag != 0) { !asn1_is_cs_tag(&hdr, 0)) {
wpa_printf(MSG_DEBUG, asn1_unexpected(&hdr,
"DPP: Expected [0] IMPLICIT (EncryptedContent) - found class %d tag 0x%x", "DPP: Expected [0] IMPLICIT (EncryptedContent)");
hdr.class, hdr.tag);
return -1; return -1;
} }
wpa_hexdump(MSG_MSGDUMP, "DPP: EncryptedContent", wpa_hexdump(MSG_MSGDUMP, "DPP: EncryptedContent",
@ -884,11 +876,9 @@ static int dpp_parse_enveloped_data(const u8 *env_data, size_t env_data_len,
return -1; return -1;
} }
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 || !asn1_is_set(&hdr)) {
hdr.class != ASN1_CLASS_UNIVERSAL || hdr.tag != ASN1_TAG_SET) { asn1_unexpected(&hdr,
wpa_printf(MSG_DEBUG, "DPP: Expected SET (RecipientInfos)");
"DPP: Expected SET (RecipientInfos) - found class %d tag 0x%x",
hdr.class, hdr.tag);
return -1; return -1;
} }
@ -977,11 +967,9 @@ dpp_parse_one_asymmetric_key(const u8 *buf, size_t len)
* (Contains DER encoding of ECPrivateKey) * (Contains DER encoding of ECPrivateKey)
*/ */
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 ||
hdr.class != ASN1_CLASS_UNIVERSAL || !asn1_is_octetstring(&hdr)) {
hdr.tag != ASN1_TAG_OCTETSTRING) { asn1_unexpected(&hdr,
wpa_printf(MSG_DEBUG, "DPP: Expected OCTETSTRING (PrivateKey)");
"DPP: Expected OCTETSTRING (PrivateKey) - found class %d tag 0x%x",
hdr.class, hdr.tag);
goto fail; goto fail;
} }
wpa_hexdump_key(MSG_MSGDUMP, "DPP: PrivateKey", wpa_hexdump_key(MSG_MSGDUMP, "DPP: PrivateKey",
@ -1007,11 +995,9 @@ dpp_parse_one_asymmetric_key(const u8 *buf, size_t len)
* *
* Exactly one instance of type Attribute in OneAsymmetricKey. * Exactly one instance of type Attribute in OneAsymmetricKey.
*/ */
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 || !hdr.constructed ||
hdr.class != ASN1_CLASS_CONTEXT_SPECIFIC || hdr.tag != 0) { !asn1_is_cs_tag(&hdr, 0)) {
wpa_printf(MSG_DEBUG, asn1_unexpected(&hdr, "DPP: Expected [0] Attributes");
"DPP: Expected [0] Attributes - found class %d tag 0x%x",
hdr.class, hdr.tag);
goto fail; goto fail;
} }
wpa_hexdump_key(MSG_MSGDUMP, "DPP: Attributes", wpa_hexdump_key(MSG_MSGDUMP, "DPP: Attributes",
@ -1025,11 +1011,8 @@ dpp_parse_one_asymmetric_key(const u8 *buf, size_t len)
pos = hdr.payload; pos = hdr.payload;
end = hdr.payload + hdr.length; end = hdr.payload + hdr.length;
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 || !asn1_is_set(&hdr)) {
hdr.class != ASN1_CLASS_UNIVERSAL || hdr.tag != ASN1_TAG_SET) { asn1_unexpected(&hdr, "DPP: Expected SET (Attributes)");
wpa_printf(MSG_DEBUG,
"DPP: Expected SET (Attributes) - found class %d tag 0x%x",
hdr.class, hdr.tag);
goto fail; goto fail;
} }
if (hdr.payload + hdr.length < end) { if (hdr.payload + hdr.length < end) {
@ -1075,11 +1058,8 @@ dpp_parse_one_asymmetric_key(const u8 *buf, size_t len)
goto fail; goto fail;
} }
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 || !asn1_is_set(&hdr)) {
hdr.class != ASN1_CLASS_UNIVERSAL || hdr.tag != ASN1_TAG_SET) { asn1_unexpected(&hdr, "DPP: Expected SET (Attribute)");
wpa_printf(MSG_DEBUG,
"DPP: Expected SET (Attribute) - found class %d tag 0x%x",
hdr.class, hdr.tag);
goto fail; goto fail;
} }
pos = hdr.payload; pos = hdr.payload;
@ -1109,11 +1089,8 @@ dpp_parse_one_asymmetric_key(const u8 *buf, size_t len)
* (Contains DER encoding of ECPrivateKey) * (Contains DER encoding of ECPrivateKey)
*/ */
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 ||
hdr.class != ASN1_CLASS_UNIVERSAL || !asn1_is_octetstring(&hdr)) {
hdr.tag != ASN1_TAG_OCTETSTRING) { asn1_unexpected(&hdr, "DPP: Expected OCTETSTRING (PrivateKey)");
wpa_printf(MSG_DEBUG,
"DPP: Expected OCTETSTRING (PrivateKey) - found class %d tag 0x%x",
hdr.class, hdr.tag);
goto fail; goto fail;
} }
wpa_hexdump_key(MSG_MSGDUMP, "DPP: privacyProtectionKey", wpa_hexdump_key(MSG_MSGDUMP, "DPP: privacyProtectionKey",
@ -1136,11 +1113,9 @@ dpp_parse_one_asymmetric_key(const u8 *buf, size_t len)
key->pp_key); key->pp_key);
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 ||
hdr.class != ASN1_CLASS_UNIVERSAL || !asn1_is_utf8string(&hdr)) {
hdr.tag != ASN1_TAG_UTF8STRING) { asn1_unexpected(&hdr,
wpa_printf(MSG_DEBUG, "DPP: Expected UTF8STRING (configurationTemplate)");
"DPP: Expected UTF8STRING (configurationTemplate) - found class %d tag 0x%x",
hdr.class, hdr.tag);
goto fail; goto fail;
} }
wpa_hexdump_ascii_key(MSG_MSGDUMP, "DPP: configurationTemplate", wpa_hexdump_ascii_key(MSG_MSGDUMP, "DPP: configurationTemplate",
@ -1154,11 +1129,9 @@ dpp_parse_one_asymmetric_key(const u8 *buf, size_t len)
if (pos < end) { if (pos < end) {
if (asn1_get_next(pos, end - pos, &hdr) < 0 || if (asn1_get_next(pos, end - pos, &hdr) < 0 ||
hdr.class != ASN1_CLASS_UNIVERSAL || !asn1_is_utf8string(&hdr)) {
hdr.tag != ASN1_TAG_UTF8STRING) { asn1_unexpected(&hdr,
wpa_printf(MSG_DEBUG, "DPP: Expected UTF8STRING (connectorTemplate)");
"DPP: Expected UTF8STRING (connectorTemplate) - found class %d tag 0x%x",
hdr.class, hdr.tag);
goto fail; goto fail;
} }
wpa_hexdump_ascii_key(MSG_MSGDUMP, "DPP: connectorTemplate", wpa_hexdump_ascii_key(MSG_MSGDUMP, "DPP: connectorTemplate",