Move '--aidsearch' matching to regex

This commit is contained in:
kormax committed 2026-03-25 17:15:27 +02:00
1 parent 8ce5366b9e
commit 38d0ba12f9
3 files changed
+7 -28

No files matched your search

+3 -3
View File
@@ -2222,7 +2222,7 @@
"Name": "Apple VAS (OSE.VAS.01)",
"Description": "Apple VAS",
"Type": "loyalty",
"ResponseContains": "50084170706c65506179"
"ResponseRegex": ".*50084170706c65506179.*9000$"
},
{
"AID": "4F53452E5641532E3031",
@@ -2231,7 +2231,7 @@
"Name": "Google Smart Tap (OSE.VAS.01)",
"Description": "Google Smart Tap",
"Type": "loyalty",
"ResponseContains": "500a416e64726f6964506179"
"ResponseRegex": ".*500a416e64726f6964506179.*9000$"
},
{
"AID": "4F53452E5641532E3031",
@@ -2240,7 +2240,7 @@
"Name": "Samsung VAS (OSE.VAS.01)",
"Description": "Samsung VAS",
"Type": "loyalty",
"ResponseContains": "500d53616d73756e6757616c6c6574"
"ResponseRegex": ".*500d53616d73756e6757616c6c6574.*9000$"
},
{
"AID": "A000000476D0000101",
+2 -23
View File
@@ -112,27 +112,6 @@ static bool aidCompare(const char *aidlarge, const char *aidsmall) {
return false;
}
static bool ResponseContainsMatch(const char *needle, const char *text) {
if (needle == NULL || text == NULL || needle[0] == '\0' || text[0] == '\0') {
return false;
}
char *needle_lc = str_dup(needle);
char *text_lc = str_dup(text);
if (needle_lc == NULL || text_lc == NULL) {
free(needle_lc);
free(text_lc);
return false;
}
str_lower(needle_lc);
str_lower(text_lc);
bool matched = (strstr(text_lc, needle_lc) != NULL);
free(needle_lc);
free(text_lc);
return matched;
}
bool AIDGetFromElm(json_t *data, uint8_t *aid, size_t aidmaxlen, int *aidlen) {
*aidlen = 0;
const char *hexaid = jsonStrGet(data, "AID");
@@ -245,8 +224,8 @@ int PrintAIDDescriptionEx(json_t *xroot, char *aid, const uint8_t *response, siz
}
if (response_hex != NULL) {
const char *response_contains = jsonStrGet(data, "ResponseContains");
if (response_contains && ResponseContainsMatch(response_contains, response_hex)) {
const char *response_regex = jsonStrGet(data, "ResponseRegex");
if (response_regex && str_regex_match_case_insensitive(response_regex, response_hex)) {
contains_elm = data;
}
}