mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2026-05-12 11:18:11 -07:00
add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk)
---most likely broke something.. :) needs proper testing.
This commit is contained in:
iceman1001
@@ -3,6 +3,9 @@ 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...
|
||||
|
||||
## [unreleased][unreleased]
|
||||
- Added `hf list mf` - deciphers crypto1 stream and works with first authentication and weak nested authentications (@Merlok)
|
||||
- Adjusted `lf cmdread` to respond to client when complete and the client will then automatically call `data samples` (@marshmellow42)
|
||||
- Added a bitbang mode to `lf cmdread` if delay is 0 the cmd bits turn off and on the antenna with 0 and 1 respectively (@marshmellow42)
|
||||
- dump / restore now uses custom filenames (@brianpow)
|
||||
- Removed 'hf mf sniff' , (@iceman), use HF 14A SNIFF instead
|
||||
- Added 'hf iclass lookup' (@iceman)
|
||||
|
||||
@@ -141,6 +141,7 @@ CMDSRCS = crapto1/crapto1.c \
|
||||
emv/cmdemv.c \
|
||||
cmdanalyse.c \
|
||||
cmdhf.c \
|
||||
cmdhflist.c \
|
||||
cmdhf14a.c \
|
||||
cmdhf14b.c \
|
||||
cmdhf15.c \
|
||||
|
||||
+111
-578
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -33,7 +33,7 @@
|
||||
#include "protocols.h"
|
||||
#include "parity.h" // oddparity
|
||||
#include "iso15693tools.h" // ISO15693 crc
|
||||
|
||||
#include "cmdhflist.h" // annotations
|
||||
|
||||
extern int CmdHF(const char *Cmd);
|
||||
extern int CmdHFTune(const char *Cmd);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,82 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
// Copyright (C) Merlok - 2017
|
||||
//
|
||||
// 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.
|
||||
//-----------------------------------------------------------------------------
|
||||
// Command: hf mf list. It shows data from arm buffer.
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifndef CMDHFLIST_H
|
||||
#define CMDHFLIST_H
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "util.h"
|
||||
#include "data.h"
|
||||
#include "ui.h"
|
||||
#include "cmdhf14a.h" // ISO14443-A
|
||||
#include "cmdhf14b.h" // ISO14443-B
|
||||
#include "cmdhf15.h" // ISO15693
|
||||
#include "cmdhfepa.h"
|
||||
#include "cmdhflegic.h" // LEGIC
|
||||
#include "cmdhficlass.h" // ICLASS
|
||||
#include "cmdhfmf.h" // CLASSIC
|
||||
#include "cmdhfmfu.h" // ULTRALIGHT/NTAG etc
|
||||
#include "cmdhfmfdes.h" // DESFIRE
|
||||
#include "cmdhftopaz.h" // TOPAZ
|
||||
#include "cmdhffelica.h" // ISO18092 / FeliCa
|
||||
#include "emv/cmdemv.h" // EMV
|
||||
#include "protocols.h"
|
||||
#include "crapto1/crapto1.h"
|
||||
#include "mifarehost.h"
|
||||
#include "mifaredefault.h"
|
||||
#include "parity.h" // oddparity
|
||||
#include "iso15693tools.h" // ISO15693 crc
|
||||
|
||||
|
||||
typedef struct {
|
||||
uint32_t uid; // UID
|
||||
uint32_t nt; // tag challenge
|
||||
uint32_t nt_enc; // encrypted tag challenge
|
||||
uint8_t nt_enc_par; // encrypted tag challenge parity
|
||||
uint32_t nr_enc; // encrypted reader challenge
|
||||
uint32_t ar_enc; // encrypted reader response
|
||||
uint8_t ar_enc_par; // encrypted reader response parity
|
||||
uint32_t at_enc; // encrypted tag response
|
||||
uint8_t at_enc_par; // encrypted tag response parity
|
||||
bool first_auth; // is first authentication
|
||||
uint32_t ks2; // ar ^ ar_enc
|
||||
uint32_t ks3; // at ^ at_enc
|
||||
} TAuthData;
|
||||
extern void ClearAuthData();
|
||||
|
||||
extern uint8_t iso14443A_CRC_check(bool isResponse, uint8_t* data, uint8_t len);
|
||||
extern uint8_t iso14443B_CRC_check(uint8_t* d, uint8_t n);
|
||||
extern uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len);
|
||||
extern uint8_t iso15693_CRC_check(uint8_t* d, uint8_t n);
|
||||
extern uint8_t iclass_CRC_check(bool isResponse, uint8_t* d, uint8_t n);
|
||||
|
||||
int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
|
||||
extern void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
|
||||
extern void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse);
|
||||
|
||||
extern bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen);
|
||||
extern bool NTParityChk(TAuthData *ad, uint32_t ntx);
|
||||
extern bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity);
|
||||
extern bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc);
|
||||
extern uint64_t GetCrypto1ProbableKey(TAuthData *ad);
|
||||
|
||||
#endif // CMDHFLIST
|
||||
@@ -101,4 +101,5 @@ extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t
|
||||
extern bool detect_classic_prng(void);
|
||||
extern int detect_classic_nackbug(bool verbose);
|
||||
extern void detect_classic_magic(void);
|
||||
extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
|
||||
#endif
|
||||
@@ -121,6 +121,7 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
|
||||
|
||||
char *tmp = (char *)buf;
|
||||
size_t i;
|
||||
memset(tmp, 0x00, hex_max_len);
|
||||
|
||||
int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;
|
||||
|
||||
|
||||
+11
-10
@@ -258,16 +258,17 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
|
||||
#define TOPAZ_WRITE_NE8 0x1B // Write-no-erase (eight bytes)
|
||||
|
||||
|
||||
// Definetions of which protocol annotations there are available
|
||||
#define ISO_14443A 0
|
||||
#define ICLASS 1
|
||||
#define ISO_14443B 2
|
||||
#define TOPAZ 3
|
||||
#define ISO_7816_4 4
|
||||
#define MFDES 5
|
||||
#define LEGIC 6
|
||||
#define ISO_15693 7
|
||||
#define FELICA 8
|
||||
// Definitions of which protocol annotations there are available
|
||||
#define ISO_14443A 0
|
||||
#define ICLASS 1
|
||||
#define ISO_14443B 2
|
||||
#define TOPAZ 3
|
||||
#define ISO_7816_4 4
|
||||
#define MFDES 5
|
||||
#define LEGIC 6
|
||||
#define ISO_15693 7
|
||||
#define FELICA 8
|
||||
#define PROTO_MIFARE 9
|
||||
|
||||
//-- Picopass fuses
|
||||
#define FUSE_FPERS 0x80
|
||||
|
||||
Reference in New Issue
Block a user