1
0
mirror of https://github.com/djhackersdev/bemanitools.git synced 2024-11-24 06:40:11 +01:00

Revert "Make roundplug PCBID/EAMID verification fail a hard error"

This reverts commit 67de6639ef.
This commit is contained in:
Will Toohey 2023-08-14 23:39:57 +10:00 committed by icex2
parent ebd80d3749
commit 820036087d
4 changed files with 83 additions and 16 deletions

View File

@ -56,6 +56,7 @@ void ddrhook1_config_eamuse_get(
{ {
char server_url[1024]; char server_url[1024];
char *tmp; char *tmp;
char *tmp2;
memset(config_eamuse, 0, sizeof(struct ddrhook1_config_eamuse)); memset(config_eamuse, 0, sizeof(struct ddrhook1_config_eamuse));
@ -101,8 +102,16 @@ void ddrhook1_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->pcbid)) { if (!security_id_verify(&config_eamuse->pcbid)) {
log_fatal("PCBID verification failed"); tmp = security_id_to_str(
return; &DDRHOOK1_CONFIG_EAMUSE_DEFAULT_PCBID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->pcbid, false);
log_warning(
"PCBID verification of '%s' failed, fallback to default "
"PCBID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
if (!cconfig_util_get_data( if (!cconfig_util_get_data(
@ -121,7 +130,15 @@ void ddrhook1_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->eamid)) { if (!security_id_verify(&config_eamuse->eamid)) {
log_fatal("EAMID verification failed"); tmp = security_id_to_str(
return; &DDRHOOK1_CONFIG_EAMUSE_DEFAULT_EAMID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->eamid, false);
log_warning(
"EAMID verification of '%s' failed, fallback to default "
"EAMID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
} }

View File

@ -68,6 +68,7 @@ void iidxhook_util_config_eamuse_get(
{ {
char server_url[1024]; char server_url[1024];
char *tmp; char *tmp;
char *tmp2;
memset(config_eamuse, 0, sizeof(struct iidxhook_util_config_eamuse)); memset(config_eamuse, 0, sizeof(struct iidxhook_util_config_eamuse));
@ -126,8 +127,16 @@ void iidxhook_util_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->pcbid)) { if (!security_id_verify(&config_eamuse->pcbid)) {
log_fatal("PCBID verification failed"); tmp = security_id_to_str(
return; &IIDXHOOK_CONFIG_EAMUSE_DEFAULT_PCBID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->pcbid, false);
log_warning(
"PCBID verification of '%s' failed, fallback to default "
"PCBID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
if (!cconfig_util_get_data( if (!cconfig_util_get_data(
@ -146,7 +155,15 @@ void iidxhook_util_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->eamid)) { if (!security_id_verify(&config_eamuse->eamid)) {
log_fatal("EAMID verification failed"); tmp = security_id_to_str(
return; &IIDXHOOK_CONFIG_EAMUSE_DEFAULT_EAMID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->eamid, false);
log_warning(
"EAMID verification of '%s' failed, fallback to default "
"EAMID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
} }

View File

@ -102,8 +102,16 @@ void jbhook1_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->pcbid)) { if (!security_id_verify(&config_eamuse->pcbid)) {
log_fatal("PCBID verification failed"); tmp = security_id_to_str(
return; &JBHOOK1_CONFIG_EAMUSE_DEFAULT_PCBID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->pcbid, false);
log_warning(
"PCBID verification of '%s' failed, fallback to default "
"PCBID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
if (!cconfig_util_get_data( if (!cconfig_util_get_data(
@ -122,7 +130,15 @@ void jbhook1_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->eamid)) { if (!security_id_verify(&config_eamuse->eamid)) {
log_fatal("EAMID verification failed"); tmp = security_id_to_str(
return; &JBHOOK1_CONFIG_EAMUSE_DEFAULT_EAMID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->eamid, false);
log_warning(
"EAMID verification of '%s' failed, fallback to default "
"EAMID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
} }

View File

@ -57,6 +57,7 @@ void popnhook1_config_eamuse_get(
{ {
char server_url[1024]; char server_url[1024];
char *tmp; char *tmp;
char *tmp2;
memset(config_eamuse, 0, sizeof(struct popnhook1_config_eamuse)); memset(config_eamuse, 0, sizeof(struct popnhook1_config_eamuse));
@ -102,8 +103,16 @@ void popnhook1_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->pcbid)) { if (!security_id_verify(&config_eamuse->pcbid)) {
log_fatal("PCBID verification failed"); tmp = security_id_to_str(
return; &POPNHOOK1_CONFIG_EAMUSE_DEFAULT_PCBID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->pcbid, false);
log_warning(
"PCBID verification of '%s' failed, fallback to default "
"PCBID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
if (!cconfig_util_get_data( if (!cconfig_util_get_data(
@ -122,7 +131,15 @@ void popnhook1_config_eamuse_get(
} }
if (!security_id_verify(&config_eamuse->eamid)) { if (!security_id_verify(&config_eamuse->eamid)) {
log_fatal("EAMID verification failed"); tmp = security_id_to_str(
return; &POPNHOOK1_CONFIG_EAMUSE_DEFAULT_EAMID_VALUE, false);
tmp2 = security_id_to_str(&config_eamuse->eamid, false);
log_warning(
"EAMID verification of '%s' failed, fallback to default "
"EAMID '%s'",
tmp2,
tmp);
free(tmp);
free(tmp2);
} }
} }