Removed xpwn depdencies on some specific dmg binaries

planetbeing · May 16, 2008 · a442d11 · a442d11
1 parent 828c05a
commit a442d11
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 282 deletions.
diff --git a/ipsw-patch/8900.c b/ipsw-patch/8900.c
@@ -76,7 +76,7 @@ void close8900(AbstractFile* file) {
 				info->header.sizeOfData = ((Img2Header*)info->buffer)->dataLenPadded + sizeof(Img2Header);
 
 				cksum = 0;
-				CRC32Checksum(&cksum, (unsigned char *)info->buffer, 0x64);
+				crc32(&cksum, (unsigned char *)info->buffer, 0x64);
 				FLIPENDIANLE(cksum);
 				((Img2Header*)info->buffer)->header_checksum = cksum;
 			}

diff --git a/ipsw-patch/dmghfs.c b/ipsw-patch/dmghfs.c
diff --git a/ipsw-patch/dmghfs.h b/ipsw-patch/dmghfs.h
diff --git a/ipsw-patch/img2.c b/ipsw-patch/img2.c
@@ -71,7 +71,7 @@ void closeImg2(AbstractFile* file) {
 		flipImg2Header(&(info->header));
 
 		cksum = 0;
-		CRC32Checksum(&cksum, (unsigned char *)&(info->header), 0x64);
+		crc32(&cksum, (unsigned char *)&(info->header), 0x64);
 		FLIPENDIANLE(cksum);
 		info->header.header_checksum = cksum;
 

diff --git a/xpwn/Makefile b/xpwn/Makefile
@@ -15,8 +15,7 @@ OBJDIR=build
 OBJS=xpwn.o
 LIBOBJS=libibooter.o
 IPSWOBJS=../../ipsw-patch/plist.o ../../ipsw-patch/outputstate.o ../../dmg/zlib-1.2.3/contrib/minizip/ioapi.o ../../dmg/zlib-1.2.3/contrib/minizip/unzip.o ../../dmg/zlib-1.2.3/contrib/minizip/zip.o
-IMGOBJS=../../ipsw-patch/nor_files.o ../../ipsw-patch/8900.o ../../ipsw-patch/img2.o ../../ipsw-patch/ibootim.o ../../ipsw-patch/lzss.o ../../ipsw-patch/lzssfile.o ../../ipsw-patch/libpng-1.2.28/libpng.a
-DMGOBJS=../../dmg/checksum.o ../../dmg/zlib-1.2.3/libz.a ../../dmg/openssl-0.9.8g/libcrypto.a
+IMGOBJS=../../ipsw-patch/nor_files.o ../../ipsw-patch/8900.o ../../ipsw-patch/img2.o ../../ipsw-patch/ibootim.o ../../ipsw-patch/lzss.o ../../ipsw-patch/lzssfile.o ../../ipsw-patch/libpng-1.2.28/libpng.a ../../dmg/zlib-1.2.3/libz.a ../../dmg/openssl-0.9.8g/libcrypto.a
 HFSOBJS=../../hfs/volume.o ../../hfs/btree.o ../../hfs/extents.o ../../hfs/rawfile.o ../../hfs/catalog.o ../../hfs/flatfile.o ../../hfs/utility.o ../../hfs/fastunicodecompare.o ../../hfs/abstractfile.o ../../hfs/hfslib.o
 LIBRARIES=`if $(CC) ../win32test.c -o /dev/null 2>/dev/null ; then echo ""; else echo "-lgdi32"; fi` `if [ \`uname\` = "Darwin" ]; then echo "-framework CoreFoundation -framework IOKit"; else echo ""; fi`
 
@@ -28,7 +27,7 @@ VPATH=$(SRCDIR)
 	$(CC) $(CFLAGS) -c $< $(INC) -o $(OBJDIR)/$@
 
 xpwn: $(OBJS) $(LIBOBJS)
-	cd $(OBJDIR); $(CC) $(LDFLAGS) $(IPSWOBJS) $(IMGOBJS) $^ $(LIBUSB) $(DMGOBJS) $(HFSOBJS) $(LIBRARIES) -o $@
+	cd $(OBJDIR); $(CC) $(LDFLAGS) $(IPSWOBJS) $(IMGOBJS) $^ $(LIBUSB) $(HFSOBJS) $(LIBRARIES) -o $@
 
 prepare:
 	mkdir -p $(OBJDIR)