github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-26 16:15:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

emrtd info (online): Add basic hash verification support

Browse source
This commit is contained in:
Ave 2020-12-29 02:08:30 +03:00
commit dbe5d9ac9a
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
client/src/cmdhfemrtd.c
View file

@ -1633,9 +1633,22 @@ int infoHF_EMRTD(char *documentnumber, char *dob, char *expiry, bool BAC_availab
DropField(); DropField();
return PM3_ESOFT; return PM3_ESOFT;
} }
// TODO: DROP THIS TOO A LA OFFLINE
// Add EF_SOD to the list // Grab the hash list
// filelist[filelistlen++] = 0x77; uint8_t dg_hashes[16][64];
uint8_t hash_out[64];
if (!emrtd_select_and_read(response, &resplen, dg_table[EF_SOD].fileid, ks_enc, ks_mac, ssc, BAC, use_14b)) {
PrintAndLogEx(ERR, "Failed to read EF_SOD.");
DropField();
return PM3_ESOFT;
}
res = emrtd_parse_ef_sod_hashes(response, resplen, *dg_hashes);
if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Failed to read hash list from EF_SOD. Hash checks will fail.");
}
// Dump all files in the file list // Dump all files in the file list
for (int i = 0; i < filelistlen; i++) { for (int i = 0; i < filelistlen; i++) {
emrtd_dg_t *dg = emrtd_tag_to_dg(filelist[i]); emrtd_dg_t *dg = emrtd_tag_to_dg(filelist[i]);
@ -1647,6 +1660,14 @@ int infoHF_EMRTD(char *documentnumber, char *dob, char *expiry, bool BAC_availab
if (emrtd_select_and_read(response, &resplen, dg->fileid, ks_enc, ks_mac, ssc, BAC, use_14b)) { if (emrtd_select_and_read(response, &resplen, dg->fileid, ks_enc, ks_mac, ssc, BAC, use_14b)) {
if (dg->parser != NULL) if (dg->parser != NULL)
dg->parser(response, resplen); dg->parser(response, resplen);
// Check file hash
sha512hash(response, resplen, hash_out);
if (memcmp(dg_hashes[dg->dgnum], hash_out, 64) == 0) {
PrintAndLogEx(SUCCESS, _GREEN_("Hash verification passed for EF_DG%i."), dg->dgnum);
} else {
PrintAndLogEx(ERR, _RED_("Hash verification failed for EF_DG%i."), dg->dgnum);
}
} }
} }
} }
@ -1688,7 +1709,8 @@ int infoHF_EMRTD_offline(const char *path) {
} }
free(data); free(data);
uint8_t dg_hashes[20][64]; // Grab the hash list
uint8_t dg_hashes[16][64];
uint8_t hash_out[64]; uint8_t hash_out[64];
strcpy(filepath, path); strcpy(filepath, path);
@ -1722,6 +1744,8 @@ int infoHF_EMRTD_offline(const char *path) {
// we won't halt on parsing errors // we won't halt on parsing errors
if (dg->parser != NULL) if (dg->parser != NULL)
dg->parser(data, datalen); dg->parser(data, datalen);
// Check file hash
sha512hash(data, datalen, hash_out); sha512hash(data, datalen, hash_out);
if (memcmp(dg_hashes[dg->dgnum], hash_out, 64) == 0) { if (memcmp(dg_hashes[dg->dgnum], hash_out, 64) == 0) {
PrintAndLogEx(SUCCESS, _GREEN_("Hash verification passed for EF_DG%i."), dg->dgnum); PrintAndLogEx(SUCCESS, _GREEN_("Hash verification passed for EF_DG%i."), dg->dgnum);