mifare-tool: fix '-h', use '-b' for brute force (Uwe Hermann)

[librfid] / utils / mifare-tool.c

diff --git a/utils/mifare-tool.c b/utils/mifare-tool.c
index aebd0d0..ab6d216 100644 (file)
--- a/utils/mifare-tool.c
+++ b/utils/mifare-tool.c
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdio.h>
@@ -21,7 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-//#include <libgen.h>
+
+#ifndef __MINGW32__
+#include <libgen.h>
+#endif
 
 #define _GNU_SOURCE
 #include <getopt.h>
@@ -47,7 +50,8 @@ static void help(void)
                " -r    --read          Read a mifare sector\n"
                " -l    --loop-read     Loop reading a mifare sector\n"
                " -w    --write         Write a mifare sector\n"
-               " -k    --key           Specify mifare access key (in hex tuples)\n");
+               " -k    --key           Specify mifare access key (in hex tuples)\n"
+               " -b    --brute-force n Brute Force read sector n\n");
 }
 
 static struct option mifare_opts[] = {
@@ -56,6 +60,7 @@ static struct option mifare_opts[] = {
        { "loop-read", 1, 0, 'l' },
        { "write", 1 ,0, 'w' },
        { "help", 0, 0, 'h' },
+       { "brute-force", 1, 0, 'b' },
        { 0, 0, 0, 0 }
 };
 
@@ -92,7 +97,7 @@ static void mifare_l3(void)
 int main(int argc, char **argv)
 {
        int len, rc, c, option_index = 0;
-       unsigned int page;
+       unsigned int page,uid,uid_len;
        char key[MIFARE_CL_KEY_LEN];
        char buf[MIFARE_CL_PAGE_SIZE];
 
@@ -102,8 +107,7 @@ int main(int argc, char **argv)
        program_name = basename(argv[0]);
 #endif/*__MINGW32__*/
 
-       memcpy(key, MIFARE_CL_KEYA_DEFAULT_INFINEON,
-              sizeof(MIFARE_CL_KEYA_DEFAULT_INFINEON));
+       memcpy(key, MIFARE_CL_KEYA_DEFAULT_INFINEON, MIFARE_CL_KEY_LEN);
 
        printf("%s - (C) 2006 by Harald Welte\n"
               "This program is Free Software and has "
@@ -118,12 +122,25 @@ int main(int argc, char **argv)
        }
 
        while (1) {
-               c = getopt_long(argc, argv, "k:r:l:w:", mifare_opts,
+               c = getopt_long(argc, argv, "k:r:l:w:b:h", mifare_opts,
                                &option_index);
                if (c == -1)
                        break;
 
                switch (c) {
+                       int i;
+               case 'b':
+                       page = atoi(optarg);
+                       printf("key: %s\n", hexdump(key, MIFARE_CL_KEY_LEN));
+                       len = MIFARE_CL_PAGE_SIZE;
+                       mifare_l3();
+                       for (i = 0; i <= 0xff; i++) {
+                               key[MIFARE_CL_KEY_LEN-1]=i;
+                               if (mifare_cl_auth(key, page) >= 0)
+                                       printf("KEY: %s\n",hexdump(key, MIFARE_CL_KEY_LEN));
+                       }
+
+                       break;
                case 'k':
                        hexread(key, optarg, strlen(optarg));
                        printf("key: %s\n", hexdump(key, MIFARE_CL_KEY_LEN));
@@ -136,13 +153,20 @@ int main(int argc, char **argv)
                        mifare_l3();
                        if (mifare_cl_auth(key, page) < 0)
                                exit(1);
+
+                       uid_len=sizeof(uid);
+                       uid=0;
+                       if(rfid_layer2_getopt(l2h,RFID_OPT_LAYER2_UID,&uid,&uid_len)>=0)
+                            printf("UID=%08X (len=%u)\n",uid,uid_len);
+                               
+                       len=MIFARE_CL_PAGE_SIZE;                                                                                                                                                                                                
                        rc = rfid_protocol_read(ph, page, buf, &len);
                        if (rc < 0) {
                                printf("\n");
                                fprintf(stderr, "error during read\n");
                                break;
                        }
-                       printf("%s\n", hexdump(buf, len));
+                       printf("len=%u data=%s\n", len, hexdump(buf, len));
 
                        if (page & 0x3 == 0x3) {
                                struct mfcl_access_sect s;
@@ -171,6 +195,13 @@ int main(int argc, char **argv)
                                mifare_l3();
                                if (mifare_cl_auth(key, page) < 0)
                                        continue;
+
+                               uid_len=sizeof(uid);
+                               uid=0;
+                               if(rfid_layer2_getopt(l2h,RFID_OPT_LAYER2_UID,&uid,&uid_len)>=0)
+                                   printf("UID=%08X (len=%u)\n",uid,uid_len);
+
+                               len=MIFARE_CL_PAGE_SIZE;                                                                                                                                                                                                
                                rc = rfid_protocol_read(ph, page, buf, &len);
                                if (rc < 0) {
                                        printf("\n");