github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndef signature1 length fix

Browse source
This commit is contained in:
merlokk 2020-03-31 19:26:09 +03:00
commit 737ebf9ab8
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/mifare/ndef.c
View file

@ -171,16 +171,19 @@ static int ndefDecodeSig1(uint8_t *sig, size_t siglen) {
size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2]; size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2];
// ecdsa 0x04 // ecdsa 0x04
if (sigType == stECDSA_P192) { if (sigType == stECDSA_P192 || sigType == stECDSA_P256) {
indx += 3; indx += 3;
int slen = 24;
if (sigType == stECDSA_P256)
slen = 32;
PrintAndLogEx(NORMAL, "\tsignature [%zu]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen)); PrintAndLogEx(NORMAL, "\tsignature [%zu]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));
uint8_t rval[300] = {0}; uint8_t rval[300] = {0};
uint8_t sval[300] = {0}; uint8_t sval[300] = {0};
int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval); int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
if (!res) { if (!res) {
PrintAndLogEx(NORMAL, "\t\tr: %s", sprint_hex(rval, 32)); PrintAndLogEx(NORMAL, "\t\tr: %s", sprint_hex(rval + 32 - slen, slen));
PrintAndLogEx(NORMAL, "\t\ts: %s", sprint_hex(sval, 32)); PrintAndLogEx(NORMAL, "\t\ts: %s", sprint_hex(sval + 32 - slen, slen));
} }
} }
indx += intsiglen; indx += intsiglen;