RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-21 04:29:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

added signature verify

Browse source
This commit is contained in:
merlokk 2018-11-26 17:52:02 +02:00
parent b67bcac28e
commit 705d0b7a6b
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhffido.c
View file

@ -648,7 +648,7 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
return 0; return 0;
} }
bool CheckHash(json_t *json, uint8_t *hash) { bool CheckrpIdHash(json_t *json, uint8_t *hash) {
char hashval[300] = {0}; char hashval[300] = {0};
uint8_t hash2[32] = {0}; uint8_t hash2[32] = {0};
@ -692,7 +692,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32)); PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
// check RP ID Hash // check RP ID Hash
if (CheckHash(root, ubuf)) { if (CheckrpIdHash(root, ubuf)) {
PrintAndLog("rpIdHash OK."); PrintAndLog("rpIdHash OK.");
} else { } else {
PrintAndLog("rpIdHash ERROR!"); PrintAndLog("rpIdHash ERROR!");
@ -786,13 +786,21 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
PrintAndLog(" s: %s", sprint_hex(sval, 32)); PrintAndLog(" s: %s", sprint_hex(sval, 32));
} }
uint8_t clientDataHash[32] = {0};
size_t clientDataHashLen = 0;
res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
if (res || clientDataHashLen != 32) {
PrintAndLog("ERROR: Can't get clientDataHash from json!");
return 2;
}
uint8_t xbuf[4096] = {0}; uint8_t xbuf[4096] = {0};
size_t xbuflen = 0; size_t xbuflen = 0;
res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen, res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
authDataStatic, 37, // rpIdHash[32] + flags[1] + signCount[4] authDataStatic, 37, // rpIdHash[32] + flags[1] + signCount[4]
&data[0], 32, // Hash of the serialized client data clientDataHash, 32, // Hash of the serialized client data. "$.ClientDataHash" from json
NULL, 0); NULL, 0);
//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen)); PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen); res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
if (res) { if (res) {
if (res == -0x4e00) { if (res == -0x4e00) {