EAP-SIM/AKA: Fix check for anonymous decorated identity am: d1d0111b4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/13938020
Change-Id: I90f4d84a6c417921df9443326bfce539d321675e
diff --git a/src/eap_common/eap_sim_common.c b/src/eap_common/eap_sim_common.c
index 58861cd..ea38e6a 100644
--- a/src/eap_common/eap_sim_common.c
+++ b/src/eap_common/eap_sim_common.c
@@ -1209,10 +1209,23 @@
}
}
+static const u8 * get_last_char(const u8 *val, size_t len, char c)
+{
+ while (len > 0) {
+ const u8 *pos = &val[len - 1];
+
+ if (*pos == (u8) c)
+ return pos;
+ len--;
+ }
+
+ return NULL;
+}
+
int eap_sim_anonymous_username(const u8 *id, size_t id_len)
{
static const char *anonymous_id_prefix = "anonymous@";
- const char *decorated;
+ const u8 *decorated;
size_t anonymous_id_len = os_strlen(anonymous_id_prefix);
if (id_len > anonymous_id_len &&
@@ -1226,12 +1239,14 @@
if (id_len > 1 && id[0] == '@')
return 1; /* '@realm' */
- /* RFC 7542 decorated username, for example;
- homerealm.example.org!anonymous@otherrealm.example.net */
- decorated = os_strrchr((const char *)id, '!');
- if (decorated && os_strlen(decorated + 1) > 1) {
- return eap_sim_anonymous_username((const u8 *)(decorated + 1),
- os_strlen(decorated + 1));
+ /* RFC 7542 decorated username, for example:
+ * homerealm.example.org!anonymous@otherrealm.example.net */
+ decorated = get_last_char(id, id_len, '!');
+ if (decorated) {
+ decorated++;
+ return eap_sim_anonymous_username(decorated,
+ id + id_len - decorated);
}
return 0;
}
+