FIX: makeing sure the "make clean" now deletes the nonce2key.exe file.

diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile
index 54abf80e1560dd96e60a877a7b61cbfd343d24e9..43a87c3f8072e36f550330aa407c32fbdc1250fd 100644 (file)
--- a/tools/nonce2key/Makefile
+++ b/tools/nonce2key/Makefile
@@ -5,7 +5,7 @@ LDFLAGS =
 
 OBJS = crypto1.o crapto1.o
 HEADERS = crapto1.h
 
 OBJS = crypto1.o crapto1.o
 HEADERS = crapto1.h

-EXES = nonce2key
+EXES = nonce2key nonce2key.exe

 
 all: $(OBJS) $(EXES)
 
 
 all: $(OBJS) $(EXES)
 


@@ -15,8 +15,5 @@ all: $(OBJS) $(EXES)
 % : %.c
        $(LD) $(LDFLAGS) -o $@ $(OBJS) $<
 
 % : %.c
        $(LD) $(LDFLAGS) -o $@ $(OBJS) $<
 

-crypto1test: libnfc $(OBJS)
-       $(LD) $(LDFLAGS) -o crypto1test crypto1test.c $(OBJS)
- 

 clean: 
        rm -f $(OBJS) $(EXES)
 clean: 
        rm -f $(OBJS) $(EXES)

diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index e35daac88eaa5e523a08a7b86f7a551b1aaf6a27..5b3bab3e4df259ca9790b081bb3933acbeaa99b8 100644 (file)
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -416,9 +416,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 /** check_pfx_parity\r
  * helper function which eliminates possible secret states using parity bits\r
  */\r
 /** check_pfx_parity\r
  * helper function which eliminates possible secret states using parity bits\r
  */\r

-static struct Crypto1State*\r
-check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8],\r
-          uint32_t odd, uint32_t even, struct Crypto1State* sl)\r
+static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)\r

 {\r
        uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;\r
 \r
 {\r
        uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;\r
 \r


@@ -456,8 +454,7 @@ check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8],
  * It returns a zero terminated list of possible cipher states after the\r
  * tag nonce was fed in\r
  */\r
  * It returns a zero terminated list of possible cipher states after the\r
  * tag nonce was fed in\r
  */\r

-struct Crypto1State*\r
-lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])\r
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])\r

 {\r
        struct Crypto1State *statelist, *s;\r
        uint32_t *odd, *even, *o, *e, top;\r
 {\r
        struct Crypto1State *statelist, *s;\r
        uint32_t *odd, *even, *o, *e, top;\r


@@ -468,8 +465,9 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
        s = statelist = malloc((sizeof *statelist) << 20);\r
        if(!s || !odd || !even) {\r
                free(statelist);\r
        s = statelist = malloc((sizeof *statelist) << 20);\r
        if(!s || !odd || !even) {\r
                free(statelist);\r

-               statelist = 0;\r
-                goto out;\r
+               free(odd);\r
+               free(even);\r
+               return 0;\r

        }\r
 \r
        for(o = odd; *o + 1; ++o)\r
        }\r
 \r
        for(o = odd; *o + 1; ++o)\r


@@ -481,8 +479,6 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
                        }\r
 \r
        s->odd = s->even = 0;\r
                        }\r
 \r
        s->odd = s->even = 0;\r

-out:\r
-       free(odd);\r
-       free(even);\r
+\r

        return statelist;\r
 }\r
        return statelist;\r
 }\r