@@ -24,6 +24,11 @@ #include <usb.h> #include "usb_dfu.h" +#ifdef WIN32 +#define sleep(x) Sleep(1000 * x) +#define usleep(x) Sleep(x / 1000) +#endif + /* DFU states */ #define STATE_APP_IDLE 0x00 #define STATE_APP_DETACH 0x01 dfu-util/dfu.h @@ -60,18 +60,18 @@ static int verbose = 0; #define DFU_IFF_PATH 0x4000 struct usb_vendprod { - u_int16_t vendor; - u_int16_t product; + uint16_t vendor; + uint16_t product; }; struct dfu_if { - u_int16_t vendor; - u_int16_t product; - u_int8_t configuration; - u_int8_t interface; - u_int8_t altsetting; + uint16_t vendor; + uint16_t product; + uint8_t configuration; + uint8_t interface; + uint8_t altsetting; int bus; - u_int8_t devnum; + uint8_t devnum; const char *path; unsigned int flags; struct usb_device *dev; dfu-util/main.c @@ -42,15 +42,6 @@ struct usb_dfu_func_descriptor { #define USB_REQ_DFU_GETSTATE 0x05 #define USB_REQ_DFU_ABORT 0x06 -#if 0 -struct dfu_status { - u_int8_t bStatus; - u_int8_t bwPollTimeout[3]; - u_int8_t bState; - u_int8_t iString; -} __attribute__((packed)); -#endif - #define DFU_STATUS_OK 0x00 #define DFU_STATUS_errTARGET 0x01 #define DFU_STATUS_errFILE 0x02 dfu-util/usb_dfu.h @@ -27,7 +27,7 @@ Dictionary* parseIPSW(const char* inputIPSW, const char* bundleRoot, char** bund DIR* dir; struct dirent* ent; StringValue* plistSHA1String; - char plistHash[20]; + unsigned char plistHash[20]; int i; *bundlePath = NULL; @@ -48,7 +48,7 @@ Dictionary* parseIPSW(const char* inputIPSW, const char* bundleRoot, char** bund fclose(inputIPSWFile); - printf("Matching IPSW...\n"); + printf("Matching IPSW... (%02hhx%02hhx%02hhx%02hhx...)\n", hash[0], hash[1], hash[2], hash[3]); dir = opendir(bundleRoot); if(dir == NULL) { @@ -64,6 +64,7 @@ Dictionary* parseIPSW(const char* inputIPSW, const char* bundleRoot, char** bund strcpy(infoPath, bundleRoot); strcat(infoPath, ent->d_name); strcat(infoPath, "/Info.plist"); + printf("checking: %s\n", infoPath); if((plistFile = createAbstractFileFromFile(fopen(infoPath, "rb"))) != NULL) { plist = (char*) malloc(plistFile->getLength(plistFile)); @@ -81,7 +82,7 @@ Dictionary* parseIPSW(const char* inputIPSW, const char* bundleRoot, char** bund &plistHash[15], &plistHash[16], &plistHash[17], &plistHash[18], &plistHash[19]); for(i = 0; i < 20; i++) { - if(plistHash[0] != hash[0]) { + if(plistHash[i] != hash[i]) { break; } } ipsw-patch/pwnutil.c 99b6bb0e7628bf2b37e34f2b84373f3237f8c841 planetbeing planetbeing@gmail.com http://github.com/planetbeing/xpwn/commit/5c47bd66fe31c2a93100c709a5f787f8917e4216 5c47bd66fe31c2a93100c709a5f787f8917e4216 2008-07-20T09:24:17-07:00 2008-07-20T09:24:17-07:00 fixed a few windows problems 9086105195ff802d130712febc1c037538e7eb27 planetbeing planetbeing@gmail.com