st -> st25ta

This commit is contained in:
Philippe Teuwen
2021-05-30 14:55:58 +02:00
parent 4c44138557
commit 4b00db8e48
11 changed files with 794 additions and 755 deletions
+1
View File
@@ -253,6 +253,7 @@ set (TARGET_SOURCES
${PM3_ROOT}/client/src/cmdhfmfu.c
${PM3_ROOT}/client/src/cmdhfseos.c
${PM3_ROOT}/client/src/cmdhfst.c
${PM3_ROOT}/client/src/cmdhfst25ta.c
${PM3_ROOT}/client/src/cmdhfthinfilm.c
${PM3_ROOT}/client/src/cmdhftopaz.c
${PM3_ROOT}/client/src/cmdhfwaveshare.c
+1
View File
@@ -485,6 +485,7 @@ SRCS = aiddesfire.c \
cmdhfmfp.c \
cmdhfseos.c \
cmdhfst.c \
cmdhfst25ta.c \
cmdhfthinfilm.c \
cmdhftopaz.c \
cmdhfwaveshare.c \
+1
View File
@@ -120,6 +120,7 @@ add_library(pm3rrg_rdv4 SHARED
${PM3_ROOT}/client/src/cmdhfmfp.c
${PM3_ROOT}/client/src/cmdhfmfu.c
${PM3_ROOT}/client/src/cmdhfst.c
${PM3_ROOT}/client/src/cmdhfst25ta.c
${PM3_ROOT}/client/src/cmdhfthinfilm.c
${PM3_ROOT}/client/src/cmdhftopaz.c
${PM3_ROOT}/client/src/cmdhfwaveshare.c
+1
View File
@@ -252,6 +252,7 @@ set (TARGET_SOURCES
${PM3_ROOT}/client/src/cmdhfmfp.c
${PM3_ROOT}/client/src/cmdhfmfu.c
${PM3_ROOT}/client/src/cmdhfst.c
${PM3_ROOT}/client/src/cmdhfst25ta.c
${PM3_ROOT}/client/src/cmdhfthinfilm.c
${PM3_ROOT}/client/src/cmdhftopaz.c
${PM3_ROOT}/client/src/cmdhfwaveshare.c
+2 -2
View File
@@ -37,7 +37,7 @@
#include "cmdhflto.h" // LTO-CM
#include "cmdhfcryptorf.h" // CryptoRF
#include "cmdhfseos.h" // SEOS
#include "cmdhfst.h" // ST rothult
#include "cmdhfst25ta.h" // ST25TA
#include "cmdhfwaveshare.h" // Waveshare
#include "cmdtrace.h" // trace list
#include "ui.h"
@@ -412,7 +412,7 @@ static command_t CommandTable[] = {
{"mfu", CmdHFMFUltra, AlwaysAvailable, "{ MIFARE Ultralight RFIDs... }"},
{"mfdes", CmdHFMFDes, AlwaysAvailable, "{ MIFARE Desfire RFIDs... }"},
{"seos", CmdHFSeos, AlwaysAvailable, "{ SEOS RFIDs... }"},
{"st", CmdHFST, AlwaysAvailable, "{ ST Rothult RFIDs... }"},
{"st25ta", CmdHFST25TA, AlwaysAvailable, "{ ST25TA RFIDs... }"},
{"thinfilm", CmdHFThinfilm, AlwaysAvailable, "{ Thinfilm RFIDs... }"},
{"topaz", CmdHFTopaz, AlwaysAvailable, "{ TOPAZ (NFC Type 1) RFIDs... }"},
{"waveshare", CmdHFWaveshare, AlwaysAvailable, "{ Waveshare NFC ePaper... }"},
+4 -740
View File
File diff suppressed because it is too large Load Diff
+1 -2
View File
@@ -13,7 +13,6 @@
#include "common.h"
int CmdHFST(const char *Cmd);
int CmdHFSTNdefRead(const char *Cmd);
char *get_st_chip_model(uint8_t pc);
#endif
File diff suppressed because it is too large Load Diff
+19
View File
@@ -0,0 +1,19 @@
//-----------------------------------------------------------------------------
// Copyright (C) 2020 iceman1001
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
//-----------------------------------------------------------------------------
// High frequency ISO14443A / ST25TA commands
//-----------------------------------------------------------------------------
#ifndef CMDHFST25TA_H__
#define CMDHFST25TA_H__
#include "common.h"
int CmdHFST25TA(const char *Cmd);
int CmdHFST25TANdefRead(const char *Cmd);
#endif
+2 -2
View File
@@ -15,7 +15,7 @@
#include "cmdhfmf.h"
#include "cmdhfmfp.h"
#include "cmdhfmfu.h"
#include "cmdhfst.h"
#include "cmdhfst25ta.h"
#include "cmdhfthinfilm.h"
#include "cmdhftopaz.h"
@@ -145,7 +145,7 @@ static int CmdNFCType4ARead(const char *Cmd) {
}
static int CmdNFCST25TARead(const char *Cmd) {
return CmdHFSTNdefRead(Cmd);
return CmdHFST25TANdefRead(Cmd);
}
static int CmdNFCType4AHelp(const char *Cmd);
+9 -9
View File
@@ -518,19 +518,19 @@ Check column "offline" for their availability.
|`hf seos list `|Y |`List SEOS history`
### hf st
### hf st25ta
{ ST Rothult RFIDs... }
{ ST25TA RFIDs... }
|command |offline |description
|------- |------- |-----------
|`hf st help `|Y |`This help`
|`hf st info `|N |`Tag information`
|`hf st list `|Y |`List ISO 14443A/7816 history`
|`hf st ndefread `|Y |`read NDEF file on tag`
|`hf st protect `|N |`change protection on tag`
|`hf st pwd `|N |`change password on tag`
|`hf st sim `|N |`Fake ISO 14443A/ST tag`
|`hf st25ta help `|Y |`This help`
|`hf st25ta info `|N |`Tag information`
|`hf st25ta list `|Y |`List ISO 14443A/7816 history`
|`hf st25ta ndefread `|Y |`read NDEF file on tag`
|`hf st25ta protect `|N |`change protection on tag`
|`hf st25ta pwd `|N |`change password on tag`
|`hf st25ta sim `|N |`Fake ISO 14443A/ST tag`
### hf thinfilm