github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 21:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes to make it work properly on the Mac

Browse source
This commit is contained in:
bushing 2009-12-22 12:54:24 +00:00
commit 022c8791c1
4 changed files with 59 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/Info.plist Normal file
View file

@ -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>

24
client/Makefile
View file

@ -1,18 +1,25 @@
WINCC=c:\mingw\bin\gcc WINCC=c:\mingw\bin\gcc
#COMMON_FLAGS = -m32 #COMMON_FLAGS = -m32
LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
LDFLAGS = $(COMMON_FLAGS) LDFLAGS = $(COMMON_FLAGS)
CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
WINLIBS = -lgdi32 -lsetupapi WINLIBS = -lgdi32 -lsetupapi
#CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -arch i386 -D_ CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
#QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) -arch i386 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),) ifneq ($(QTLDLIBS),)
QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
CFLAGS += -DHAVE_GUI 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) LINK.o = $(LINK.cpp)
else else
QTGUI = guidummy.o QTGUI = guidummy.o
@ -53,4 +60,15 @@ proxguiqt.moc.cpp: proxguiqt.h
clean: clean:
$(RM) $(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

18
client/proxmark3.c
View file

@ -45,21 +45,17 @@ static void *main_loop(void *targ)
{ {
struct main_loop_arg *arg = (struct main_loop_arg*)targ; struct main_loop_arg *arg = (struct main_loop_arg*)targ;
char *cmd = NULL; char *cmd = NULL;
pthread_t reader_thread;
if (arg->usb_present == 1) {
struct usb_receiver_arg rarg;
rarg.run=1;
pthread_create(&reader_thread, NULL, &usb_receiver, &rarg);
}
while(1) { while(1) {
struct usb_receiver_arg rarg;
pthread_t reader_thread;
rarg.run=1;
if (arg->usb_present == 1) {
pthread_create(&reader_thread, NULL, &usb_receiver, &rarg);
}
cmd = readline(PROXPROMPT); cmd = readline(PROXPROMPT);
rarg.run=0;
if (arg->usb_present == 1) {
pthread_join(reader_thread, NULL);
}
if (cmd) { if (cmd) {
if (cmd[0] != 0x00) { if (cmd[0] != 0x00) {
CommandReceived(cmd); CommandReceived(cmd);

29
client/usb.c
View file

@ -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", fprintf(stderr, "Read only %d instead of requested %d bytes!\n",
ret, (int)sizeof(UsbCommand)); 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) {