diff --git a/src/Makefile b/src/Makefile index 4e521c0..7c09c7e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,14 +6,6 @@ .SUFFIXES: # Delete the default suffixes MAKEFLAGS += --no-builtin-rules -ifeq ($(OS), Windows_NT) - PYTHON = python -else ifeq ($(shell which python3),) - PYTHON = python -else - PYTHON = python3 -endif - # Set CPU target (default STM32F4XX) export STM32F4XX ?= 1 @@ -345,7 +337,8 @@ FORCE: %.dfu: %.hex $(LDSCRIPT) $(OUT_LOG) echo Creating $@ - $(OUT_CMD) build-scripts/dfu-convert -r $(FW_REVISION) -i $< $@ + $(OUT_LOG) echo ./build-scripts/hex2dfu -l ST... -r $(FW_REVISION) -i $< -o $@ + $(OUT_CMD) ./build-scripts/hex2dfu -l ST... -r $(FW_REVISION) -i $< -o $@ # This rule hook is defined in the ChibiOS build system PRE_MAKE_ALL_RULE_HOOK: ./common/hydrafw_version.hdr diff --git a/src/build-scripts/Makefile b/src/build-scripts/Makefile index 3bcc94a..1629543 100644 --- a/src/build-scripts/Makefile +++ b/src/build-scripts/Makefile @@ -4,10 +4,10 @@ CC = gcc CFLAGS = -Wall -Wextra -std=c99 # Source files -SRCS = dfu-convert.c +SRCS = hex2dfu.c # Output executable -TARGET = dfu-convert +TARGET = hex2dfu # Default target all: $(TARGET) diff --git a/src/build-scripts/dfu-convert.c b/src/build-scripts/dfu-convert.c deleted file mode 100644 index ce2b49e..0000000 --- a/src/build-scripts/dfu-convert.c +++ /dev/null @@ -1,263 +0,0 @@ -/* gcc -Wall -O3 -o dfu-convert dfu-convert.c see also Makefile - * Python3 version Written by Antonio Galea - 2010/11/18 Distributed under Gnu LGPL 3.0 - * - * Copyright (C) 2024 Benjamin VERNOUX (C version) - * Distributed under Gnu LGPL 3.0 - */ -#include -#include -#include -#include -#include -#include - -#define DEFAULT_DEVICE "0x0483:0xdf11" -#define DEFAULT_REVISION "0.0" -#define MAX_DATA_SIZE 1048576 // 1 MB buffer for static allocation -#define MAX_LINE_LENGTH 256 -#define MAX_FILES 10 - -static uint8_t data[MAX_DATA_SIZE]; - -typedef struct { - char signature[5]; - uint8_t version; - uint32_t size; - uint8_t targets; -} Prefix; - -typedef struct { - uint32_t address; - uint32_t size; -} ElementPrefix; - -typedef struct { - uint16_t device; - uint16_t product; - uint16_t vendor; - uint16_t dfu; - char ufd[3]; - uint8_t len; - uint32_t crc; -} Suffix; - -static uint32_t crc_table[256] = { - 0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL, 0x076DC419L, 0x706AF48FL, - 0xE963A535L, 0x9E6495A3L, 0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L, - 0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L, 0x1DB71064L, 0x6AB020F2L, - 0xF3B97148L, 0x84BE41DEL, 0x1ADAD47DL, 0x6DDDE4EBL, 0xF4D4B551L, 0x83D385C7L, - 0x136C9856L, 0x646BA8C0L, 0xFD62F97AL, 0x8A65C9ECL, 0x14015C4FL, 0x63066CD9L, - 0xFA0F3D63L, 0x8D080DF5L, 0x3B6E20C8L, 0x4C69105EL, 0xD56041E4L, 0xA2677172L, - 0x3C03E4D1L, 0x4B04D447L, 0xD20D85FDL, 0xA50AB56BL, 0x35B5A8FAL, 0x42B2986CL, - 0xDBBBC9D6L, 0xACBCF940L, 0x32D86CE3L, 0x45DF5C75L, 0xDCD60DCFL, 0xABD13D59L, - 0x26D930ACL, 0x51DE003AL, 0xC8D75180L, 0xBFD06116L, 0x21B4F4B5L, 0x56B3C423L, - 0xCFBA9599L, 0xB8BDA50FL, 0x2802B89EL, 0x5F058808L, 0xC60CD9B2L, 0xB10BE924L, - 0x2F6F7C87L, 0x58684C11L, 0xC1611DABL, 0xB6662D3DL, 0x76DC4190L, 0x01DB7106L, - 0x98D220BCL, 0xEFD5102AL, 0x71B18589L, 0x06B6B51FL, 0x9FBFE4A5L, 0xE8B8D433L, - 0x7807C9A2L, 0x0F00F934L, 0x9609A88EL, 0xE10E9818L, 0x7F6A0DBBL, 0x086D3D2DL, - 0x91646C97L, 0xE6635C01L, 0x6B6B51F4L, 0x1C6C6162L, 0x856530D8L, 0xF262004EL, - 0x6C0695EDL, 0x1B01A57BL, 0x8208F4C1L, 0xF50FC457L, 0x65B0D9C6L, 0x12B7E950L, - 0x8BBEB8EAL, 0xFCB9887CL, 0x62DD1DDFL, 0x15DA2D49L, 0x8CD37CF3L, 0xFBD44C65L, - 0x4DB26158L, 0x3AB551CEL, 0xA3BC0074L, 0xD4BB30E2L, 0x4ADFA541L, 0x3DD895D7L, - 0xA4D1C46DL, 0xD3D6F4FBL, 0x4369E96AL, 0x346ED9FCL, 0xAD678846L, 0xDA60B8D0L, - 0x44042D73L, 0x33031DE5L, 0xAA0A4C5FL, 0xDD0D7CC9L, 0x5005713CL, 0x270241AAL, - 0xBE0B1010L, 0xC90C2086L, 0x5768B525L, 0x206F85B3L, 0xB966D409L, 0xCE61E49FL, - 0x5EDEF90EL, 0x29D9C998L, 0xB0D09822L, 0xC7D7A8B4L, 0x59B33D17L, 0x2EB40D81L, - 0xB7BD5C3BL, 0xC0BA6CADL, 0xEDB88320L, 0x9ABFB3B6L, 0x03B6E20CL, 0x74B1D29AL, - 0xEAD54739L, 0x9DD277AFL, 0x04DB2615L, 0x73DC1683L, 0xE3630B12L, 0x94643B84L, - 0x0D6D6A3EL, 0x7A6A5AA8L, 0xE40ECF0BL, 0x9309FF9DL, 0x0A00AE27L, 0x7D079EB1L, - 0xF00F9344L, 0x8708A3D2L, 0x1E01F268L, 0x6906C2FEL, 0xF762575DL, 0x806567CBL, - 0x196C3671L, 0x6E6B06E7L, 0xFED41B76L, 0x89D32BE0L, 0x10DA7A5AL, 0x67DD4ACCL, - 0xF9B9DF6FL, 0x8EBEEFF9L, 0x17B7BE43L, 0x60B08ED5L, 0xD6D6A3E8L, 0xA1D1937EL, - 0x38D8C2C4L, 0x4FDFF252L, 0xD1BB67F1L, 0xA6BC5767L, 0x3FB506DDL, 0x48B2364BL, - 0xD80D2BDAL, 0xAF0A1B4CL, 0x36034AF6L, 0x41047A60L, 0xDF60EFC3L, 0xA867DF55L, - 0x316E8EEFL, 0x4669BE79L, 0xCB61B38CL, 0xBC66831AL, 0x256FD2A0L, 0x5268E236L, - 0xCC0C7795L, 0xBB0B4703L, 0x220216B9L, 0x5505262FL, 0xC5BA3BBEL, 0xB2BD0B28L, - 0x2BB45A92L, 0x5CB36A04L, 0xC2D7FFA7L, 0xB5D0CF31L, 0x2CD99E8BL, 0x5BDEAE1DL, - 0x9B64C2B0L, 0xEC63F226L, 0x756AA39CL, 0x026D930AL, 0x9C0906A9L, 0xEB0E363FL, - 0x72076785L, 0x05005713L, 0x95BF4A82L, 0xE2B87A14L, 0x7BB12BAEL, 0x0CB61B38L, - 0x92D28E9BL, 0xE5D5BE0DL, 0x7CDCEFB7L, 0x0BDBDF21L, 0x86D3D2D4L, 0xF1D4E242L, - 0x68DDB3F8L, 0x1FDA836EL, 0x81BE16CDL, 0xF6B9265BL, 0x6FB077E1L, 0x18B74777L, - 0x88085AE6L, 0xFF0F6A70L, 0x66063BCAL, 0x11010B5CL, 0x8F659EFFL, 0xF862AE69L, - 0x616BFFD3L, 0x166CCF45L, 0xA00AE278L, 0xD70DD2EEL, 0x4E048354L, 0x3903B3C2L, - 0xA7672661L, 0xD06016F7L, 0x4969474DL, 0x3E6E77DBL, 0xAED16A4AL, 0xD9D65ADCL, - 0x40DF0B66L, 0x37D83BF0L, 0xA9BCAE53L, 0xDEBB9EC5L, 0x47B2CF7FL, 0x30B5FFE9L, - 0xBDBDF21CL, 0xCABAC28AL, 0x53B39330L, 0x24B4A3A6L, 0xBAD03605L, 0xCDD70693L, - 0x54DE5729L, 0x23D967BFL, 0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L, - 0xB40BBE37L, 0xC30C8EA1L, 0x5A05DF1BL, 0x2D02EF8DL -}; - -uint32_t compute_crc(const uint8_t *buf_data, size_t length) { - uint32_t crc = 0xFFFFFFFF; - - for (size_t i = 0; i < length; i++) { - uint8_t byte = buf_data[i]; - uint32_t lookup_index = (crc ^ byte) & 0xFF; - crc = (crc >> 8) ^ crc_table[lookup_index]; - } - - return ~crc; -} - -int parse_device(const char *device, uint16_t *vendor_id, uint16_t *product_id) { - if (sscanf(device, "0x%4hx:0x%4hx", vendor_id, product_id) != 2) { - return -1; - } - return 0; -} - -void print_help(const char *progname) { - printf("Usage: %s {-i|--ihex} file.hex [-i file.hex ...] [{-D|--device} vendor:device] outfile.dfu\n", progname); - printf("\n"); - printf("Options:\n"); - printf(" -i, --ihex Build a DFU file from given HEXFILES\n"); - printf(" -D, --device Build for DEVICE, defaults to %s\n", DEFAULT_DEVICE); - printf(" -r, --revision Revision number, defaults to %s\n", DEFAULT_REVISION); -} - -// Simple function to convert hex character to integer -uint8_t hex_char_to_int(char c) { - if (c >= '0' && c <= '9') return c - '0'; - if (c >= 'A' && c <= 'F') return c - 'A' + 10; - if (c >= 'a' && c <= 'f') return c - 'a' + 10; - return 0; -} - -// Function to parse a line from Intel HEX file -int parse_hex_line(const char *line, uint32_t *address, uint8_t *buf_data, size_t *data_len) { - if (line[0] != ':') return -1; - int len = (hex_char_to_int(line[1]) << 4) | hex_char_to_int(line[2]); - *address = (hex_char_to_int(line[3]) << 12) | (hex_char_to_int(line[4]) << 8) | (hex_char_to_int(line[5]) << 4) | hex_char_to_int(line[6]); - int type = (hex_char_to_int(line[7]) << 4) | hex_char_to_int(line[8]); - - if (type != 0) return -1; // Only support data records - - for (int i = 0; i < len; i++) { - buf_data[i] = (hex_char_to_int(line[9 + i * 2]) << 4) | hex_char_to_int(line[10 + i * 2]); - } - *data_len = len; - return 0; -} - -void build_from_hex(const char *file, char **hexfiles, int hexfile_count, const char *device, const char *revision) { - size_t data_size = 0; - - for (int i = 0; i < hexfile_count; ++i) { - const char *hexfile = hexfiles[i]; - FILE *f = fopen(hexfile, "r"); - if (!f) { - fprintf(stderr, "Error opening file: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - - char line[MAX_LINE_LENGTH]; - while (fgets(line, sizeof(line), f)) { - uint32_t address; - uint8_t line_data[MAX_LINE_LENGTH]; - size_t line_data_len; - - if (parse_hex_line(line, &address, line_data, &line_data_len) == 0) { - if (data_size + sizeof(ElementPrefix) + line_data_len > MAX_DATA_SIZE) { - fprintf(stderr, "Data buffer overflow\n"); - fclose(f); - exit(EXIT_FAILURE); - } - ElementPrefix eprefix = {address, line_data_len}; - memcpy(data + data_size, &eprefix, sizeof(ElementPrefix)); - memcpy(data + data_size + sizeof(ElementPrefix), line_data, line_data_len); - data_size += sizeof(ElementPrefix) + line_data_len; - } - } - fclose(f); - } - - uint16_t device_id, product_id; - if (parse_device(device, &device_id, &product_id) != 0) { - fprintf(stderr, "Invalid device format: %s\n", device); - exit(EXIT_FAILURE); - } - - uint16_t revision_number; - if (sscanf(revision, "%hx.%hx", &revision_number, &revision_number) != 2) { - fprintf(stderr, "Invalid revision format: %s\n", revision); - exit(EXIT_FAILURE); - } - - Suffix suffix = {device_id, product_id, 0x0483, 0x011a, {'U', 'F', 'D'}, 16, 0}; - if (data_size + sizeof(Suffix) > MAX_DATA_SIZE) { - fprintf(stderr, "Data buffer overflow\n"); - exit(EXIT_FAILURE); - } - - memcpy(data + data_size, &suffix, sizeof(Suffix)); - data_size += sizeof(Suffix); - - suffix.crc = compute_crc(data, data_size); - memcpy(data + data_size - sizeof(uint32_t), &suffix.crc, sizeof(uint32_t)); - - FILE *outfile = fopen(file, "wb"); - if (!outfile) { - fprintf(stderr, "Error opening output file: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - - fwrite(data, 1, data_size, outfile); - fclose(outfile); -} - -int main(int argc, char *argv[]) { - if (argc < 2) { - print_help(argv[0]); - return EXIT_FAILURE; - } - - const char *infile = NULL; - int ihex_mode = 0; - const char *device = DEFAULT_DEVICE; - const char *revision = DEFAULT_REVISION; - char *hexfiles[MAX_FILES]; - int hexfile_count = 0; - const char *outfile = NULL; - - for (int i = 1; i < argc; ++i) { - if (strcmp(argv[i], "-i") == 0 || strcmp(argv[i], "--ihex") == 0) { - ihex_mode = 1; - if (i + 1 < argc && hexfile_count < MAX_FILES) { - hexfiles[hexfile_count++] = argv[++i]; - } else { - fprintf(stderr, "Option -i requires an argument or exceeds maximum number of files\n"); - return EXIT_FAILURE; - } - } else if (strcmp(argv[i], "-D") == 0 || strcmp(argv[i], "--device") == 0) { - if (i + 1 < argc) { - device = argv[++i]; - } else { - fprintf(stderr, "Option -D requires an argument\n"); - return EXIT_FAILURE; - } - } else if (strcmp(argv[i], "-r") == 0 || strcmp(argv[i], "--revision") == 0) { - if (i + 1 < argc) { - revision = argv[++i]; - } else { - fprintf(stderr, "Option -r requires an argument\n"); - return EXIT_FAILURE; - } - } else { - infile = argv[i]; - } - } - - if (infile) { - if (ihex_mode) { - build_from_hex(outfile, hexfiles, hexfile_count, device, revision); - } else { - print_help(argv[0]); - return EXIT_FAILURE; - } - } else { - print_help(argv[0]); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} diff --git a/src/build-scripts/hex2dfu.c b/src/build-scripts/hex2dfu.c new file mode 100644 index 0000000..ecc73dd --- /dev/null +++ b/src/build-scripts/hex2dfu.c @@ -0,0 +1,581 @@ +// Original source https://github.com/encedo/hex2dfu/blob/master/hex2dfu.c +// MIT License (MIT) +// Modified by B.VERNOUX 2024 +#include +#include +#include +#include +#include +#include + +#define ED25519_SUPPORT 0 + +#define TARGET_NAME_ENCEDO "EncedoKey" + +#ifndef ED25519_SUPPORT +#define ED25519_SUPPORT 1 +#endif + +#if ED25519_SUPPORT +#include "ED25519/src/sha512.h" +#include "ED25519/src/ed25519.h" +#endif + +void print_help(void); +int hex2bin(unsigned char *obuf, const char *ibuf, int len); +int check_checksum(unsigned char *inbuf, int len); +unsigned char *ihex2bin_buf(unsigned int *start_address, unsigned int *dst_len, FILE *inFile, unsigned int max_address); + +unsigned int crc32(unsigned int crc, const void *buf, size_t size); + +//efab5b0739a834bac702aeb5cd08ffe227908faaae501f910e7e07d8d41fbb06 +int main (int argc, char **argv) { + int targen_number = 0; + int c, vid =0x0483, pid = 0xdf11, ver = 0xffff; + char *tar0 = NULL, *tar0_lab = NULL, *out_fn = NULL; + FILE *inFile, *outFile; + unsigned char json_output = 0; + unsigned int max_address = 0x08200000; + +#if ED25519_SUPPORT + unsigned char hash_buf[64]; + sha512_context hash; + unsigned char *ed25519_secret = NULL; + unsigned char *ed25519_public = NULL, ed25519_public_add = 0; + unsigned char public_key[32], private_key[64], signature[64], public_key_publisher[32]; +#endif + + unsigned int tar0_start_address; + unsigned int tar0_len; + unsigned char *tar0_buf; + + unsigned char *dfu; + int dfu_len; + unsigned int crc = 0, tmp, add_crc32 = 0; + + opterr = 0; + while ((c = getopt (argc, argv, "hv:p:v:t:r:d:i:l:o:c:S:P:eJE:")) != -1) { + switch (c) { + case 'J': + json_output = 1; + break; + case 'i': //target0 input file name + tar0 = optarg; + break; + case 'l': //target0 label + tar0_lab = optarg; + break; + case 'p': //PID + pid = strtol (optarg, NULL, 16); + break; + case 'v': //VID + vid = strtol (optarg, NULL, 16); + break; + case 't': // Target Number + targen_number = strtol(optarg, NULL, 16); + break; + case 'r': // Target Revision format "xx.yy" + uint16_t revision_number_MSB, revision_number_LSB; + if (sscanf(optarg, "%hx.%hx", &revision_number_MSB, &revision_number_LSB) != 2) { + fprintf(stderr, "Invalid revision format: %s\n", optarg); + exit(EXIT_FAILURE); // or return an error code + } + ver = (int)(revision_number_MSB << 8 | revision_number_LSB);; + break; + case 'd': //device version + ver = strtol (optarg, NULL, 16); + break; + case 'c': //place crc32 at this address + add_crc32 = strtol (optarg, NULL, 16); + break; + case 'E': //max address + max_address = strtol (optarg, NULL, 16); + break; + case 'S': //ED25519 secret (signing key), hex +#if !ED25519_SUPPORT + fprintf (stderr, "Code signing not supported!\n"); + return 1; +#else + ed25519_secret = optarg; +#endif + break; + case 'P': //ED25519 publisher public, hex +#if !ED25519_SUPPORT + fprintf (stderr, "Code signing not supported!\n"); + return 1; +#else + ed25519_public = optarg; +#endif + break; + case 'e': +#if !ED25519_SUPPORT + fprintf (stderr, "Code signing not supported!\n"); + return 1; +#else + ed25519_public_add = 1; +#endif + break; + case 'o': //output file name + out_fn = optarg; + break; + case 'h': + print_help(); + break; + case '?': + fprintf (stderr, "Parameter(s) parsing failed!\n"); + return 1; + default: + break; + } + } + + if (!tar0) { + perror ("No input file specifed.\n"); + return 0; + } + + if (!out_fn) { + perror ("No output file specifed.\n"); + return 0; + } + +#if ED25519_SUPPORT + if (ed25519_secret) { + c = hex2bin(ed25519_secret, ed25519_secret, strlen(ed25519_secret)); + if (c != 32) { + perror ("ED25519 'secret' have to be 32bytes long.\n"); + return 0; + } + + ed25519_create_keypair(public_key, private_key, ed25519_secret); + + if (ed25519_public) { + c = hex2bin(public_key_publisher, ed25519_public, strlen(ed25519_public)); + if (c != 32) { + perror ("ED25519 'public' have to be 32bytes long.\n"); + return 0; + } + } else { + memmove(public_key_publisher, public_key, 32); + } + } +#endif + + inFile = fopen ( tar0, "r"); + tar0_buf = ihex2bin_buf(&tar0_start_address, &tar0_len, inFile, max_address); + tar0_len = tar0_len + ((tar0_len & 0x07) ? (8 - (tar0_len & 0x07)) : 0); + fclose (inFile); + + if (tar0_buf && (tar0_len > 0)) { + if ((add_crc32>0) && (add_crc32 < (tar0_start_address+tar0_len-256))) { //-c request CRC32 placement at given address + add_crc32 -= tar0_start_address; + tar0_buf[add_crc32 + 4] = tar0_len>>0 & 0xFF; //binary code length first(little endian) + tar0_buf[add_crc32 + 5] = tar0_len>>8 & 0xFF; + tar0_buf[add_crc32 + 6] = tar0_len>>16 & 0xFF; + tar0_buf[add_crc32 + 7] = tar0_len>>24 & 0xFF; +#if ED25519_SUPPORT + if (ed25519_secret) { + sha512_init(&hash); + sha512_update(&hash, tar0_buf, add_crc32); + sha512_update(&hash, tar0_buf+add_crc32+256, tar0_len-(add_crc32+256)); + sha512_final(&hash, hash_buf); + + ed25519_sign(signature, hash_buf, 64, public_key, private_key); + memmove(tar0_buf+add_crc32+0x10, signature, 64); + memmove(tar0_buf+add_crc32+0x10+64, public_key, 32); + + if (ed25519_public_add) { + memmove(tar0_buf+add_crc32+0x10+64+32, public_key_publisher, 32); + } + } +#endif + crc = crc32(0, tar0_buf, add_crc32); //calc CRC upto placement address + crc = crc32(crc, tar0_buf+add_crc32+4, tar0_len-(add_crc32+4)); //calc the rest of - starting from placement+4 up to end + tar0_buf[add_crc32] = crc>>0 & 0xFF; //CRC placement (little endian) + tar0_buf[add_crc32 + 1] = crc>>8 & 0xFF; + tar0_buf[add_crc32 + 2] = crc>>16 & 0xFF; + tar0_buf[add_crc32 + 3] = crc>>24 & 0xFF; + } + + dfu_len = 11 + 274 + 8+ tar0_len + 16; + dfu = calloc(1, dfu_len); + if (dfu) { + //DFU Suffix + memmove(dfu, "DfuSe", 5); //szSignature + dfu[5] = 0x01; //bVersion + tmp = dfu_len - 0x10; + dfu[6] = (unsigned char)(tmp & 0xFF); //DFUImageSize (except Prefix!) + dfu[7] = (unsigned char)(tmp>>8 & 0xFF); + dfu[8] = (unsigned char)(tmp>>16 & 0xFF); + dfu[9] = (unsigned char)(tmp>>24 & 0xFF); + dfu[10] = 1; //bTargets + + + //DFU Image + c = 11; + memmove(dfu+c, "Target", 6); //szSignature 'Target' + c += 6; + dfu[c++] = targen_number; //bAlternateSettings //to check + if (tar0_lab) { + dfu[c] = 0x01; //bTargetNamed + memmove(dfu+c+4, tar0_lab, strlen(tar0_lab)>254?254:strlen(tar0_lab)); //szTargetName + } else { + dfu[c] = 0x01; //place default target name + memmove(dfu+c+4, TARGET_NAME_ENCEDO, strlen(TARGET_NAME_ENCEDO)); + } + c += 259; + tmp = 8 + tar0_len; //ImageElement length (8+bin_data) + dfu[c++] = tmp & 0xFF; //dwTargetSize + dfu[c++] = tmp>>8 & 0xFF; + dfu[c++] = tmp>>16 & 0xFF; + dfu[c++] = tmp>>24 & 0xFF; + dfu[c] = 0x01; //dwNbElements + c += 4; + + //Image Element + dfu[c++] = tar0_start_address & 0xFF; //dwElementAddress + dfu[c++] = tar0_start_address>>8 & 0xFF; + dfu[c++] = tar0_start_address>>16 & 0xFF; + dfu[c++] = tar0_start_address>>24 & 0xFF; + dfu[c++] = tar0_len & 0xFF; //dwElementSize + dfu[c++] = tar0_len>>8 & 0xFF; + dfu[c++] = tar0_len>>16 & 0xFF; + dfu[c++] = tar0_len>>24 & 0xFF; + memmove(dfu+c, tar0_buf, tar0_len); + + //DFU Suffix + c = dfu_len - 16; + dfu[c++] = ver & 0xFF; //bcdDeviceLo + dfu[c++] = ver>>8 & 0xFF; + dfu[c++] = pid & 0xFF; //idProductLo + dfu[c++] = pid>>8 & 0xFF; + dfu[c++] = vid & 0xFF; //idVendorLo + dfu[c++] = vid>>8 & 0xFF; + dfu[c++] = 0x1A; //bcdDFULo + dfu[c++] = 0x01; + dfu[c++] = 'U'; //ucDfuSignature + dfu[c++] = 'F'; + dfu[c++] = 'D'; + dfu[c++] = 16; //bLength + crc = 0xFFFFFFFF & (-crc32(0, dfu, c) - 1); + dfu[c++] = crc>>0 & 0xFF; //dwCRC + dfu[c++] = crc>>8 & 0xFF; + dfu[c++] = crc>>16 & 0xFF; + dfu[c++] = crc>>24 & 0xFF; + + + //write DFU to file + outFile = fopen (out_fn, "wb"); + c = fwrite (dfu, dfu_len, 1, outFile); + fclose(outFile); + if (c != 1) { + printf ("error: write to output file\n"); + } + if (json_output) { + printf("{\"code_address\":\"0x%08x\"", tar0_start_address); + printf(",\"code_length\":\"0x%08x\"", tar0_len); + printf(",\"meta_address\":\"0x%08x\"", add_crc32+tar0_start_address); +#if ED25519_SUPPORT + if (ed25519_secret) { + printf(",\"sha512\":\""); + for(c=0; c<64; c++) { + printf("%02x", (unsigned char)hash_buf[c]); + } + printf("\""); + + printf(",\"signature_pubkey\":\""); + for(c=0; c<32; c++) { + printf("%02x", (unsigned char)public_key[c]); + } + printf("\""); + + printf(",\"signature\":\""); + for(c=0; c<64; c++) { + printf("%02x", (unsigned char)signature[c]); + } + printf("\""); + + if (ed25519_public_add) { + printf(",\"publisher_pubkey\":\""); + for(c=0; c<32; c++) { + printf("%02x", (unsigned char)public_key_publisher[c]); + } + printf("\""); + } + printf(",\"crc32\":\"0x%08x\"", crc); + } +#endif + + printf("}\r\n"); + } else { + printf("Data Start Address: 0x%08x\r\n", tar0_start_address); + printf("Data Length: %ub\r\n", tar0_len); +#if ED25519_SUPPORT + if (ed25519_secret) { + printf("SHA512: "); + for(c=0; c<64; c++) { + printf("%02x", (unsigned char)hash_buf[c]); + } + printf("\r\n"); + + printf("Signing PublicKey: "); + for(c=0; c<32; c++) { + printf("%02x", (unsigned char)public_key[c]); + } + printf("\r\n"); + + printf("Signature: "); + for(c=0; c<64; c++) { + printf("%02x", (unsigned char)signature[c]); + } + printf("\r\n"); + + if (ed25519_public_add) { + printf("Publisher PublicKey: "); + for(c=0; c<32; c++) { + printf("%02x", (unsigned char)public_key_publisher[c]); + } + printf("\r\n"); + } + printf("CRC32 data: 0x%08x @0x%08x\r\n", crc, add_crc32+tar0_start_address); + } +#endif + printf("Done.\r\n"); + } + } + } else { + printf ("error: processing input file\n"); + } + + return 0; +} + +void print_help(void) { + printf("STM32 hex2dfu version 1.4.1\r\n"); + printf("(c) Encedo Ltd 2013-2020\r\n"); + printf("(c) B.VERNOUX 2024\r\n"); + printf("Options:\r\n"); + printf("-J - output in JSON structure except errors (optional)\r\n"); + printf("-c - place CRC23 under this addres (optional)\r\n"); + printf("-d - file version number (optional, default: 0xFFFF)\r\n"); + printf("-h - help\r\n"); + printf("-i - Target0 HEX file name (mandatory)\r\n"); + printf("-l - Target0 name (optional, default: EncedoKey)\r\n"); + printf("-o - output DFU file name (mandatory)\r\n"); +#if ED25519_SUPPORT + printf("-S - ED25519 'secret' to sign the code (optional)\r\n"); + printf("-P - Publisher ED25519 'public' to verify firmware sign (optional)\r\n"); + printf("-e - add Publisher ED25519 based on 'secret' or the one form -P (if given)\r\n"); +#endif + printf("-p - USB Pid (optional, default: 0xDF11)\r\n"); + printf("-v - USB Vid (optional, default: 0x0483)\r\n"); + printf("-t - Target Number (optional, default: 0x0)\r\n"); + printf("-r - Target Revision format string xx.yy\r\n"); + printf("-E - Maximum possible address\r\n"); + printf("Example: hex2dfu -i infile.hex -o outfile.dfu\r\n"); +} + + +int hex2bin(unsigned char *obuf, const char *ibuf, int len) { + unsigned char c, c2; + + len = len / 2; + while (*ibuf != 0) { + c = *ibuf++; + if( c >= '0' && c <= '9' ) + c -= '0'; + else if( c >= 'a' && c <= 'f' ) + c -= 'a' - 10; + else if( c >= 'A' && c <= 'F' ) + c -= 'A' - 10; + else + return -1; + + c2 = *ibuf++; + if( c2 >= '0' && c2 <= '9' ) + c2 -= '0'; + else if( c2 >= 'a' && c2 <= 'f' ) + c2 -= 'a' - 10; + else if( c2 >= 'A' && c2 <= 'F' ) + c2 -= 'A' - 10; + else + return -1; + + *obuf++ = ( c << 4 ) | c2; + } + return len; +} + +int check_checksum(unsigned char *inbuf, int len) { + unsigned int check = 0; + while(len--) { + check += *inbuf++; + } + return check & 0xFF; +} + + +// more details: http://en.wikipedia.org/wiki/Intel_HEX +unsigned char *ihex2bin_buf(unsigned int *start_address, unsigned int *dst_len, FILE *inFile, unsigned int max_address) { + unsigned int lines = 0, total = 0, oneline_len, elar = 0, pos, cnt; + char oneline [512]; + unsigned char raw[256], start_set = 0, *dst = NULL; + + *dst_len = 1024*128; + dst = malloc(*dst_len); //allocate 128kB of memory for bin data buffer + if (dst == NULL) { + *dst_len = -2; + return NULL; + } + + *start_address = 0; + while ( fgets (oneline, sizeof(oneline), inFile) != NULL ) { + if (oneline[0] == ':') { //is valid record? + oneline_len = strlen(oneline)-2; //get line length + hex2bin(raw, oneline+1, oneline_len); //convert to bin + if (check_checksum(raw, oneline_len/2) == 0) { //check cheksum validity + if ((raw[0] == 2) && (raw[1] == 0) && (raw[2] == 0) && (raw[3] == 4)) { //> Extended Linear Address Record :020000040803EF + elar = (unsigned int)raw[4]<<24 | (unsigned int) raw[5]<<16; //gen new address offset + } else + if ((raw[0] == 0) && (raw[1] == 0) && (raw[2] == 0) && (raw[3] == 1)) { //>End Of File record :00000001FF + *dst_len = total; //return total size of bin data && start address + return dst; + } else + if (raw[3] == 0) { //>Data record - process + pos = elar + ( (unsigned int)raw[1]<<8 | (unsigned int)raw[2] ); //get start address of this chunk + if (start_set==0) { + *start_address = pos; //set it as new start addres - only possible for first data record + start_set = 1; //only once - this is start address of thye binary data + } + if (pos >= max_address) { + *dst_len = total; //max address limit has been reached + return dst; //stop processing and return what's done + } + pos -= *start_address; + cnt = raw[0]; //get chunk size/length + if (pos+cnt > *dst_len) { //enlarge buffer if required + unsigned char *dst_new = realloc(dst, *dst_len + 8192); //add 8kB of new space + if (dst_new == NULL) { + *dst_len = -2; //allocation error - exit + free(dst); + return NULL; + } else { + *dst_len += 8192; + dst = dst_new; //allocation succesed - copy new pointer + } + } + memmove(dst+pos, raw+4, cnt); + if (pos+cnt > total) { //set new total variable + total = pos+cnt; //tricky way - file can be none linear! + } + } + } else { + *dst_len = -1; //checksum error - exit + free(dst); + return NULL; + } + } + lines++; //not a IntelHex line - comment? + } + *dst_len = -3; //fatal error - no valid intel hex file processed + free(dst); + return NULL; +} + +/* +//maybe usefull - stay here for future + +int ihex2bin(FILE * outFile, FILE *inFile) { + unsigned int total = 0, oneline_len, elar = 0, start = 0xFFFFFFFF, pos, cnt; + unsigned char oneline [512], raw[256]; + + while ( fgets (oneline , sizeof(oneline) , inFile) != NULL ) { + //puts (oneline); + if (oneline[0] == ':') { + oneline_len = strlen(oneline)-2; + hex2bin(raw, oneline+1, oneline_len); + if (check_checksum(raw, oneline_len/2) == 0) { + if ((raw[0] == 2) && (raw[1] == 0) && (raw[2] == 0) && (raw[3] == 4)) { //:020000040803EF + elar = (unsigned int)raw[4]<<24 | (unsigned int) raw[5]<<16; + if (start == 0xFFFFFFFF) { + start = elar; + } + } else + if ((raw[0] == 0) && (raw[1] == 0) && (raw[2] == 0) && (raw[3] == 1)) { //:00000001FF + return start; + } else + if (raw[3] == 0) { //data + pos = elar + ( (unsigned int)raw[1]<<8 | (unsigned int)raw[2] ); + cnt = raw[0]; + fseek ( outFile, pos-start, SEEK_SET ); + fwrite (raw+4 , sizeof(unsigned char), cnt, outFile); + if (pos+cnt > total) + total = pos+cnt; + } + } else { + return -1; + } + } + } + return total; +} +*/ + +const unsigned int crc32_tab[] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + + +unsigned int crc32(unsigned int crc, const void *buf, size_t size) { + const unsigned char *p; + + p = buf; + crc = crc ^ ~0U; + + while (size--) + crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); + + return crc ^ ~0U; +} diff --git a/src/build-scripts/dfu-convert.exe b/src/build-scripts/hex2dfu.exe similarity index 54% rename from src/build-scripts/dfu-convert.exe rename to src/build-scripts/hex2dfu.exe index 37639b6..e89e3b1 100644 Binary files a/src/build-scripts/dfu-convert.exe and b/src/build-scripts/hex2dfu.exe differ