X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9b82de75f4a74b2d7f149dc161f0d3a3fb1752fa..a31f7f899b6d62c94bc236fce4330d6bbb8996e7:/client/loclass/ikeys.c?ds=sidebyside
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index cd2b72ee..2a6a0010 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -1,20 +1,28 @@
/*****************************************************************************
- * 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
* Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
* Milosch Meriac in the paper "Dismantling IClass".
*
- * This is a reference implementation of iclass key diversification. I'm sure it can be
- * optimized heavily. It is written for ease of understanding and correctness, please take it
- * and tweak it and make a super fast version instead, using this for testing and verification.
-
* Copyright (C) 2014 Martin Holst Swende
*
* This is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,8 +30,11 @@
* 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 .
+ * along with loclass. If not, see .
+ *
+ *
****************************************************************************/
+
/**
@@ -57,7 +68,7 @@ From "Dismantling iclass":
#include
#include "fileutils.h"
#include "cipherutils.h"
-#include "des.h"
+#include "polarssl/des.h"
uint8_t pi[35] = {0x0F,0x17,0x1B,0x1D,0x1E,0x27,0x2B,0x2D,0x2E,0x33,0x35,0x39,0x36,0x3A,0x3C,0x47,0x4B,0x4D,0x4E,0x53,0x55,0x56,0x59,0x5A,0x5C,0x63,0x65,0x66,0x69,0x6A,0x6C,0x71,0x72,0x74,0x78};
@@ -725,19 +736,19 @@ int doTestsWithKnownInputs()
int readKeyFile(uint8_t key[8])
{
-
FILE *f;
-
+ int retval = 1;
f = fopen("iclass_key.bin", "rb");
- if (f)
- {
- if(fread(key, sizeof(key), 1, f) == 1) return 0;
+ if (!f)
+ return retval;
+
+ if (fread(key, sizeof(uint8_t), 8, f) == 8) {
+ retval = 0;
}
- return 1;
-
+ fclose(f);
+ return retval;
}
-
int doKeyTests(uint8_t debuglevel)
{
debug_print = debuglevel;