Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / client / loclass / cipherutils.c

diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index e11e8d2247caf7bda75f66837d1be1c7c05687e7..9a8256bb38a700990fe6bddf4701116cdbaeac40 100644 (file)
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -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,7 +30,10 @@
  * 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/>.
+ * 
+ * 
+ * 

  ****************************************************************************/
 
 #include <stdint.h>
  ****************************************************************************/
 
 #include <stdint.h>


@@ -156,6 +171,7 @@ void printarr(char * name, uint8_t* arr, int len)
        }
        cx += snprintf(output+cx,outsize-cx,"};");
        prnlog(output);
        }
        cx += snprintf(output+cx,outsize-cx,"};");
        prnlog(output);

+       free(output);

 }
 
 void printvar(char * name, uint8_t* arr, int len)
 }
 
 void printvar(char * name, uint8_t* arr, int len)


@@ -173,6 +189,7 @@ void printvar(char * name, uint8_t* arr, int len)
        }
 
        prnlog(output);
        }
 
        prnlog(output);

+       free(output);

 }
 
 void printarr_human_readable(char * title, uint8_t* arr, int len)
 }
 
 void printarr_human_readable(char * title, uint8_t* arr, int len)


@@ -199,7 +216,7 @@ void printarr_human_readable(char * title, uint8_t* arr, int len)
 // Code for testing below
 //-----------------------------
 
 // Code for testing below
 //-----------------------------
 

-
+#ifndef ON_DEVICE

 int testBitStream()
 {
        uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
 int testBitStream()
 {
        uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};


@@ -272,3 +289,4 @@ int testCipherUtils(void)
        retval |= testReversedBitstream();
        return retval;
 }
        retval |= testReversedBitstream();
        return retval;
 }

+#endif