Merge branch 'master' of github.com:Proxmark/proxmark3 into travis

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

diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index cb090f695f18b916d9f87afd4c0b35920e7375ca..568671791c9fff3eadc1560cdf6b95a4830c42e0 100644 (file)
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -22,7 +22,7 @@
  *
  * 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
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 
@@ -59,9 +58,10 @@ bool headBit( BitstreamIn *stream);
 bool tailBit( BitstreamIn *stream);
 void pushBit( BitstreamOut *stream, bool bit);
 int bitsLeft( BitstreamIn *stream);
-
+#ifndef ON_DEVICE
 int testCipherUtils(void);
 int testMAC();
+#endif
 void push6bits( BitstreamOut* stream, uint8_t bits);
 void EncryptDES(bool key[56], bool outBlk[64], bool inBlk[64], int verbose) ;
 void x_num_to_bytes(uint64_t n, size_t len, uint8_t* dest);