## [unreleased][unreleased]
### Added
+- Added lf gproxii read - reads a gproxii tag from the antenna
- Added lf indala read - reads an indala tag from the antenna
- Added lf visa2000 demod, read, clone, sim commands (iceman)
- Added markers in the graph around found Sequence Terminator after askmandemod.
- Added option c to 'hf list' (mark CRC bytes) (piwi)
### Changed
+- `data askgproxiidemod has been moved to `lf gproxii demod` (reads from graphbuffer)
- `lf indalaclone` has been moved to `lf indala clone`
- `lf indalademod` has been moved to `lf indala altdemod` (reads from graphbuffer)
- `data pskindalademod` has been moved to `lf indala demod` (reads from graphbuffer)
cmdlfawid.c \
cmdlfcotag.c\
cmdlfem4x.c \
+ cmdlfgproxii.c \
cmdlfhid.c \
cmdlfhitag.c \
cmdlfio.c \
return ASKbiphaseDemod(Cmd, true);
}
-//could be split to a gProxII file
-//by marshmellow
-//attempts to demodulate and identify a G_Prox_II verex/chubb card
-//WARNING: if it fails during some points it will destroy the DemodBuffer data
-// but will leave the GraphBuffer intact.
-//if successful it will push askraw data back to demod buffer ready for emulation
-int CmdG_Prox_II_Demod(const char *Cmd)
-{
- if (!ASKbiphaseDemod(Cmd, false)){
- if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try");
- return 0;
- }
- size_t size = DemodBufferLen;
- //call lfdemod.c demod for gProxII
- int ans = gProxII_Demod(DemodBuffer, &size);
- if (ans < 0){
- if (g_debugMode) PrintAndLog("Error gProxII_Demod");
- return 0;
- }
- //got a good demod of 96 bits
- uint8_t ByteStream[8] = {0x00};
- uint8_t xorKey=0;
- size_t startIdx = ans + 6; //start after 6 bit preamble
-
- uint8_t bits_no_spacer[90];
- //so as to not mess with raw DemodBuffer copy to a new sample array
- memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
- // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
- size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
- if (bitLen != 72) {
- if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
- return 0;
- }
- // get key and then get all 8 bytes of payload decoded
- xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
- for (size_t idx = 0; idx < 8; idx++) {
- ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
- if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
- }
- //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
- //
- uint8_t fmtLen = ByteStream[0]>>2;
- uint32_t FC = 0;
- uint32_t Card = 0;
- //get raw 96 bits to print
- uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
- uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
- uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
-
- if (fmtLen==36){
- FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
- Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
- } else if(fmtLen==26){
- FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
- Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
- } else {
- PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
- PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8));
- }
- PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
- setDemodBuf(DemodBuffer+ans, 96, 0);
- return 1;
-}
-
//by marshmellow - see ASKDemod
int Cmdaskrawdemod(const char *Cmd)
{
{
{"help", CmdHelp, 1, "This help"},
{"askedgedetect", CmdAskEdgeDetect, 1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
- {"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"},
{"autocorr", CmdAutoCorr, 1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
{"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
{"bin2hex", Cmdbin2hex, 1, "bin2hex <digits> -- Converts binary to hexadecimal"},
void printDemodBuff(void);
void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);
int CmdPrintDemodBuff(const char *Cmd);
-int CmdG_Prox_II_Demod(const char *Cmd);
int Cmdaskrawdemod(const char *Cmd);
int Cmdaskmandemod(const char *Cmd);
int AutoCorrelate(int window, bool SaveGrph, bool verbose);
#include "cmdlfcotag.h" // for COTAG menu
#include "cmdlfvisa2000.h" // for VISA2000 menu
#include "cmdlfindala.h" // for indala menu
+#include "cmdlfgproxii.h"// for gproxii menu
bool g_lf_threshold_set = false;
static int CmdHelp(const char *Cmd);
{"awid", CmdLFAWID, 1, "{ AWID RFIDs... }"},
{"cotag", CmdLFCOTAG, 1, "{ COTAG RFIDs... }"},
{"em", CmdLFEM4X, 1, "{ EM4X RFIDs... }"},
+ {"gproxii", CmdLF_G_Prox_II, 1, "{ G Prox II tags... }"},
{"hid", CmdLFHID, 1, "{ HID RFIDs... }"},
{"hitag", CmdLFHitag, 1, "{ Hitag tags and transponders... }"},
{"io", CmdLFIO, 1, "{ ioProx tags... }"},
--- /dev/null
+//-----------------------------------------------------------------------------
+//
+// 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.
+//-----------------------------------------------------------------------------
+// Low frequency G Prox II tag commands
+//-----------------------------------------------------------------------------
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+#include "cmdlfgproxii.h"
+#include "proxmark3.h"
+#include "ui.h"
+#include "util.h"
+#include "graph.h"
+#include "cmdparser.h"
+#include "cmddata.h"
+#include "cmdmain.h"
+#include "cmdlf.h"
+#include "lfdemod.h"
+static int CmdHelp(const char *Cmd);
+
+//by marshmellow
+//attempts to demodulate and identify a G_Prox_II verex/chubb card
+//WARNING: if it fails during some points it will destroy the DemodBuffer data
+// but will leave the GraphBuffer intact.
+//if successful it will push askraw data back to demod buffer ready for emulation
+int CmdG_Prox_II_Demod(const char *Cmd)
+{
+ if (!ASKbiphaseDemod(Cmd, false)){
+ if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try");
+ return 0;
+ }
+ size_t size = DemodBufferLen;
+ //call lfdemod.c demod for gProxII
+ int ans = gProxII_Demod(DemodBuffer, &size);
+ if (ans < 0){
+ if (g_debugMode) PrintAndLog("Error gProxII_Demod");
+ return 0;
+ }
+ //got a good demod of 96 bits
+ uint8_t ByteStream[8] = {0x00};
+ uint8_t xorKey=0;
+ size_t startIdx = ans + 6; //start after 6 bit preamble
+
+ uint8_t bits_no_spacer[90];
+ //so as to not mess with raw DemodBuffer copy to a new sample array
+ memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
+ // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
+ size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
+ if (bitLen != 72) {
+ if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
+ return 0;
+ }
+ // get key and then get all 8 bytes of payload decoded
+ xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
+ for (size_t idx = 0; idx < 8; idx++) {
+ ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
+ if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
+ }
+ //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
+ //
+ uint8_t fmtLen = ByteStream[0]>>2;
+ uint32_t FC = 0;
+ uint32_t Card = 0;
+ //get raw 96 bits to print
+ uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
+ uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
+ uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
+
+ if (fmtLen==36){
+ FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
+ Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
+ PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
+ } else if(fmtLen==26){
+ FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
+ Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
+ PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
+ } else {
+ PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
+ PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8));
+ }
+ PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
+ setDemodBuf(DemodBuffer+ans, 96, 0);
+ return 1;
+}
+//by marshmellow
+//see ASKDemod for what args are accepted
+int CmdG_Prox_II_Read(const char *Cmd) {
+ // read lf silently
+ CmdLFRead("s");
+ // get samples silently
+ getSamples("10000",false);
+ // demod and output viking ID
+ return CmdG_Prox_II_Demod(Cmd);
+}
+
+static command_t CommandTable[] = {
+ {"help", CmdHelp, 1, "This help"},
+ {"demod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from the GraphBuffer"},
+ {"read", CmdG_Prox_II_Read, 0, "Attempt to read and Extract tag data from the antenna"},
+ {NULL, NULL, 0, NULL}
+};
+
+int CmdLF_G_Prox_II(const char *Cmd) {
+ CmdsParse(CommandTable, Cmd);
+ return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+ CmdsHelp(CommandTable);
+ return 0;
+}
--- /dev/null
+//-----------------------------------------------------------------------------
+//
+// 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.
+//-----------------------------------------------------------------------------
+// Low frequency G Prox II tag commands
+//-----------------------------------------------------------------------------
+#ifndef CMDLFGPROXII_H__
+#define CMDLFGPROXII_H__
+extern int CmdLF_G_Prox_II(const char *Cmd);
+extern int CmdG_Prox_II_Demod(const char *Cmd);
+extern int CmdG_Prox_II_Read(const char *Cmd);
+#endif
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
//-----------------------------------------------------------------------------
-// Low frequency T55xx commands
+// Low frequency Presco tag commands
//-----------------------------------------------------------------------------
#ifndef CMDLFPRESCO_H__
#define CMDLFPRESCO_H__
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
//-----------------------------------------------------------------------------
-// Low frequency T55xx commands
+// Low frequency Farpoint / Pyramid commands
//-----------------------------------------------------------------------------
#ifndef CMDLFPYRAMID_H__
#define CMDLFPYRAMID_H__
return ((uint64_t)0xF2 << 56) | ((uint64_t)id << 8) | checksum;
}
-//could be moved to a viking file
//by marshmellow
//see ASKDemod for what args are accepted
int CmdVikingDemod(const char *Cmd) {
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
//-----------------------------------------------------------------------------
-// Low frequency T55xx commands
+// Low frequency viking tag commands
//-----------------------------------------------------------------------------
#ifndef CMDLFVIKING_H__
#define CMDLFVIKING_H__
extern int CmdVikingClone(const char *Cmd);
extern int CmdVikingSim(const char *Cmd);
#endif
-
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
//-----------------------------------------------------------------------------
-// Low frequency visa 200 tag commands
+// Low frequency visa 2000 tag commands
// by iceman
//-----------------------------------------------------------------------------
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
//-----------------------------------------------------------------------------
-// Low frequency T55xx commands
+// Low frequency visa 2000 commands
//-----------------------------------------------------------------------------
#ifndef CMDLFVISA2000_H__
#define CMDLFVISA2000_H__
projects / proxmark3-svn / commitdiff