fixes to make it work properly on the Mac

diff --git a/client/Info.plist b/client/Info.plist
new file mode 100644 (file)
index 0000000..d1f8757
--- /dev/null
+++ b/client/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd ">
+<plist version="1.0">
+<dict>
+       <key>CFBundleDevelopmentRegion</key> <string>English</string>
+       <key>CFBundleIdentifier</key> <string>org.proxmark</string>
+       <key>CFBundleIconFile</key> <string></string>
+       <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
+       <key>CFBundlePackageType</key> <string>KEXT</string>
+       <key>CFBundleSignature</key> <string>????</string>
+       <key>CFBundleVersion</key> <string>1.0.0</string>
+       <key>IOKitPersonalities</key>
+       <dict>
+               <key>Proxmark3</key>
+               <dict>
+                       <key>CFBundleIdentifier</key><string>com.apple.kernel.iokit</string>
+                       <key>IOClass</key><string>IOService</string>
+                       <key>IOProviderClass</key><string>IOUSBInterface</string>
+                       <key>bConfigurationValue</key> <integer>1</integer>
+                       <key>bInterfaceNumber</key> <integer>0</integer>
+                       <key>idProduct</key><integer>19343</integer>
+                       <key>idVendor</key><integer>39620</integer>
+               </dict>
+       </dict>
+       <key>OSBundleLibraries</key>
+       <dict>
+               <key>com.apple.iokit.IOUSBFamily</key><string>1.8</string>
+       </dict>
+</dict>
+</plist>

diff --git a/client/Makefile b/client/Makefile
index dc3046e8a6a1c447e09fa3dc63272b1ca6024a50..007bb4b660270998594abbee1c12e30f557e1662 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,18 +1,25 @@
 WINCC=c:\mingw\bin\gcc
 
 #COMMON_FLAGS = -m32
 WINCC=c:\mingw\bin\gcc
 
 #COMMON_FLAGS = -m32

+

 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
 
 WINLIBS = -lgdi32 -lsetupapi
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
 
 WINLIBS = -lgdi32 -lsetupapi

-#CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -arch i386 -D_
-#QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) -arch i386
+CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
+QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+
+ifeq ($(shell uname),Darwin)
+CXXFLAGS += -arch i386 -DQ_WS_MAC32
+CFLAGS += -arch i386
+QTLDLIBS += -arch i386
+endif

 
 ifneq ($(QTLDLIBS),)
 QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI
 
 ifneq ($(QTLDLIBS),)
 QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI

-MOC = $(shell type moc-qt4 >/dev/null 2>&1 && echo moc-qt4 || echo moc)
+MOC = $(shell pkg-config --variable=moc_location QtCore)

 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o


@@ -53,4 +60,15 @@ proxguiqt.moc.cpp: proxguiqt.h
 clean:
        $(RM) $(CLEAN)
 
 clean:
        $(RM) $(CLEAN)
 

+# must be run as root
+install_kext: Info.plist
+       mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents
+       cp Info.plist /System/Library/Extensions/Proxmark3.kext/Contents
+       chown -R root:wheel /System/Library/Extensions/Proxmark3.kext
+       chmod 755 /System/Library/Extensions/Proxmark3.kext /System/Library/Extensions/Proxmark3.kext/Contents
+       chmod 644 /System/Library/Extensions/Proxmark3.kext/Contents/Info.plist
+       rm -rf /System/Library/Caches/com.apple.kext.caches
+       touch /System/Library/Extensions
+       @echo "*** You may need to reboot for the kext to take effect."
+

 .PHONY: all clean
 .PHONY: all clean

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 280d07f91fbc3b51d04e1221a61bc05f0d4deb11..05c2fe2d5681ac8359f0030e496a74a99a47e1fe 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -45,21 +45,17 @@ static void *main_loop(void *targ)
 {
        struct main_loop_arg *arg = (struct main_loop_arg*)targ;
        char *cmd = NULL;
 {
        struct main_loop_arg *arg = (struct main_loop_arg*)targ;
        char *cmd = NULL;

+       pthread_t reader_thread;

 
 

-       while(1) {
+       if (arg->usb_present == 1) {

                struct usb_receiver_arg rarg;
                struct usb_receiver_arg rarg;

-               pthread_t reader_thread;
-

                rarg.run=1;
                rarg.run=1;

-               if (arg->usb_present == 1) {
-                       pthread_create(&reader_thread, NULL, &usb_receiver, &rarg);
-               }
-               cmd = readline(PROXPROMPT);
-               rarg.run=0;
-               if (arg->usb_present == 1) {
-                       pthread_join(reader_thread, NULL);
-               }
+               pthread_create(&reader_thread, NULL, &usb_receiver, &rarg);
+       }
+
+       while(1) {

 
 

+               cmd = readline(PROXPROMPT);

                if (cmd) {
                        if (cmd[0] != 0x00) {
                                CommandReceived(cmd);
                if (cmd) {
                        if (cmd[0] != 0x00) {
                                CommandReceived(cmd);

diff --git a/client/usb.c b/client/usb.c
index 4f4bd2cadb53a2db9a3ba6f81fc4476b92b1d848..e0836b826e17f66f6d80f040dd9fd4fb95b1a423 100644 (file)
--- a/client/usb.c
+++ b/client/usb.c
@@ -41,19 +41,6 @@ void SendCommand(UsbCommand *c) {
                
                return;
        }
                
                return;
        }

-/*
-       if(wantAck) {
-               UsbCommand ack;
-               printf("waiting for ack\n");
-               ReceiveCommand(&ack);
-               if(ack.cmd != CMD_ACK) {
-                       printf("bad ACK\n");
-                       exit(-1);
-               }
-       } else {
-               printf("not waiting for ack\n");
-       }
-*/

 }
 
 bool ReceiveCommandPoll(UsbCommand *c) {
 }
 
 bool ReceiveCommandPoll(UsbCommand *c) {


@@ -85,23 +72,9 @@ bool ReceiveCommandPoll(UsbCommand *c) {
                        fprintf(stderr, "Read only %d instead of requested %d bytes!\n",
                                ret, (int)sizeof(UsbCommand));
                }
                        fprintf(stderr, "Read only %d instead of requested %d bytes!\n",
                                ret, (int)sizeof(UsbCommand));
                }

-
-#if 0
-               {
-                       int i;
-
-                       printf("Read %d bytes\n", ret);
-                       for (i = 0; i < ret; i++) {
-                               printf("0x%02X ", ((unsigned char*)c)[i]);
-                               if (!((i+1)%8))
-                                       printf("\n");
-                       }
-                       printf("\n");
-               }
-#endif

        }
 
        }
 

-       return ret != 0;
+       return ret > 0;

 }
 
 void ReceiveCommand(UsbCommand *c) {
 }
 
 void ReceiveCommand(UsbCommand *c) {