Merge pull request #2960 from STIEBELJOSHUA/hf-saflok
added hf saflok command
This commit is contained in:
8 files changed
+1040
-1
No files matched your search
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
||||||
|
|
||||||
## [unreleased][unreleased]
|
## [unreleased][unreleased]
|
||||||
|
- Added `hf saflok` commands (@stiebeljoshua)
|
||||||
- Added `ntag_clean.lua` script for easier NTAG memory wipe (@trigat)
|
- Added `ntag_clean.lua` script for easier NTAG memory wipe (@trigat)
|
||||||
- Changed from Bigbuf malloc to Bigbuf calloc calls on device side (@iceman1001)
|
- Changed from Bigbuf malloc to Bigbuf calloc calls on device side (@iceman1001)
|
||||||
- Added `lf t55xx view` - now viewing of T55XX dump files is possible (@iceman1001)
|
- Added `lf t55xx view` - now viewing of T55XX dump files is possible (@iceman1001)
|
||||||
|
|||||||
@@ -355,6 +355,7 @@ set (TARGET_SOURCES
|
|||||||
${PM3_ROOT}/client/src/cmdhfmfp.c
|
${PM3_ROOT}/client/src/cmdhfmfp.c
|
||||||
${PM3_ROOT}/client/src/cmdhfmfu.c
|
${PM3_ROOT}/client/src/cmdhfmfu.c
|
||||||
${PM3_ROOT}/client/src/cmdhfntag424.c
|
${PM3_ROOT}/client/src/cmdhfntag424.c
|
||||||
|
${PM3_ROOT}/client/src/cmdhfsaflok.c
|
||||||
${PM3_ROOT}/client/src/cmdhfseos.c
|
${PM3_ROOT}/client/src/cmdhfseos.c
|
||||||
${PM3_ROOT}/client/src/cmdhfst.c
|
${PM3_ROOT}/client/src/cmdhfst.c
|
||||||
${PM3_ROOT}/client/src/cmdhfst25ta.c
|
${PM3_ROOT}/client/src/cmdhfst25ta.c
|
||||||
|
|||||||
@@ -651,6 +651,7 @@ SRCS = mifare/aiddesfire.c \
|
|||||||
cmdhfmfu.c \
|
cmdhfmfu.c \
|
||||||
cmdhfmfp.c \
|
cmdhfmfp.c \
|
||||||
cmdhfntag424.c \
|
cmdhfntag424.c \
|
||||||
|
cmdhfsaflok.c \
|
||||||
cmdhfseos.c \
|
cmdhfseos.c \
|
||||||
cmdhfst.c \
|
cmdhfst.c \
|
||||||
cmdhfst25ta.c \
|
cmdhfst25ta.c \
|
||||||
|
|||||||
@@ -44,6 +44,7 @@
|
|||||||
#include "cmdhfmfp.h" // Mifare Plus
|
#include "cmdhfmfp.h" // Mifare Plus
|
||||||
#include "cmdhfmfdes.h" // DESFIRE
|
#include "cmdhfmfdes.h" // DESFIRE
|
||||||
#include "cmdhfntag424.h" // NTAG 424 DNA
|
#include "cmdhfntag424.h" // NTAG 424 DNA
|
||||||
|
#include "cmdhfsaflok.h" // Saflok
|
||||||
#include "cmdhfseos.h" // SEOS
|
#include "cmdhfseos.h" // SEOS
|
||||||
#include "cmdhfst25ta.h" // ST25TA
|
#include "cmdhfst25ta.h" // ST25TA
|
||||||
#include "cmdhftesla.h" // Tesla
|
#include "cmdhftesla.h" // Tesla
|
||||||
@@ -594,6 +595,7 @@ static command_t CommandTable[] = {
|
|||||||
{"mfu", CmdHFMFUltra, AlwaysAvailable, "{ MIFARE Ultralight RFIDs... }"},
|
{"mfu", CmdHFMFUltra, AlwaysAvailable, "{ MIFARE Ultralight RFIDs... }"},
|
||||||
{"mfdes", CmdHFMFDes, AlwaysAvailable, "{ MIFARE Desfire RFIDs... }"},
|
{"mfdes", CmdHFMFDes, AlwaysAvailable, "{ MIFARE Desfire RFIDs... }"},
|
||||||
{"ntag424", CmdHF_ntag424, AlwaysAvailable, "{ NXP NTAG 4242 DNA RFIDs... }"},
|
{"ntag424", CmdHF_ntag424, AlwaysAvailable, "{ NXP NTAG 4242 DNA RFIDs... }"},
|
||||||
|
{"saflok", CmdHFSaflok, AlwaysAvailable, "{ Saflok MFC RFIDs... }"},
|
||||||
{"seos", CmdHFSeos, AlwaysAvailable, "{ SEOS RFIDs... }"},
|
{"seos", CmdHFSeos, AlwaysAvailable, "{ SEOS RFIDs... }"},
|
||||||
{"st25ta", CmdHFST25TA, AlwaysAvailable, "{ ST25TA RFIDs... }"},
|
{"st25ta", CmdHFST25TA, AlwaysAvailable, "{ ST25TA RFIDs... }"},
|
||||||
{"tesla", CmdHFTESLA, AlwaysAvailable, "{ TESLA Cards... }"},
|
{"tesla", CmdHFTESLA, AlwaysAvailable, "{ TESLA Cards... }"},
|
||||||
|
|||||||
@@ -367,7 +367,7 @@ int mfc_ev1_print_signature(uint8_t *uid, uint8_t uidlen, uint8_t *signature, in
|
|||||||
return originality_check_print(signature, signature_len, index);
|
return originality_check_print(signature, signature_len, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mf_read_uid(uint8_t *uid, int *uidlen, int *nxptype) {
|
int mf_read_uid(uint8_t *uid, int *uidlen, int *nxptype) {
|
||||||
clearCommandBuffer();
|
clearCommandBuffer();
|
||||||
SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
|
SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
|
||||||
PacketResponseNG resp;
|
PacketResponseNG resp;
|
||||||
|
|||||||
@@ -44,4 +44,6 @@ int mf_print_keys(uint16_t n, uint8_t *d);
|
|||||||
void mf_print_blocks(uint16_t n, uint8_t *d, bool verbose);
|
void mf_print_blocks(uint16_t n, uint8_t *d, bool verbose);
|
||||||
|
|
||||||
int mfc_ev1_print_signature(uint8_t *uid, uint8_t uidlen, uint8_t *signature, int signature_len);
|
int mfc_ev1_print_signature(uint8_t *uid, uint8_t uidlen, uint8_t *signature, int signature_len);
|
||||||
|
|
||||||
|
int mf_read_uid(uint8_t *uid, int *uidlen, int *nxptype);
|
||||||
#endif
|
#endif
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,26 @@
|
|||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// See LICENSE.txt for the text of the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Saflok commands
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#ifndef CMDHFSaflok_H__
|
||||||
|
#define CMDHFSaflok_H__
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
int CmdHFSaflok(const char *Cmd);
|
||||||
|
|
||||||
|
#endif
|
||||||
Reference in new issue
Block a user