projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed last trace of crypto from makefile
[proxmark3-svn]
/
armsrc
/
mifarecmd.c
diff --git
a/armsrc/mifarecmd.c
b/armsrc/mifarecmd.c
index 22926dcfaf399f15c605000865939eafccfb7e70..a96164fc65114ccfa61e80cb22efbb606560fbbd 100644
(file)
--- a/
armsrc/mifarecmd.c
+++ b/
armsrc/mifarecmd.c
@@
-104,14
+104,14
@@
void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
if(!iso14443a_select_card(uid, NULL, &cuid)) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
if(!iso14443a_select_card(uid, NULL, &cuid)) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
- OnError(0);
\r
+
//
OnError(0);
\r
return;
\r
};
\r
\r
if(mifare_ultra_auth1(cuid, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
return;
\r
};
\r
\r
if(mifare_ultra_auth1(cuid, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-138,7
+138,7
@@
void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part2: Fail...");
\r
if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part2: Fail...");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-1141,14
+1141,14
@@
void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
if(!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
if(!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
};
\r
\r
if(mifare_desfire_des_auth1(cuid, dataout)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
return;
\r
};
\r
\r
if(mifare_desfire_des_auth1(cuid, dataout)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
- OnError(4);
\r
+
//
OnError(4);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-1171,7
+1171,7
@@
void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
if( isOK) {
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
\r
Dbprintf("Authentication part2: Failed");
\r
if( isOK) {
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
\r
Dbprintf("Authentication part2: Failed");
\r
- OnError(4);
\r
+
//
OnError(4);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-1181,4
+1181,4
@@
void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
-}
+}
\ No newline at end of file
Impressum
,
Datenschutz