@@ -48,7 +48,6 @@ #endif int debug; -static int verbose = 0; #define DFU_IFF_DFU 0x0001 /* DFU Mode, (not Runtime) */ #define DFU_IFF_VENDOR 0x0100 @@ -294,52 +293,6 @@ static int count_dfu_devices(struct dfu_if *dif) return num_found; } - -static int list_dfu_interfaces(void) -{ - struct usb_bus *usb_bus; - struct usb_device *dev; - - /* Walk the tree and find our device. */ - for (usb_bus = usb_get_busses(); NULL != usb_bus; - usb_bus = usb_bus->next ) { - for (dev = usb_bus->devices; NULL != dev; dev = dev->next) { - find_dfu_if(dev, &print_dfu_if, NULL); - } - } - return 0; -} - -static int parse_vendprod(struct usb_vendprod *vp, const char *str) -{ - unsigned long vend, prod; - const char *colon; - - colon = strchr(str, ':'); - if (!colon || strlen(colon) < 2) - return -EINVAL; - - vend = strtoul(str, NULL, 16); - prod = strtoul(colon+1, NULL, 16); - - if (vend > 0xffff || prod > 0xffff) - return -EINVAL; - - vp->vendor = vend; - vp->product = prod; - - return 0; -} - - -static int resolve_device_path(struct dfu_if *dif) -{ - fprintf(stderr, - "USB device paths are not supported by this dfu-util.\n"); - exit(1); -} - - static void help(void) { printf("Usage: dfu-util [options] ...\n" @@ -359,25 +312,6 @@ static void help(void) ); } -static struct option opts[] = { - { "help", 0, 0, 'h' }, - { "version", 0, 0, 'V' }, - { "verbose", 0, 0, 'v' }, - { "list", 0, 0, 'l' }, - { "device", 1, 0, 'd' }, - { "path", 1, 0, 'p' }, - { "configuration", 1, 0, 'c' }, - { "cfg", 1, 0, 'c' }, - { "interface", 1, 0, 'i' }, - { "intf", 1, 0, 'i' }, - { "altsetting", 1, 0, 'a' }, - { "alt", 1, 0, 'a' }, - { "transfer-size", 1, 0, 't' }, - { "upload", 1, 0, 'U' }, - { "download", 1, 0, 'D' }, - { "reset", 0, 0, 'R' }, -}; - enum mode { MODE_NONE, MODE_UPLOAD, @@ -386,7 +320,6 @@ enum mode { int download(AbstractFile* file, unsigned int transfer_size, int final_reset) { - struct usb_vendprod vendprod; struct dfu_if _rt_dif, _dif, *dif = &_dif; int num_devs; int num_ifs; @@ -394,7 +327,6 @@ int download(AbstractFile* file, unsigned int transfer_size, int final_reset) struct dfu_status status; struct usb_dfu_func_descriptor func_dfu; char *alt_name = NULL; /* query alt name if non-NULL */ - char *end; int page_size = getpagesize(); int ret; @@ -455,7 +387,6 @@ int download(AbstractFile* file, unsigned int transfer_size, int final_reset) if (!get_first_dfu_if(&_rt_dif)) exit(1); -dfustate: if (alt_name) { int n; dfu-util/main.c @@ -256,7 +256,6 @@ get_status: printf("Done!\n"); out_close: file->close(file); -out_free: free(buf); return ret; dfu-util/sam7dfu.c @@ -4,6 +4,7 @@ #include <dmg/dmg.h> #include <dmg/filevault.h> +#include <inttypes.h> #ifdef HAVE_CRYPT @@ -207,7 +208,7 @@ AbstractFile* createAbstractFileFromFileVault(AbstractFile* file, const char* ke file->read(file, &signature, sizeof(uint64_t)); FLIPENDIAN(signature); if(signature != FILEVAULT_V2_SIGNATURE) { - printf("Unknown signature: %x\n", signature); + printf("Unknown signature: %" PRId64 "\n", signature); /* no FileVault v1 handling yet */ return NULL; } @@ -222,7 +223,9 @@ AbstractFile* createAbstractFileFromFileVault(AbstractFile* file, const char* ke flipFileVaultV2Header(&(info->header.v2)); for(i = 0; i < 16; i++) { - sscanf(&(key[i * 2]), "%02hhx", &(aesKey[i])); + unsigned int curByte; + sscanf(&(key[i * 2]), "%02x", &curByte); + aesKey[i] = curByte; } for(i = 0; i < 20; i++) { dmg/filevault.c @@ -1,27 +1,28 @@ -#include <stdlib.h> -#include <stdio.h> -#include <stdint.h> -#include <time.h> -#include <string.h> -#include <unistd.h> -#include <hfs/hfsplus.h> -#include <dmg/dmgfile.h> -#include <dmg/filevault.h> -#include <sys/types.h> -#include <sys/stat.h> +#include <stdlib.h> +#include <stdio.h> +#include <stdint.h> +#include <time.h> +#include <string.h> +#include <unistd.h> +#include <hfs/hfsplus.h> +#include <dmg/dmgfile.h> +#include <dmg/filevault.h> +#include <sys/types.h> +#include <sys/stat.h> #include <dirent.h> -#include "hfs/hfslib.h" - -char endianness; - -void cmd_ls(Volume* volume, int argc, const char *argv[]) { - if(argc > 1) - hfs_ls(volume, argv[1]); - else - hfs_ls(volume, "/"); } - -void cmd_cat(Volume* volume, int argc, const char *argv[]) { - HFSPlusCatalogRecord* record; +#include "hfs/hfslib.h" + +char endianness; + +void cmd_ls(Volume* volume, int argc, const char *argv[]) { + if(argc > 1) + hfs_ls(volume, argv[1]); + else + hfs_ls(volume, "/"); +} + +void cmd_cat(Volume* volume, int argc, const char *argv[]) { + HFSPlusCatalogRecord* record; AbstractFile* stdoutFile; record = getRecordFromPath(argv[1], volume, NULL, NULL); hdutil/hdutil.c @@ -16,6 +16,7 @@ extern "C" { void extractAllInFolder(HFSCatalogNodeID folderID, Volume* volume); int copyAcrossVolumes(Volume* volume1, Volume* volume2, char* path1, char* path2); + void hfs_untar(Volume* volume, AbstractFile* tarFile); void hfs_ls(Volume* volume, const char* path); #ifdef __cplusplus } includes/hfs/hfslib.h @@ -13,6 +13,7 @@ extern "C" { AbstractFile* openAbstractFile2(AbstractFile* file, const unsigned int* key, const unsigned int* iv); AbstractFile* duplicateAbstractFile(AbstractFile* file, AbstractFile* backing); AbstractFile* duplicateAbstractFile2(AbstractFile* file, AbstractFile* backing, const unsigned int* key, const unsigned int* iv, AbstractFile* certificate); + void init_libxpwn(); #ifdef __cplusplus } #endif includes/xpwn/nor_files.h @@ -16,8 +16,8 @@ int main(int argc, char* argv[]) { AbstractFile* template = NULL; AbstractFile* certificate = NULL; - int key[16]; - int iv[16]; + unsigned int key[16]; + unsigned int iv[16]; int hasKey = FALSE; int hasIV = FALSE; ipsw-patch/xpwntool.c @@ -607,11 +607,12 @@ local int unzlocal_GetCurrentFileInfoInternal (file, /* we check the magic */ - if (err==UNZ_OK) + if (err==UNZ_OK) { if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) err=UNZ_ERRNO; else if (uMagic!=0x02014b50) err=UNZ_BADZIPFILE; + } if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK) err=UNZ_ERRNO; @@ -687,11 +688,13 @@ local int unzlocal_GetCurrentFileInfoInternal (file, else uSizeRead = extraFieldBufferSize; - if (lSeek!=0) + if (lSeek!=0) { if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) lSeek=0; else err=UNZ_ERRNO; + } + if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) err=UNZ_ERRNO; @@ -712,11 +715,12 @@ local int unzlocal_GetCurrentFileInfoInternal (file, else uSizeRead = commentBufferSize; - if (lSeek!=0) + if (lSeek!=0) { if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) lSeek=0; else err=UNZ_ERRNO; + } if ((file_info.size_file_comment>0) && (commentBufferSize>0)) if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead) err=UNZ_ERRNO; @@ -976,11 +980,12 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, return UNZ_ERRNO; - if (err==UNZ_OK) + if (err==UNZ_OK) { if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) err=UNZ_ERRNO; else if (uMagic!=0x04034b50) err=UNZ_BADZIPFILE; + } if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) err=UNZ_ERRNO; @@ -1534,7 +1539,6 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) char *szComment; uLong uSizeBuf; { - int err=UNZ_OK; unz_s* s; uLong uReadThis ; if (file==NULL) minizip/unzip.c @@ -189,13 +189,6 @@ local void init_linkedlist(ll) ll->first_block = ll->last_block = NULL; } -local void free_linkedlist(ll) - linkedlist_data* ll; -{ - free_datablock(ll->first_block); - ll->first_block = ll->last_block = NULL; -} - local int add_data_in_datablock(ll,buf,len) linkedlist_data* ll; minizip/zip.c 0c6a370bcc986c609cb1ec109b5f687fdb02432a planetbeing planetbeing@gmail.com http://github.com/planetbeing/xpwn/commit/92f15ce132f4b75d4cea32e91e86727995ad16cb 92f15ce132f4b75d4cea32e91e86727995ad16cb 2008-07-20T22:31:27-07:00 2008-07-20T22:31:27-07:00 warnings fixes 89a255ab2141106a76da3c441e5cb64a92c852f9 planetbeing planetbeing@gmail.com