dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit to single-DES operation and return session key to client.

Browse Source
This commit is contained in:
Blaine Forbort
2014-12-20 17:18:26 -08:00
parent 085b0e2ea9
commit 3c05723ee2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
armsrc/mifaredesfire.c
View File

@@ -218,6 +218,8 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
// des, nyckel 0, // des, nyckel 0,
switch (mode){ switch (mode){
case 1:{ case 1:{
if (algo == 1) {
uint8_t keybytes[8]; uint8_t keybytes[8];
uint8_t RndA[8] = {0x00}; uint8_t RndA[8] = {0x00};
uint8_t RndB[8] = {0x00}; uint8_t RndB[8] = {0x00};
@@ -256,6 +258,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
memcpy(RndB, decRndB, 8); memcpy(RndB, decRndB, 8);
rol(decRndB,8); rol(decRndB,8);
// This should be random
uint8_t decRndA[8] = {0x00}; uint8_t decRndA[8] = {0x00};
memcpy(RndA, decRndA, 8); memcpy(RndA, decRndA, 8);
uint8_t encRndA[8] = {0x00}; uint8_t encRndA[8] = {0x00};
@@ -290,7 +293,8 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
struct desfire_key sessionKey = {0}; struct desfire_key sessionKey = {0};
desfirekey_t skey = &sessionKey; desfirekey_t skey = &sessionKey;
Desfire_session_key_new( RndA, RndB , key, skey ); Desfire_session_key_new( RndA, RndB , key, skey );
print_result("SESSION : ", skey->data, 8); //print_result("SESSION : ", skey->data, 8);
cmd_send(CMD_ACK,1,0,0,skey->data,8);
} else { } else {
DbpString("Authetication failed."); DbpString("Authetication failed.");
@@ -310,6 +314,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
} }
}
} }
break; break;
case 2: case 2: