update changelog

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

diff --git a/client/loclass/cipher.h b/client/loclass/cipher.h
index 10ea8059bde26f9fdfa1b2809e51a0cb1ed67a95..bdea94322a82aba0e06c95933a6b08e3e6123dd9 100644 (file)
--- a/client/loclass/cipher.h
+++ b/client/loclass/cipher.h
@@ -1,5 +1,17 @@
 /*****************************************************************************
 /*****************************************************************************

- * This file is part of iClassCipher. It is a reconstructon of the cipher engine
+ * WARNING
+ *
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
+ * 
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
+ * 
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ *
+ *****************************************************************************
+ *
+ * This file is part of loclass. It is a reconstructon of the cipher engine

  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by
  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by


@@ -18,29 +30,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with IClassCipher.  If not, see <http://www.gnu.org/licenses/>.
+ * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * 

  ****************************************************************************/
 
  ****************************************************************************/
 

+

 #ifndef CIPHER_H
 #define CIPHER_H
 #include <stdint.h>
 
 #ifndef CIPHER_H
 #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, uint8_t *div_key_p, uint8_t *mac);
+void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]);
+#ifndef ON_DEVICE
+int testMAC();
+#endif

 
 #endif // CIPHER_H
 
 #endif // CIPHER_H