RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #117 from doegox/master

Browse source 
analyse nuid: fix crc -> selftest ok now
This commit is contained in:
Iceman 2019-03-07 15:17:49 +01:00 committed by GitHub
commit b5a9298961
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/cmdanalyse.c
View file

@ -850,15 +850,9 @@ void generate4bNUID(uint8_t *uid, uint8_t *nuid){
compute_crc(CRC_14443_A, uid, 3, &b1, &b2); compute_crc(CRC_14443_A, uid, 3, &b1, &b2);
nuid[0] |= (b2 & 0xE0) | 0xF; nuid[0] |= (b2 & 0xE0) | 0xF;
nuid[1] = b1; nuid[1] = b1;
crc = b1; crc = b1;
crc |= b2 << 8; crc |= b2 << 8;
crc = crc16_fast(&uid[3], 4, reflect16(crc), true, true);
crc = update_crc16(uid[3], crc);
crc = update_crc16(uid[4], crc);
crc = update_crc16(uid[5], crc);
crc = update_crc16(uid[6], crc);
nuid[2] = (crc >> 8) & 0xFF ; nuid[2] = (crc >> 8) & 0xFF ;
nuid[3] = crc & 0xFF; nuid[3] = crc & 0xFF;
} }
@ -870,6 +864,7 @@ int CmdAnalyseNuid(const char *Cmd){
char cmdp = tolower(param_getchar(Cmd, 0)); char cmdp = tolower(param_getchar(Cmd, 0));
if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid(); if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid();
/* src: http://www.gorferay.com/mifare-and-handling-of-uids/ */
/* selftest UID 040D681AB52281 -> NUID 8F430FEF */ /* selftest UID 040D681AB52281 -> NUID 8F430FEF */
if (cmdp == 't' || cmdp == 'T') { if (cmdp == 't' || cmdp == 'T') {
memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7); memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);