Commit c501e972 by developer2

For Mifare Plus in SL3 uses Mifare Classic functions with AES key calculated from Crypto 1 key.

parent 61aa701b
...@@ -10,7 +10,7 @@ all : help ...@@ -10,7 +10,7 @@ all : help
info : info :
echo "-------------------------------------------------------------------------" echo "-------------------------------------------------------------------------"
echo "Building executables" echo "Building executables"
echo "---> version: 1.0" echo "---> version: 1.2"
echo "-------------------------------------------------------------------------" echo "-------------------------------------------------------------------------"
echo echo
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<termios.h> <termios.h>
"../src/ufr.h" "../src/ufr.h"
1568102144 source:f:\git\ufr\c-examples\ufr-mf-examples-c\src\main.cpp 1572247520 source:f:\git\ufr\c-examples\ufr-mf-examples-c\src\main.cpp
<iostream> <iostream>
<conio.h> <conio.h>
<windows.h> <windows.h>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<termios.h> <termios.h>
"../src/ufr.h" "../src/ufr.h"
1568102110 f:\git\ufr\c-examples\ufr-mf-examples-c\src\ufr.h 1572246757 f:\git\ufr\c-examples\ufr-mf-examples-c\src\ufr.h
<string> <string>
<iostream> <iostream>
<sstream> <sstream>
...@@ -119,12 +119,12 @@ ...@@ -119,12 +119,12 @@
<string.h> <string.h>
"../lib/include/uFCoder.h" "../lib/include/uFCoder.h"
1567176167 f:\git\ufr\c-examples\ufr-mf-examples-c\lib\include\ufcoder.h 1569828183 f:\git\ufr\c-examples\ufr-mf-examples-c\lib\include\ufcoder.h
<stdint.h> <stdint.h>
<stddef.h> <stddef.h>
<jni.h> <jni.h>
1568358096 source:f:\git\ufr\c-examples\ufr-mf-examples-c\src\ufr.cpp 1572247408 source:f:\git\ufr\c-examples\ufr-mf-examples-c\src\ufr.cpp
"../src/ufr.h" "../src/ufr.h"
<conio.h> <conio.h>
<windows.h> <windows.h>
......
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<FileVersion major="1" minor="0" /> <FileVersion major="1" minor="0" />
<ActiveTarget name="Release" /> <ActiveTarget name="Debug" />
<File name="src\ufr.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="src\ufr.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="1344" topLine="7" /> <Cursor1 position="36879" topLine="1347" />
</Cursor> </Cursor>
</File> </File>
<File name="src\main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="src\ufr.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="2476" topLine="77" /> <Cursor1 position="1323" topLine="3" />
</Cursor> </Cursor>
</File> </File>
<File name="src\ufr.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="src\main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="44679" topLine="1503" /> <Cursor1 position="6151" topLine="224" />
</Cursor> </Cursor>
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>
lib @ f6206f5b
Subproject commit 1c5b468431bfad9a2152c5deb92a4525bd14ff79 Subproject commit f6206f5b0f67f82287011a0ebb375b7643c94943
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -253,12 +253,6 @@ void menu(char key) ...@@ -253,12 +253,6 @@ void menu(char key)
printf("--------------------------------------------------\n"); printf("--------------------------------------------------\n");
break; break;
case 'k':
case 'K':
operation_ReaderKeyWriteAes();
printf("--------------------------------------------------\n");
break;
case 'f': case 'f':
case 'F': case 'F':
operation_ValueBlockInSectorRead(); operation_ValueBlockInSectorRead();
...@@ -283,8 +277,8 @@ void menu(char key) ...@@ -283,8 +277,8 @@ void menu(char key)
printf("--------------------------------------------------\n"); printf("--------------------------------------------------\n");
break; break;
case 'l': case 'k':
case 'L': case 'K':
operation_ReaderKeyWrite(); operation_ReaderKeyWrite();
printf("--------------------------------------------------\n"); printf("--------------------------------------------------\n");
break; break;
...@@ -295,8 +289,8 @@ void menu(char key) ...@@ -295,8 +289,8 @@ void menu(char key)
printf("--------------------------------------------------\n"); printf("--------------------------------------------------\n");
break; break;
case 'm': case 'l':
case 'M': case 'L':
operation_SamKeyWrite(); operation_SamKeyWrite();
printf("--------------------------------------------------\n"); printf("--------------------------------------------------\n");
break; break;
......
...@@ -26,7 +26,6 @@ void operation_LinearRead(void); ...@@ -26,7 +26,6 @@ void operation_LinearRead(void);
void operation_LinearWrite(void); void operation_LinearWrite(void);
void operation_ReaderKeyWrite(void); void operation_ReaderKeyWrite(void);
void operation_ReaderKeyWriteAes(void); void operation_ReaderKeyWriteAes(void);
bool isCardMifarePlus(void);
void operation_SamKeyWrite(void); void operation_SamKeyWrite(void);
void operation_ValueBlockRead(void); void operation_ValueBlockRead(void);
void operation_ValueBlockWrite(void); void operation_ValueBlockWrite(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment