adding osx source

Makefile

@@ -0,0 +1,15 @@
+all: osx-lib ios-lib
+
+osx-lib:
+	make -C osx
+
+ios-lib:
+	make -C ios
+
+clean:
+	$(MAKE) clean -C osx
+	$(MAKE) clean -C ios
+
+install:
+	$(MAKE) install -C osx
+	$(MAKE) install -C ios

ios/Makefile

@@ -0,0 +1,2 @@
+all:
+clean:

osx/Makefile

@@ -1,56 +1,40 @@
-framework_dir = ../metasploit-framework/
+framework_dir =../../metasploit-framework
 
 OUTPUT=.
-CFLAGS=-g -Wall -fasm-blocks
-CC=i686-apple-darwin10-gcc
 
-CFLAGS+= -I metsrv/ -I common/ -I libdl/
-CFLAGS+= -I ../include
-
-all: run-bundle-all inject-bundle-all i386
-
-i386:
-	$(MAKE) -C libdl && [ -f libdl/libdl-32.dylib ]
-	cp libdl/libdl-32.dylib $(OUTPUT)/libdl-32.dylib
-
+CFLAGS=-g -Wall -fasm-blocks
+CFLAGS+= -I metsrv/ -I common/
+CFLAGS+= -fno-stack-protector
+CFLAGS+= -fno-builtin -D_SIZE_T_DECLARED
+CFLAGS+= -D_BYTE_ORDER=_LITTLE_ENDIAN
+CFLAGS+= -march=i386 -m32
+
+all: osx bin
+osx:
 	$(MAKE) -C common && [ -f common/libsupport.dylib ]
 	cp common/libsupport.dylib $(OUTPUT)/libsupport.dylib
 
 	$(MAKE) -C metsrv && [ -f metsrv/libmetsrv.dylib ]
 	cp metsrv/libmetsrv.dylib $(OUTPUT)/libmetsrv.dylib
 
-x86-64:
+	$(MAKE) -C extensions/stdapi && [ -f extensions/stdapi/ext_server_stdapi.dylib ]
+	cp extensions/stdapi/ext_server_stdapi.dylib $(OUTPUT)/ext_server_stdapi.dylib
 
-inject-bundle-all: inject-bundle-32
-
-inject-bundle-32:
-	$(CC) -I ./include -m32 -march=i386 inject-bundle.c -o inject-bundle
-
-inject-bundle-64:
-	$(CC) -I ./include -m64 -march=x86-64 inject-bundle.c -o inject-bundle
-
-run-bundle-all: run-bundle-32
-
-run-bundle-32:
-	$(CC) -I ./include -m32 -march=i386 run-bundle.c -o run-bundle-32
-
-run-bundle-64:
-	$(CC) -I ./include -m64 -march=x86-64 run-bundle.c -o run-bundle-64
+bin:
+	$(CC) -m32 -march=i386 -ldl payloads/reverse_tcp_x86.c -o payloads/reverse_tcp_x86.bin
 
 clean:
-	$(MAKE) clean -C libdl
 	$(MAKE) clean -C common
 	$(MAKE) clean -C metsrv
-	rm -rf inject-bundle-* run-bundle-*
-
-test:
-	rm -rf reverse_tcp
-	$(CC) -m32 -march=i386 -L. -I./metsrv -lmetsrv reverse_tcp.c -o reverse_tcp
+	$(MAKE) clean -C extensions/stdapi
+	rm -rf *.dylib payloads/reverse_tcp_x86.bin
 
 install:
-	rm -rf /usr/lib/libmetsrv.dylib
-	rm -rf /usr/lib/libsupport.dylib
-	rm -rf /usr/lib/libdl-32.dylib
-	cp libmetsrv.dylib /usr/lib/libmetsrv.dylib
-	cp libsupport.dylib /usr/lib/libsupport.dylib
-	cp libdl-32.dylib /usr/lib/libdl-32.dylib
+	rm -rf $(framework_dir)/data/meterpreter/ext_server_stdapi.dylib
+	rm -rf $(framework_dir)/data/osx/libmetsrv.dylib
+	rm -rf $(framework_dir)/data/osx/libsupport.dylib
+
+	cp $(OUTPUT)/ext_server_stdapi.dylib $(framework_dir)/data/meterpreter/ext_server_stdapi.dylib
+	cp $(OUTPUT)/libmetsrv.dylib $(framework_dir)/data/osx/libmetsrv.dylib
+	cp $(OUTPUT)/libsupport.dylib $(framework_dir)/data/osx/libsupport.dylib
+	cp payloads/reverse_tcp_x86.bin $(framework_dir)/data/osx/reverse_tcp_x86.bin

osx/common/Makefile

@@ -4,50 +4,29 @@ SOURCEPATH=.
 SSL_PATH=../openssl/include
 XOR_PATH=./crypto
 ZLIB_PATH=./zlib
-DARWIN_PATH=../../include
-GCC_PATH=../../include/gcc
-
-CFLAGS=-nostdinc -nostdlib
-#CFLAGS+= -I ../../test/source/bionic/libc/include 
-#CFLAGS+= -I ../../test/source/bionic/libc/kernel/common/linux/ 
-#CFLAGS+= -I ../../test/source/bionic/libc/kernel/common/ 
-#CFLAGS+= -I ../../test/source/bionic/libc/arch-x86/include/
-#CFLAGS+= -I ../../test/source/bionic/libc/kernel/arch-x86/ 
-
-CFLAGS+= -I$(SSL_PATH)
-CFLAGS+= -D_BYTE_ORDER=_LITTLE_ENDIAN -D_SIZE_T_DECLARED
-#CFLAGS+= -Dwchar_t="char" 
+
+CFLAGS= -D_BYTE_ORDER=_LITTLE_ENDIAN -D_SIZE_T_DECLARED
 CFLAGS+= -fno-builtin
-#-DElf_Size="u_int32_t" 
-CFLAGS+= -I$(SOURCEPATH) -I$(XOR_PATH) -I$(ZLIB_PATH) -I$(SSL_PATH) -I$(DARWIN_PATH)
-#CFLAGS+=  -D__linux__ -D__DARWIN__ -DMALLOC_PRODUCTION 
+CFLAGS+= -I$(SOURCEPATH) -I$(XOR_PATH) -I$(ZLIB_PATH) -I$(SSL_PATH)
 CFLAGS+= -I.
 CFLAGS+= -march=i386 -m32 -g -fPIC -Os -DPIC
 
-#CC=gcc
-CC=i686-apple-darwin10-gcc
-AR=i686-apple-darwin10-ar
-LD=i686-apple-darwin10-ld
-RM=rm
-
 objects = args.o base.o base_dispatch.o base_dispatch_common.o buffer.o \
 	channel.o common.o core.o list.o remote.o thread.o xor.o zlib.o
 
 CFLAGS+= -fno-stack-protector
 
-
 BASEVPATH=.:./crypto:./arch/posix:./zlib:
 OSVPATH=./arch/posix
 ARCHVPATH=./arch/posix
 VPATH=$(BASEVPATH):$(OSVPATH):$(ARCHVPATH)
 
 CFLAGS+= -I$(ARCHVPATH)
 
-
 all: libsupport.dylib
 
 libsupport.dylib: $(objects)
-	$(CC) $(CFLAGS) -dynamiclib $(objects) -lc -lssl -lcrypto -o $@ 
+	$(CC) $(CFLAGS) -dynamiclib $(objects) -L../../lib -lc -lssl -lcrypto -o $@
 
 clean:
 	$(RM) -f *.o *.a *.dylib zlib/zlib.o

osx/common/remote.c

@@ -22,10 +22,8 @@ Remote *remote_allocate(SOCKET fd)
 		memset(remote, 0, sizeof(Remote));
 
 		remote->fd = fd;
-
 		remote->lock = lock_create();
 
-
 		// If we failed to create the lock we must fail to create the remote
 		// as we wont be able to synchronize communication correctly.
 		if( remote->lock == NULL )