fis-001-checksum.patch 8.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227
  1. --- fis/fis.c 2007-05-03 06:42:51.000000000 +1000
  2. +++ ../../snapgear_avila/user/fconfig/fis.c 2007-09-06 13:48:38.000000000 +1000
  3. @@ -141,8 +141,8 @@
  4. static void dump_desc(FILE* f, const struct fis_image_desc* d)
  5. {
  6. - fprintf(f,"%16s: addr = 0x%08x, size = 0x%08x\n",
  7. - d->name, d->flash_base, d->size);
  8. + fprintf(f,"%16s: addr = 0x%08x, size = 0x%08x, checksum = 0x%08x\n",
  9. + d->name, d->flash_base, d->size, d->file_cksum);
  10. for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) {
  11. if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip"
  12. uint32_t offset = d->skips[i+1];
  13. @@ -332,6 +332,7 @@
  14. d->size = swap_end_32(d->size);
  15. d->entry_point = swap_end_32(d->entry_point);
  16. d->data_length = swap_end_32(d->data_length);
  17. + d->file_cksum = swap_end_32(d->file_cksum);
  18. for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) {
  19. d->skips[i] = swap_end_32(d->skips[i]);
  20. }
  21. @@ -499,6 +500,66 @@
  22. save_dir(fd,offset,size,swap_endianness,dir);
  23. }
  24. +static void fis_checksum(const char* device, int offset, int size, bool swap_endianness,
  25. + int argc, char* argv[])
  26. +{
  27. + char* name = NULL;
  28. + char* filename = NULL;
  29. +
  30. + for (int i=0; i<argc; ++i) {
  31. + char* arg=argv[i];
  32. + if (strcmp(arg,"-f")==0) {
  33. + if (i==argc-1) {
  34. + fatal("argumnet missing for -f");
  35. + }
  36. + ++i;
  37. + filename = argv[i];
  38. + } else if (strcmp(arg,"-n")==0) {
  39. + if (i==argc-1) {
  40. + fatal("argumnet missing for -n");
  41. + }
  42. + ++i;
  43. + name = argv[i];
  44. + if (strlen(name)>=16) {
  45. + fatal("name too long, max 16 chars including terminating null");
  46. + }
  47. + } else {
  48. + fputs("Unrecognised option '",stderr);
  49. + fputs(arg,stderr);
  50. + fputs("'\n",stderr);
  51. + exit(1);
  52. + }
  53. + }
  54. +
  55. + if (name == NULL || filename == NULL)
  56. + fatal("filename and partition name must be specified");
  57. +
  58. + int fd;
  59. + char *buf;
  60. + struct stat stat_buf;
  61. + uint32_t crc;
  62. +
  63. + CHECK(fd=open(filename,O_RDONLY),-1);
  64. + CHECK(stat(filename, &stat_buf),-1);
  65. + buf = (char*)chk_malloc(stat_buf.st_size);
  66. + CHECK(read(fd,buf,stat_buf.st_size),-1);
  67. + crc = crc32(buf,stat_buf.st_size);
  68. + close(fd);
  69. + free(buf);
  70. +
  71. + CHECK(fd=open(device,O_RDWR),-1);
  72. + dir_t dir;
  73. + load_dir(fd,offset,&size,swap_endianness,&dir);
  74. + iter_t after = NULL;
  75. + FOR_EACH_DIR_ENTRY(dir,i) {
  76. + if (strcmp(get(i)->name, name) == 0) {
  77. + get(i)->file_cksum = crc;
  78. + get(i)->data_length = stat_buf.st_size;
  79. + break;
  80. + }
  81. + }
  82. + save_dir(fd,offset,size,swap_endianness,dir);
  83. +}
  84. static void fis_delete(const char* device, int offset, int size, bool swap_endianness,
  85. char* name)
  86. @@ -528,6 +589,7 @@
  87. " fis [options] init\n"
  88. " fis [options] create -f address -l size -n name\n"
  89. " fis [options] delete name\n"
  90. + " fis [options] checksum -f filename -n name\n"
  91. "Options:\n"
  92. " -d device specify /dev/mtd* device containing directory\n"
  93. " -o offset specify offset into device of start of directory\n"
  94. @@ -597,6 +659,11 @@
  95. fis_create(device,offset,size,swap_endianness,
  96. argc-i-1,&argv[i+1]);
  97. break;
  98. + } else if (strcmp(arg,"checksum")==0) {
  99. + check_dev(device);
  100. + fis_checksum(device,offset,size,swap_endianness,
  101. + argc-i-1,&argv[i+1]);
  102. + break;
  103. } else if (strcmp(arg,"delete")==0) {
  104. if (i!=argc-2) {
  105. fatal("Exactly one argumnet required after 'delete'");
  106. --- fis/crc.c 1970-01-01 10:00:00.000000000 +1000
  107. +++ ../../snapgear_avila/user/fconfig/crc.c 2007-09-06 13:48:38.000000000 +1000
  108. @@ -0,0 +1,88 @@
  109. +/*
  110. + * crc.c
  111. + *
  112. + * $Id: crc.c,v 1.1 2006/02/13 09:58:08 andrzej Exp $
  113. + *
  114. + * Gary S. Brown's CRC
  115. + * Code based on Gary S. Brown CRC (1986).
  116. + * Generation polynomial is:
  117. + * X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0
  118. + *
  119. + * Copyright (C) 2006 Ekiert sp z o.o.
  120. + * Author: Andrzej Ekiert <a.ekiert@ekiert.com>
  121. + *
  122. + * This program is free software; you can redistribute it and/or
  123. + * modify it under the terms of the GNU General Public License
  124. + * as published by the Free Software Foundation; either version
  125. + * 2 of the License, or (at your option) any later version.
  126. + */
  127. +
  128. +#include <stdint.h>
  129. +
  130. +#include "crc.h"
  131. +
  132. +static const uint32_t crc32_tab[] = {
  133. + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
  134. + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
  135. + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
  136. + 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
  137. + 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
  138. + 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
  139. + 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
  140. + 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
  141. + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
  142. + 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
  143. + 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
  144. + 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
  145. + 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
  146. + 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
  147. + 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
  148. + 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
  149. + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
  150. + 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
  151. + 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
  152. + 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
  153. + 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
  154. + 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
  155. + 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
  156. + 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
  157. + 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
  158. + 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
  159. + 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
  160. + 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
  161. + 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
  162. + 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
  163. + 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
  164. + 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
  165. + 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
  166. + 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
  167. + 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
  168. + 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
  169. + 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
  170. + 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
  171. + 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
  172. + 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
  173. + 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
  174. + 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
  175. + 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
  176. + 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
  177. + 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
  178. + 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
  179. + 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
  180. + 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
  181. + 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
  182. + 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
  183. + 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
  184. + 0x2d02ef8dL
  185. + };
  186. +
  187. +uint32_t crc32(uint8_t *s, uint32_t len)
  188. +{
  189. + uint32_t i, val = 0;
  190. +
  191. + for (i = 0; i < len; i++) {
  192. + val = crc32_tab[(val^s[i]) & 0xff] ^ (val >> 8);
  193. + }
  194. + return val;
  195. +}
  196. +
  197. --- fis/crc.h0 1970-01-01 10:00:00.000000000 +1000
  198. +++ fis/crc.h 2007-10-18 12:12:19.000000000 +1000
  199. @@ -0,0 +1,25 @@
  200. +/*
  201. + * crc.h
  202. + *
  203. + * $Id: crc.h,v 1.1 2006/02/13 09:58:08 andrzej Exp $
  204. + *
  205. + * Gary S. Brown's CRC - header.
  206. + *
  207. + * Copyright (C) 2006 Ekiert sp z o.o.
  208. + * Author: Andrzej Ekiert <a.ekiert@ekiert.com>
  209. + *
  210. + * This program is free software; you can redistribute it and/or
  211. + * modify it under the terms of the GNU General Public License
  212. + * as published by the Free Software Foundation; either version
  213. + * 2 of the License, or (at your option) any later version.
  214. + */
  215. +
  216. +#ifndef CRC_H
  217. +#define CRC_H
  218. +
  219. +#include <stdint.h>
  220. +
  221. +uint32_t crc32(uint8_t *s, uint32_t len);
  222. +
  223. +#endif //CRC_H
  224. +