Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags (#842)

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index fd149045ac5a70b4eaab089e44ab0ba7427bdc22..7690004707881cd230f566afeed40aa7d49abe6c 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -10,8 +10,8 @@
 //
 // NOTES: 
 // LF Demod functions are placed here to allow the flexability to use client or
 //
 // NOTES: 
 // LF Demod functions are placed here to allow the flexability to use client or

-// device side. Most BUT NOT ALL of these functions are currenlty safe for 
-// device side use currently. (DetectST for example...)
+// device side. Most BUT NOT ALL of these functions are currently safe for 
+// device side use. (DetectST for example...)

 //
 // There are likely many improvements to the code that could be made, please
 // make suggestions...
 //
 // There are likely many improvements to the code that could be made, please
 // make suggestions...


@@ -1780,7 +1780,6 @@ int IOdemodFSK(uint8_t *dest, size_t size, int *waveStartIdx) {
 // indala id decoding
 int indala64decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
        //standard 64 bit indala formats including 26 bit 40134 format
 // indala id decoding
 int indala64decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
        //standard 64 bit indala formats including 26 bit 40134 format

-       // Note: these start with 3 bits from the end of one UID; the rest are from a subsequent one

        uint8_t preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
        uint8_t preamble64_i[] = {0,1,0,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
        size_t startidx = 0;
        uint8_t preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
        uint8_t preamble64_i[] = {0,1,0,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
        size_t startidx = 0;


@@ -1792,10 +1791,6 @@ int indala64decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
                *invert ^= 1;
        }
        if (found_size != 64) return -2;
                *invert ^= 1;
        }
        if (found_size != 64) return -2;

-
-       // Skip the aforementioned 3 bits from the previous UID
-       startidx += 3;
-

        if (*invert==1)
                for (size_t i = startidx; i < found_size + startidx; i++) 
                        bitStream[i] ^= 1;
        if (*invert==1)
                for (size_t i = startidx; i < found_size + startidx; i++) 
                        bitStream[i] ^= 1;