github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-23 06:35:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

Browse source
This commit is contained in:
iceman1001 2020-03-31 09:44:45 +02:00
commit 30eadac43d
2 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/mifare/ndef.c
View file

@ -32,16 +32,24 @@ static const char *TypeNameFormat_s[] = {
static const char *ndefSigType_s[] = { static const char *ndefSigType_s[] = {
"Not present", // No signature present "Not present", // No signature present
"RSASSA_PSS_SHA_1", // PKCS_1 "RSASSA_PSS_SHA_1 (1024)", // PKCS_1
"RSASSA_PKCS1_v1_5_WITH_SHA_1", // PKCS_1 "RSASSA_PKCS1_v1_5_WITH_SHA_1 (1024)", // PKCS_1
"DSA", "DSA-1024",
"ECDSA", "ECDSA-P192",
"RSASSA-PSS-2048",
"RSASSA-PKCS1-v1_5-2048",
"DSA-2048",
"ECDSA-P224",
"ECDSA-K233",
"ECDSA-B233",
"ECDSA-P256",
"n/a" "n/a"
}; };
static const char *ndefCertificateFormat_s[] = { static const char *ndefCertificateFormat_s[] = {
"X_509", "X_509",
"X9_68", "X9_68 (M2M)",
"n/a" "n/a"
}; };
@ -169,7 +177,7 @@ static int ndefDecodeSig(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) { if (sigType == stECDSA_P192) {
indx += 3; indx += 3;
PrintAndLogEx(NORMAL, "\tsignature [%zu]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen)); PrintAndLogEx(NORMAL, "\tsignature [%zu]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));

17
client/mifare/ndef.h
View file

@ -24,12 +24,19 @@ typedef enum {
} TypeNameFormat_t; } TypeNameFormat_t;
typedef enum { typedef enum {
stNotPresent = 0x00, stNotPresent = 0x00,
stRSASSA_PSS_SHA_1 = 0x01, stRSASSA_PSS_SHA_1 = 0x01,
stRSASSA_PKCS1_v1_5_WITH_SHA_1 = 0x02, stRSASSA_PKCS1_v1_5_WITH_SHA_1 = 0x02,
stDSA = 0x03, stDSA_1024 = 0x03,
stECDSA = 0x04, stECDSA_P192 = 0x04,
stNA = 0x05 stRSASSA_PSS_2048 = 0x05,
stRSASSA_PKCS1_v1_5_2048 = 0x06,
stDSA_2048 = 0x07,
stECDSA_P224 = 0x08,
stECDSA_K233 = 0x09,
stECDSA_B233 = 0x0a,
stECDSA_P256 = 0x0b,
stNA = 0x0c
} ndefSigType_t; } ndefSigType_t;
typedef enum { typedef enum {