mirror of
https://github.com/Proxmark/proxmark3.git
synced 2024-09-22 07:46:30 +08:00
7fe9b0b742
Next Step is refactoring some of the giant functions which are just copy/paste of some other ones with just a few line changes, removing unnecessary 'goto' etc. The MS Windows version is broken with this commit but will be fixed soon. Everything can't be done all at once :P The commands are now hierarchical, for example: "hf 14a read" vs. "hf 14b read". You can also request help: "hf help", "data help", "hf 15 help" etc. Indents are now space-based, not tab-based anymore. Hopefully no one will be trolling about it, considering the suicide-prone work being done here ;) client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h, client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h, client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c, client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h, client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h, client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h, client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h, client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h, client/cmdhflegic.c, client/cmdhflegic.c: New files. client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c, client/proxmark3.h, client/Makefile: Update accordingly. client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes. client/translate.h, client/command.c, client/gui.c, client/usb.c, client/prox.h: Remove. include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd. common/crc16.h: New file. common/crc16.c: Modify accordingly. common/iso14443crc.h: New file. common/iso14443_crc.c: Rename to common/iso14443crc.c: and modify accordingly. armsrc/lfops.c, armsrc/iso14443.c, armsrc/iso14443a.c: include .h files from the common directory instead of including the c files. common/Makefile.common, armsrc/Makefile: Modify accordingly.
32 lines
968 B
C
32 lines
968 B
C
#include "iso14443crc.h"
|
|
|
|
static unsigned short UpdateCrc14443(unsigned char ch, unsigned short *lpwCrc)
|
|
{
|
|
ch = (ch ^ (unsigned char) ((*lpwCrc) & 0x00FF));
|
|
ch = (ch ^ (ch << 4));
|
|
*lpwCrc = (*lpwCrc >> 8) ^ ((unsigned short) ch << 8) ^
|
|
((unsigned short) ch << 3) ^ ((unsigned short) ch >> 4);
|
|
return (*lpwCrc);
|
|
}
|
|
|
|
void ComputeCrc14443(int CrcType,
|
|
unsigned char *Data, int Length,
|
|
unsigned char *TransmitFirst,
|
|
unsigned char *TransmitSecond)
|
|
{
|
|
unsigned char chBlock;
|
|
unsigned short wCrc=CrcType;
|
|
|
|
do {
|
|
chBlock = *Data++;
|
|
UpdateCrc14443(chBlock, &wCrc);
|
|
} while (--Length);
|
|
|
|
if (CrcType == CRC_14443_B)
|
|
wCrc = ~wCrc; /* ISO/IEC 13239 (formerly ISO/IEC 3309) */
|
|
|
|
*TransmitFirst = (unsigned char) (wCrc & 0xFF);
|
|
*TransmitSecond = (unsigned char) ((wCrc >> 8) & 0xFF);
|
|
return;
|
|
}
|