Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into Pentu...

[proxmark3-svn] / client / loclass / cipher.h

diff --git a/client/loclass/cipher.h b/client/loclass/cipher.h
index 4af92b16589eb91ce3ba91e45cbac54905adb704..7ebc3dc7928efb352b36398b7b083e8e79f63287 100644 (file)
--- a/client/loclass/cipher.h
+++ b/client/loclass/cipher.h
@@ -25,22 +25,7 @@
 #define CIPHER_H
 #include <stdint.h>
 
-/**
-* Definition 1 (Cipher state). A cipher state of iClass s is an element of F 40/2
-* consisting of the following four components:
-*      1. the left register l = (l 0 . . . l 7 ) ∈ F 8/2 ;
-*      2. the right register r = (r 0 . . . r 7 ) ∈ F 8/2 ;
-*      3. the top register t = (t 0 . . . t 15 ) ∈ F 16/2 .
-*      4. the bottom register b = (b 0 . . . b 7 ) ∈ F 8/2 .
-**/
-typedef struct {
-       uint8_t l;
-       uint8_t r;
-       uint8_t b;
-       uint16_t t;
-} State;
-
-void printarr(char * name, uint8_t* arr, int len);
-int calc_iclass_mac(uint8_t *cc_nr_p, int length, uint8_t *div_key_p, uint8_t *mac);
+void doMAC(uint8_t cc_nr[12],uint8_t div_key[8], uint8_t mac[4]);
+int testMAC();
 
 #endif // CIPHER_H