From e13a25902fcb50fc7fb6e0344addde1c497981f0 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 31 Mar 2020 08:11:27 +0200 Subject: [PATCH] added more sigs --- client/mifare/ndef.c | 2 +- client/mifare/ndef.h | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c index e359e03fa..df8264330 100644 --- a/client/mifare/ndef.c +++ b/client/mifare/ndef.c @@ -177,7 +177,7 @@ static int ndefDecodeSig(uint8_t *sig, size_t siglen) { size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2]; // ecdsa 0x04 - if (sigType == stECDSA) { + if (sigType == stECDSA_P192) { indx += 3; PrintAndLogEx(NORMAL, "\tsignature [%zu]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen)); diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h index 7d9ca2fbf..71afda2ee 100644 --- a/client/mifare/ndef.h +++ b/client/mifare/ndef.h @@ -24,12 +24,19 @@ typedef enum { } TypeNameFormat_t; typedef enum { - stNotPresent = 0x00, - stRSASSA_PSS_SHA_1 = 0x01, + stNotPresent = 0x00, + stRSASSA_PSS_SHA_1 = 0x01, stRSASSA_PKCS1_v1_5_WITH_SHA_1 = 0x02, - stDSA = 0x03, - stECDSA = 0x04, - stNA = 0x05 + stDSA_1024 = 0x03, + stECDSA_P192 = 0x04, + 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; typedef enum {