From 7e60e9d14c946c1059313df55d671b79591b03d8 Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Wed, 29 Sep 2021 21:09:41 +0100
Subject: [PATCH 1/4] Bundle applet-mdflash.bin into exe

---
 Makefile          |   4 +-
 mdloader_common.c | 122 +++++++++++++++++++---------------------------
 2 files changed, 50 insertions(+), 76 deletions(-)

diff --git a/Makefile b/Makefile
index cbffc63..40a3460 100644
--- a/Makefile
+++ b/Makefile
@@ -14,13 +14,11 @@ OBJFILES = $(patsubst %.c,%.o,$(SRCFILES))
 OBJS = $(addprefix $(OBJDIR)/,$(OBJFILES))
 
 all: $(OBJDIR)/$(OUTNAME)
-	$(info Copying applets to ${OBJDIR}...)
-	@cp applet-*.bin $(OBJDIR)
 	$(info Done!)
 
 $(OBJDIR)/$(OUTNAME): $(OBJS)
 	$(info Creating $@...)
-	@$(CC) $(CFLAGS) $(OBJS) -o $@
+	@$(CC) $(CFLAGS) $(OBJS) -o $@ -Wl,--format=binary -Wl,applet-mdflash.bin -Wl,--format=default
 	@rm -f $(OBJDIR)/*.o
 
 $(OBJS): | $(OBJDIR)
diff --git a/mdloader_common.c b/mdloader_common.c
index 4321de2..d7aec82 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -752,94 +752,70 @@ int main(int argc, char *argv[])
     if (verbose) printf("Device ID: %08X\n", mcu->cidr);
 
     //Load applet
-    FILE *fIn;
-    char appletfname[128] = "";
-    strlower(mcu->name);
+    extern uint8_t data[]     asm("_binary_applet_mdflash_bin_start");
+    extern uint8_t data_end[] asm("_binary_applet_mdflash_bin_end");
+    size_t filebytes = (size_t)(data_end - data);
 
-    //sprintf(appletfname, "applet-flash-%s.bin", mcu->name);
-    sprintf(appletfname, "applet-mdflash.bin");  //make filename non-dependent upon mcu->name
-      
-    printf("Applet file: %s\n", appletfname);
-
-    fIn = fopen(appletfname, "rb");
-    if (!fIn)
+    char *appletbuf = (char *)calloc(filebytes,1);
+    if (appletbuf == NULL)
     {
-        printf("Error: Could not open applet file: %s\n", appletfname);
+        printf("Error: Could not allocate memory for applet file!\n");
         goto closePort;
     }
-    else
-    {
-        char *appletbuf;
-        int filebytes;
-        int readbytes;
-
-        filebytes = filesize(appletfname);
-        if (filebytes == 0)
-        {
-            printf("Error: Applet file is empty!\n");
-            fclose(fIn);
-            goto closePort;
-        }
-
-        appletbuf = (char *)calloc(filebytes,1);
-        if (appletbuf == NULL)
-        {
-            printf("Error: Could not allocate memory for applet file!\n");
-            fclose(fIn);
-            goto closePort;
-        }
 
-        readbytes = (int)fread(appletbuf, 1, filebytes, fIn);
-        fclose(fIn);
-
-        if (readbytes != filebytes)
-        {
-            printf("Error: Applet read error!\n");
-            goto closePort;
-        }
+    int readbytes=0;
+    for (uint8_t *byte=data; byte<data_end; ++byte) {
+        appletbuf[readbytes] = *byte;
+        readbytes++;
+    }
 
-        if (readbytes < sizeof(appinfo_t))
-        {
-            printf("Error: Applet binary too small!\n");
-            goto closePort;
-        }
+    if (readbytes != filebytes)
+    {
+        printf("Error: Applet read error!\n");
+        goto closePort;
+    }
 
-        memcpy(&appinfo, appletbuf + readbytes - sizeof(appinfo_t), sizeof(appinfo_t));
-        if (appinfo.magic != 0x4142444D)
-        {
-            printf("Error: Applet info not found!\n");
-            goto closePort;
-        }
+    if (readbytes < sizeof(appinfo_t))
+    {
+        printf("Error: Applet binary too small!\n");
+        goto closePort;
+    }
 
-        if (verbose)
-        {
-            printf("Applet load address: %08X\n", appinfo.load_addr);
-            printf("Applet mail address: %08X\n", appinfo.mail_addr);
-        }
+    memcpy(&appinfo, appletbuf + readbytes - sizeof(appinfo_t), sizeof(appinfo_t));
+    if (appinfo.magic != 0x4142444D)
+    {
+        printf("Error: Applet info not found!\n");
+        goto closePort;
+    }
 
-        //printf("Applet data:\n");
-        //print_hex_listing(appletbuf, readbytes, 0, 0);
+    if (verbose)
+    {
+        printf("Applet load address: %08X\n", appinfo.load_addr);
+        printf("Applet mail address: %08X\n", appinfo.mail_addr);
+    }
 
-        if (verbose) printf("Applet size: %i\n", readbytes);
+    //printf("Applet data:\n");
+    //print_hex_listing(appletbuf, readbytes, 0, 0);
 
-        if (!send_file(appinfo.load_addr, readbytes, appletbuf))
-        {
-            printf("Error: Could not send applet!\n");
-            free(appletbuf);
-            goto closePort;
-        }
+    if (verbose) printf("Applet size: %i\n", readbytes);
 
+    if (!send_file(appinfo.load_addr, readbytes, appletbuf))
+    {
+        printf("Error: Could not send applet!\n");
         free(appletbuf);
-
-        //printf("Applet data in RAM:\n");
-        //char *data_recv = recv_file(appinfo.load_addr, readbytes);
-        //if (data_recv)
-        //{
-        //    print_hex_listing(data_recv, readbytes, 0, appinfo.load_addr);
-        //    free(data_recv); //Free memory allocated in recv_file
-        //}
+        goto closePort;
     }
 
+    free(appletbuf);
+
+    //printf("Applet data in RAM:\n");
+    //char *data_recv = recv_file(appinfo.load_addr, readbytes);
+    //if (data_recv)
+    //{
+    //    print_hex_listing(data_recv, readbytes, 0, appinfo.load_addr);
+    //    free(data_recv); //Free memory allocated in recv_file
+    //}
+
     initparams.command = APPLET_CMD_INIT;
     initparams.status = STATUS_BUSY;
     initparams.argument.inputInit.bank = 0;

From f6e411b7d5bb927abf73523cfa113eefea11ef0a Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Thu, 30 Sep 2021 01:09:47 +0100
Subject: [PATCH 2/4] incbin

---
 Makefile                   |   2 +-
 incbin/.travis.yml         |  12 ++
 incbin/README.md           | 167 +++++++++++++++++
 incbin/UNLICENSE           |  24 +++
 incbin/incbin.c            | 291 +++++++++++++++++++++++++++++
 incbin/incbin.h            | 368 +++++++++++++++++++++++++++++++++++++
 incbin/test/.gitignore     |   1 +
 incbin/test/Makefile       |   5 +
 incbin/test/asserts.c      |  20 ++
 incbin/test/loremipsum.txt |   1 +
 incbin/test/onebyte.txt    |   1 +
 incbin/test/sevenbytes.txt |   1 +
 mdloader_common.c          |  16 +-
 13 files changed, 900 insertions(+), 9 deletions(-)
 create mode 100644 incbin/.travis.yml
 create mode 100644 incbin/README.md
 create mode 100644 incbin/UNLICENSE
 create mode 100644 incbin/incbin.c
 create mode 100644 incbin/incbin.h
 create mode 100644 incbin/test/.gitignore
 create mode 100644 incbin/test/Makefile
 create mode 100644 incbin/test/asserts.c
 create mode 100644 incbin/test/loremipsum.txt
 create mode 100644 incbin/test/onebyte.txt
 create mode 100644 incbin/test/sevenbytes.txt

diff --git a/Makefile b/Makefile
index 40a3460..599496b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ all: $(OBJDIR)/$(OUTNAME)
 
 $(OBJDIR)/$(OUTNAME): $(OBJS)
 	$(info Creating $@...)
-	@$(CC) $(CFLAGS) $(OBJS) -o $@ -Wl,--format=binary -Wl,applet-mdflash.bin -Wl,--format=default
+	@$(CC) $(CFLAGS) $(OBJS) -o $@
 	@rm -f $(OBJDIR)/*.o
 
 $(OBJS): | $(OBJDIR)
diff --git a/incbin/.travis.yml b/incbin/.travis.yml
new file mode 100644
index 0000000..4337da6
--- /dev/null
+++ b/incbin/.travis.yml
@@ -0,0 +1,12 @@
+language: c
+
+os:
+- linux
+- osx
+
+compiler:
+- gcc
+- clang
+
+script:
+- make -C test test
diff --git a/incbin/README.md b/incbin/README.md
new file mode 100644
index 0000000..cada41f
--- /dev/null
+++ b/incbin/README.md
@@ -0,0 +1,167 @@
+# incbin
+
+Include binary files in your C/C++ applications with ease
+
+## Example
+
+``` c
+    #include "incbin.h"
+
+    INCBIN(Icon, "icon.png");
+
+    // This translation unit now has three symbols
+    // const unsigned char gIconData[];
+    // const unsigned char *const gIconEnd; // a marker to the end, take the address to get the ending pointer
+    // const unsigned int gIconSize;
+
+    // Reference in other translation units like this
+    INCBIN_EXTERN(Icon);
+
+    // This translation unit now has three extern symbols
+    // Use `extern "C"` in case of writing C++ code
+    // extern const unsigned char gIconData[];
+    // extern const unsigned char *const gIconEnd; // a marker to the end, take the address to get the ending pointer
+    // extern const unsigned int gIconSize;
+```
+
+## Portability
+
+Known to work on the following compilers
+
+* GCC
+* Clang
+* PathScale
+* Intel
+* Solaris & Sun Studio
+* Green Hills
+* SNC (ProDG)
+* Diab C++ (WindRiver)
+* XCode
+* ArmCC
+* RealView
+* ImageCraft
+* Stratus VOS C
+* TinyCC
+* cparser & libfirm
+* LCC
+* MSVC _See MSVC below_
+
+If your compiler is not listed, as long as it supports GCC inline assembler, this
+should work.
+
+## MISRA
+INCBIN can be used in MISRA C setting. However it should be independently checked
+due to its use of inline assembly to achieve what it does. Independent verification
+of the header has been done several times based on commit: 7e327a28ba5467c4202ec37874beca7084e4b08c
+
+## Alignment
+
+The data included by this tool will be aligned on the architectures word boundary
+unless some variant of SIMD is detected, then it's aligned on a byte boundary that
+respects SIMD convention just incase your binary data may be used in vectorized
+code. The table of the alignments for SIMD this header recognizes is as follows:
+
+| SIMD                                    | Alignment |
+|-----------------------------------------|-----------|
+| SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2  | 16        |
+| Neon                                    | 16        |
+| AVX, AVX2                               | 32        |
+| AVX512                                  | 64        |
+
+## Prefix
+By default, `incbin.h` emits symbols with a `g` prefix. This can be adjusted by
+defining `INCBIN_PREFIX` before including `incbin.h` with a desired prefix. For
+instance
+
+``` c
+    #define INCBIN_PREFIX g_
+    #include "incbin.h"
+    INCBIN(test, "test.txt");
+
+    // This translation unit now has three symbols
+    // const unsigned char g_testData[];
+    // const unsigned char *const g_testEnd;
+    // const unsigned int g_testSize;
+```
+
+You can also choose to have no prefix by defining the prefix with nothing, for example:
+
+``` c
+    #define INCBIN_PREFIX
+    #include "incbin.h"
+    INCBIN(test, "test.txt");
+
+    // This translation unit now has three symbols
+    // const unsigned char testData[];
+    // const unsigned char *const testEnd;
+    // const unsigned int testSize;
+```
+
+## Style
+By default, `incbin.h` emits symbols with `CamelCase` style. This can be adjusted
+by defining `INCBIN_STYLE` before including `incbin.h` to change the style. There
+are two possible styles to choose from
+
+* INCBIN_STYLE_CAMEL (CamelCase)
+* INCBIN_STYLE_SNAKE (snake_case)
+
+For instance:
+
+``` c
+    #define INCBIN_STYLE INCBIN_STYLE_SNAKE
+    #include "incbin.h"
+    INCBIN(test, "test.txt");
+
+    // This translation unit now has three symbols
+    // const unsigned char gtest_data[];
+    // const unsigned char *const gtest_end;
+    // const unsigned int gtest_size;
+```
+
+Combining both the style and prefix allows for you to adjust `incbin.h` to suite
+your existing style and practices.
+
+## Overriding Linker Output section
+By default, `incbin.h` emits into the read-only linker output section used on
+the detected platform. If you need to override this for whatever reason, you
+can manually specify the linker output section.
+
+For example, to emit data into program memory for
+[esp8266/Arduino](github.com/esp8266/Arduino):
+
+``` c
+#define INCBIN_OUTPUT_SECTION ".irom.text"
+#include "incbin.h"
+INCBIN(Foo, "foo.txt");
+// Data is emitted into program memory that never gets copied to RAM
+```
+
+## Explanation
+
+`INCBIN` is a macro which uses the inline assembler provided by almost all
+compilers to include binary files. It achieves this by utilizing the `.incbin`
+directive of the inline assembler. It then uses the assembler to calculate the
+size of the included binary and exports two global symbols that can be externally
+referenced in other translation units which contain the data and size of the
+included binary data respectively.
+
+## MSVC
+
+Supporting MSVC is slightly harder as MSVC lacks an inline assembler which can
+include data. To support this we ship a tool which can process source files
+containing `INCBIN` macro usage and generate an external source file containing
+the data of all of them combined. This file is named `data.c` by default.
+Just include it into your build and use the `incbin.h` to reference data as
+needed. It's suggested you integrate this tool as part of your projects's
+pre-build events so that this can be automated. A more comprehensive list of
+options for this tool can be viewed by invoking the tool with `-help`
+
+If you're using a custom prefix, be sure to specify the prefix on the command
+line with `-p <prefix>` so that everything matches up; similarly, if you're
+using a custom style, be sure to specify the style on the command line with
+`-S <style>` as well.
+
+## Miscellaneous
+
+Documentation for the API is provided by the header using Doxygen notation.
+For licensing information see UNLICENSE.
diff --git a/incbin/UNLICENSE b/incbin/UNLICENSE
new file mode 100644
index 0000000..68a49da
--- /dev/null
+++ b/incbin/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
diff --git a/incbin/incbin.c b/incbin/incbin.c
new file mode 100644
index 0000000..f162d36
--- /dev/null
+++ b/incbin/incbin.c
@@ -0,0 +1,291 @@
+#ifdef _MSC_VER
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <limits.h>
+
+#ifndef PATH_MAX
+#  define PATH_MAX 260
+#endif
+
+#define SEARCH_PATHS_MAX 64
+#define FILE_PATHS_MAX 1024
+
+static int fline(char **line, size_t *n, FILE *fp) {
+    int chr;
+    char *pos;
+    if (!line || !n || !fp)
+        return -1;
+    if (!*line)
+        if (!(*line = (char *)malloc((*n=64))))
+            return -1;
+    chr = *n;
+    pos = *line;
+    for (;;) {
+        int c = fgetc(fp);
+        if (chr < 2) {
+            *n += (*n > 16) ? *n : 64;
+            chr = *n + *line - pos;
+            if (!(*line = (char *)realloc(*line,*n)))
+                return -1;
+            pos = *n - chr + *line;
+        }
+        if (ferror(fp))
+            return -1;
+        if (c == EOF) {
+            if (pos == *line)
+                return -1;
+            else
+                break;
+        }
+        *pos++ = c;
+        chr--;
+        if (c == '\n')
+            break;
+    }
+    *pos = '\0';
+    return pos - *line;
+}
+
+static FILE *open_file(const char *name, const char *mode, const char (*searches)[PATH_MAX], int count) {
+    int i;
+    for (i = 0; i < count; i++) {
+        char buffer[FILENAME_MAX + PATH_MAX];
+        FILE *fp;
+#ifndef _MSC_VER
+        snprintf(buffer, sizeof(buffer), "%s/%s", searches[i], name);
+#else
+        _snprintf(buffer, sizeof(buffer), "%s/%s", searches[i], name);
+#endif
+        if ((fp = fopen(buffer, mode)))
+            return fp;
+    }
+    return !count ? fopen(name, mode) : NULL;
+}
+
+static int strcicmp(const char *s1, const char *s2) {
+    const unsigned char *us1 = (const unsigned char *)s1,
+                        *us2 = (const unsigned char *)s2;
+    while (tolower(*us1) == tolower(*us2)) {
+        if (*us1++ == '\0')
+            return 0;
+        us2++;
+    }
+    return tolower(*us1) - tolower(*us2);
+}
+
+/* styles */
+enum { kCamel, kSnake };
+/* identifiers */
+enum { kData, kEnd, kSize };
+
+static const char *styled(int style, int ident) {
+    switch (style) {
+    case kCamel:
+        switch (ident) {
+        case kData: return "Data";
+        case kEnd: return "End";
+        case kSize: return "Size";
+        }
+        break;
+    case kSnake:
+        switch (ident) {
+        case kData: return "_data";
+        case kEnd: return "_end";
+        case kSize: return "_size";
+        }
+        break;
+    }
+    return "";
+}
+
+int main(int argc, char **argv) {
+    int ret = 0, i, paths, files = 0, style = kCamel;
+    char outfile[FILENAME_MAX] = "data.c";
+    char search_paths[SEARCH_PATHS_MAX][PATH_MAX];
+    char prefix[FILENAME_MAX] = "g";
+    char file_paths[FILE_PATHS_MAX][PATH_MAX];
+    FILE *out = NULL;
+
+    argc--;
+    argv++;
+
+    #define s(IDENT) styled(style, IDENT)
+
+    if (argc == 0) {
+usage:
+        fprintf(stderr, "%s [-help] [-Ipath...] | <files> | [-o output] | [-p prefix]\n", argv[-1]);
+        fprintf(stderr, "   -o         - output file [default is \"data.c\"]\n");
+        fprintf(stderr, "   -p         - specify a prefix for symbol names (default is \"g\")\n");
+        fprintf(stderr, "   -S<style>  - specify a style for symbol generation (default is \"camelcase\")\n");
+        fprintf(stderr, "   -I<path>   - specify an include path for the tool to use\n");
+        fprintf(stderr, "   -help      - this\n");
+        fprintf(stderr, "example:\n");
+        fprintf(stderr, "   %s icon.png music.mp3 -o file.c\n", argv[-1]);
+        fprintf(stderr, "styles (for -S):\n");
+        fprintf(stderr, "   camelcase\n");
+        fprintf(stderr, "   snakecase\n");
+        return 1;
+    }
+
+    for (i = 0, paths = 0; i < argc; i++) {
+        if (!strcmp(argv[i], "-o")) {
+            if (i + 1 < argc) {
+                strcpy(outfile, argv[i + 1]);
+                memmove(argv+i+1, argv+i+2, (argc-i-2) * sizeof *argv);
+                argc--;
+                continue;
+            }
+        } else if (!strcmp(argv[i], "-p")) {
+            /* supports "-p" with no prefix as well as
+             * "-p -" which is another way of saying "no prefix"
+             * and "-p <prefix>" for an actual prefix.
+             */
+            if (argv[i+1][0] == '-') {
+                prefix[0] = '\0';
+                /* is it just a -? */
+                if (i + 1 < argc && !strcmp(argv[i+1], "-")) {
+                    memmove(argv+i+1, argv+i+2, (argc-i-2) * sizeof *argv);
+                    argc--;
+                }
+                continue;
+            }
+            strcpy(prefix, argv[i + 1]);
+            memmove(argv+i+1, argv+i+2, (argc-i-2) * sizeof *argv);
+            argc--;
+            continue;
+        } else if (!strncmp(argv[i], "-I", 2)) {
+            char *name = argv[i] + 2; /* skip "-I"; */
+            if (paths >= SEARCH_PATHS_MAX) {
+                fprintf(stderr, "maximum search paths exceeded\n");
+                return 1;
+            }
+            strcpy(search_paths[paths++], name);
+            continue;
+        } else if (!strncmp(argv[i], "-S", 2)) {
+            char *name = argv[i] + 2; /* skip "-S"; */
+            if (!strcicmp(name, "camel") || !strcicmp(name, "camelcase"))
+                style = kCamel;
+            else if (!strcicmp(name, "snake") || !strcicmp(name, "snakecase"))
+                style = kSnake;
+            else
+                goto usage;
+            continue;
+        } else if (!strcmp(argv[i], "-help")) {
+            goto usage;
+        } else {
+            if (files >= sizeof file_paths / sizeof *file_paths) {
+                fprintf(stderr, "maximum file paths exceeded\n");
+                return 1;
+            }
+            strcpy(file_paths[files++], argv[i]);
+        }
+    }
+
+    if (!(out = fopen(outfile, "w"))) {
+        fprintf(stderr, "failed to open `%s' for output\n", outfile);
+        return 1;
+    }
+
+    fprintf(out, "/* File automatically generated by incbin */\n");
+    /* Be sure to define the prefix if we're not using the default */
+    if (strcmp(prefix, "g"))
+        fprintf(out, "#define INCBIN_PREFIX %s\n", prefix);
+    if (style != 0)
+        fprintf(out, "#define INCBIN_STYLE INCBIN_STYLE_SNAKE\n");
+    fprintf(out, "#include \"incbin.h\"\n\n");
+    fprintf(out, "#ifdef __cplusplus\n");
+    fprintf(out, "extern \"C\" {\n");
+    fprintf(out, "#endif\n\n");
+
+    for (i = 0; i < files; i++) {
+        FILE *fp = open_file(file_paths[i], "r", search_paths, paths);
+        char *line = NULL;
+        size_t size = 0;
+        if (!fp) {
+            fprintf(stderr, "failed to open `%s' for reading\n", file_paths[i]);
+            fclose(out);
+            return 1;
+        }
+        while (fline(&line, &size, fp) != -1) {
+            char *inc, *beg, *sep, *end, *name, *file;
+            FILE *f;
+            if (!(inc = strstr(line, "INCBIN"))) continue;
+            if (!(beg = strchr(inc, '(')))       continue;
+            if (!(sep = strchr(beg, ',')))       continue;
+            if (!(end = strchr(sep, ')')))       continue;
+            name = beg + 1;
+            file = sep + 1;
+            while (isspace(*name)) name++;
+            while (isspace(*file)) file++;
+            sep--;
+            while (isspace(*sep)) sep--;
+            *++sep = '\0';
+            end--;
+            while (isspace(*end)) end--;
+            *++end = '\0';
+            fprintf(out, "/* INCBIN(%s, %s); */\n", name, file);
+            fprintf(out, "INCBIN_CONST INCBIN_ALIGN unsigned char %s%s%s[] = {\n    ", prefix, name, s(kData));
+            *--end = '\0';
+            file++;
+            if (!(f = open_file(file, "rb", search_paths, paths))) {
+                fprintf(stderr, "failed to include data `%s'\n", file);
+                ret = 1;
+                goto end;
+            } else {
+                long size, i;
+                unsigned char *data, count = 0;
+                fseek(f, 0, SEEK_END);
+                size = ftell(f);
+                fseek(f, 0, SEEK_SET);
+                if (!(data = (unsigned char *)malloc(size))) {
+                    fprintf(stderr, "out of memory\n");
+                    fclose(f);
+                    ret = 1;
+                    goto end;
+                }
+                if (fread(data, size, 1, f) != 1) {
+                    fprintf(stderr, "failed reading include data `%s'\n", file);
+                    free(data);
+                    fclose(f);
+                    ret = 1;
+                    goto end;
+                }
+                for (i = 0; i < size; i++) {
+                    if (count == 12) {
+                        fprintf(out, "\n    ");
+                        count = 0;
+                    }
+                    fprintf(out, i != size - 1 ? "0x%02X, " : "0x%02X", data[i]);
+                    count++;
+                }
+                free(data);
+                fclose(f);
+            }
+            fprintf(out, "\n};\n");
+            fprintf(out, "INCBIN_CONST INCBIN_ALIGN unsigned char *const %s%s%s = %s%s%s + sizeof(%s%s%s);\n", prefix, name, s(kEnd), prefix, name, s(kData), prefix, name, s(kData));
+            fprintf(out, "INCBIN_CONST unsigned int %s%s%s = sizeof(%s%s%s);\n", prefix, name, s(kSize), prefix, name, s(kData));
+        }
+end:
+        free(line);
+        fclose(fp);
+        printf("included `%s'\n", file_paths[i]);
+    }
+
+    if (ret == 0) {
+        fprintf(out, "\n#ifdef __cplusplus\n");
+        fprintf(out, "}\n");
+        fprintf(out, "#endif\n");
+        fclose(out);
+        printf("generated `%s'\n", outfile);
+        return 0;
+    }
+
+    fclose(out);
+    remove(outfile);
+    return 1;
+}
diff --git a/incbin/incbin.h b/incbin/incbin.h
new file mode 100644
index 0000000..c19684d
--- /dev/null
+++ b/incbin/incbin.h
@@ -0,0 +1,368 @@
+/**
+ * @file incbin.h
+ * @author Dale Weiler
+ * @brief Utility for including binary files
+ *
+ * Facilities for including binary files into the current translation unit and
+ * making use from them externally in other translation units.
+ */
+#ifndef INCBIN_HDR
+#define INCBIN_HDR
+#include <limits.h>
+#if   defined(__AVX512BW__) || \
+      defined(__AVX512CD__) || \
+      defined(__AVX512DQ__) || \
+      defined(__AVX512ER__) || \
+      defined(__AVX512PF__) || \
+      defined(__AVX512VL__) || \
+      defined(__AVX512F__)
+# define INCBIN_ALIGNMENT_INDEX 6
+#elif defined(__AVX__)      || \
+      defined(__AVX2__)
+# define INCBIN_ALIGNMENT_INDEX 5
+#elif defined(__SSE__)      || \
+      defined(__SSE2__)     || \
+      defined(__SSE3__)     || \
+      defined(__SSSE3__)    || \
+      defined(__SSE4_1__)   || \
+      defined(__SSE4_2__)   || \
+      defined(__neon__)
+# define INCBIN_ALIGNMENT_INDEX 4
+#elif ULONG_MAX != 0xffffffffu
+# define INCBIN_ALIGNMENT_INDEX 3
+# else
+# define INCBIN_ALIGNMENT_INDEX 2
+#endif
+
+/* Lookup table of (1 << n) where `n' is `INCBIN_ALIGNMENT_INDEX' */
+#define INCBIN_ALIGN_SHIFT_0 1
+#define INCBIN_ALIGN_SHIFT_1 2
+#define INCBIN_ALIGN_SHIFT_2 4
+#define INCBIN_ALIGN_SHIFT_3 8
+#define INCBIN_ALIGN_SHIFT_4 16
+#define INCBIN_ALIGN_SHIFT_5 32
+#define INCBIN_ALIGN_SHIFT_6 64
+
+/* Actual alignment value */
+#define INCBIN_ALIGNMENT \
+    INCBIN_CONCATENATE( \
+        INCBIN_CONCATENATE(INCBIN_ALIGN_SHIFT, _), \
+        INCBIN_ALIGNMENT_INDEX)
+
+/* Stringize */
+#define INCBIN_STR(X) \
+    #X
+#define INCBIN_STRINGIZE(X) \
+    INCBIN_STR(X)
+/* Concatenate */
+#define INCBIN_CAT(X, Y) \
+    X ## Y
+#define INCBIN_CONCATENATE(X, Y) \
+    INCBIN_CAT(X, Y)
+/* Deferred macro expansion */
+#define INCBIN_EVAL(X) \
+    X
+#define INCBIN_INVOKE(N, ...) \
+    INCBIN_EVAL(N(__VA_ARGS__))
+
+/* Green Hills uses a different directive for including binary data */
+#if defined(__ghs__)
+#  if (__ghs_asm == 2)
+#    define INCBIN_MACRO ".file"
+/* Or consider the ".myrawdata" entry in the ld file */
+#  else
+#    define INCBIN_MACRO "\tINCBIN"
+#  endif
+#else
+#  define INCBIN_MACRO ".incbin"
+#endif
+
+#ifndef _MSC_VER
+#  define INCBIN_ALIGN \
+    __attribute__((aligned(INCBIN_ALIGNMENT)))
+#else
+#  define INCBIN_ALIGN __declspec(align(INCBIN_ALIGNMENT))
+#endif
+
+#if defined(__arm__) || /* GNU C and RealView */ \
+    defined(__arm) || /* Diab */ \
+    defined(_ARM) /* ImageCraft */
+#  define INCBIN_ARM
+#endif
+
+#ifdef __GNUC__
+/* Utilize .balign where supported */
+#  define INCBIN_ALIGN_HOST ".balign " INCBIN_STRINGIZE(INCBIN_ALIGNMENT) "\n"
+#  define INCBIN_ALIGN_BYTE ".balign 1\n"
+#elif defined(INCBIN_ARM)
+/*
+ * On arm assemblers, the alignment value is calculated as (1 << n) where `n' is
+ * the shift count. This is the value passed to `.align'
+ */
+#  define INCBIN_ALIGN_HOST ".align " INCBIN_STRINGIZE(INCBIN_ALIGNMENT_INDEX) "\n"
+#  define INCBIN_ALIGN_BYTE ".align 0\n"
+#else
+/* We assume other inline assembler's treat `.align' as `.balign' */
+#  define INCBIN_ALIGN_HOST ".align " INCBIN_STRINGIZE(INCBIN_ALIGNMENT) "\n"
+#  define INCBIN_ALIGN_BYTE ".align 1\n"
+#endif
+
+/* INCBIN_CONST is used by incbin.c generated files */
+#if defined(__cplusplus)
+#  define INCBIN_EXTERNAL extern "C"
+#  define INCBIN_CONST    extern const
+#else
+#  define INCBIN_EXTERNAL extern
+#  define INCBIN_CONST    const
+#endif
+
+/**
+ * @brief Optionally override the linker section into which data is emitted.
+ *
+ * @warning If you use this facility, you'll have to deal with platform-specific linker output
+ * section naming on your own
+ *
+ * Overriding the default linker output section, e.g for esp8266/Arduino:
+ * @code
+ * #define INCBIN_OUTPUT_SECTION ".irom.text"
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ * // Data is emitted into program memory that never gets copied to RAM
+ * @endcode
+ */
+#if !defined(INCBIN_OUTPUT_SECTION)
+#  if defined(__APPLE__)
+#    define INCBIN_OUTPUT_SECTION         ".const_data"
+#  else
+#    define INCBIN_OUTPUT_SECTION         ".rodata"
+#  endif
+#endif
+
+#if defined(__APPLE__)
+/* The directives are different for Apple branded compilers */
+#  define INCBIN_SECTION         INCBIN_OUTPUT_SECTION "\n"
+#  define INCBIN_GLOBAL(NAME)    ".globl " INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "\n"
+#  define INCBIN_INT             ".long "
+#  define INCBIN_MANGLE          "_"
+#  define INCBIN_BYTE            ".byte "
+#  define INCBIN_TYPE(...)
+#else
+#  define INCBIN_SECTION         ".section " INCBIN_OUTPUT_SECTION "\n"
+#  define INCBIN_GLOBAL(NAME)    ".global " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "\n"
+#  if defined(__ghs__)
+#    define INCBIN_INT           ".word "
+#  else
+#    define INCBIN_INT           ".int "
+#  endif
+#  if defined(__USER_LABEL_PREFIX__)
+#    define INCBIN_MANGLE        INCBIN_STRINGIZE(__USER_LABEL_PREFIX__)
+#  else
+#    define INCBIN_MANGLE        ""
+#  endif
+#  if defined(INCBIN_ARM)
+/* On arm assemblers, `@' is used as a line comment token */
+#    define INCBIN_TYPE(NAME)    ".type " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME ", %object\n"
+#  elif defined(__MINGW32__) || defined(__MINGW64__)
+/* Mingw doesn't support this directive either */
+#    define INCBIN_TYPE(NAME)
+#  else
+/* It's safe to use `@' on other architectures */
+#    define INCBIN_TYPE(NAME)    ".type " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME ", @object\n"
+#  endif
+#  define INCBIN_BYTE            ".byte "
+#endif
+
+/* List of style types used for symbol names */
+#define INCBIN_STYLE_CAMEL 0
+#define INCBIN_STYLE_SNAKE 1
+
+/**
+ * @brief Specify the prefix to use for symbol names.
+ *
+ * By default this is `g', producing symbols of the form:
+ * @code
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char gFooData[];
+ * // const unsigned char *const gFooEnd;
+ * // const unsigned int gFooSize;
+ * @endcode
+ *
+ * If however you specify a prefix before including: e.g:
+ * @code
+ * #define INCBIN_PREFIX incbin
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ *
+ * // Now you have the following symbols instead:
+ * // const unsigned char incbinFooData[];
+ * // const unsigned char *const incbinFooEnd;
+ * // const unsigned int incbinFooSize;
+ * @endcode
+ */
+#if !defined(INCBIN_PREFIX)
+#  define INCBIN_PREFIX g
+#endif
+
+/**
+ * @brief Specify the style used for symbol names.
+ *
+ * Possible options are
+ * - INCBIN_STYLE_CAMEL "CamelCase"
+ * - INCBIN_STYLE_SNAKE "snake_case"
+ *
+ * Default option is *INCBIN_STYLE_CAMEL* producing symbols of the form:
+ * @code
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char <prefix>FooData[];
+ * // const unsigned char *const <prefix>FooEnd;
+ * // const unsigned int <prefix>FooSize;
+ * @endcode
+ *
+ * If however you specify a style before including: e.g:
+ * @code
+ * #define INCBIN_STYLE INCBIN_STYLE_SNAKE
+ * #include "incbin.h"
+ * INCBIN(foo, "foo.txt");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char <prefix>foo_data[];
+ * // const unsigned char *const <prefix>foo_end;
+ * // const unsigned int <prefix>foo_size;
+ * @endcode
+ */
+#if !defined(INCBIN_STYLE)
+#  define INCBIN_STYLE INCBIN_STYLE_CAMEL
+#endif
+
+/* Style lookup tables */
+#define INCBIN_STYLE_0_DATA Data
+#define INCBIN_STYLE_0_END End
+#define INCBIN_STYLE_0_SIZE Size
+#define INCBIN_STYLE_1_DATA _data
+#define INCBIN_STYLE_1_END _end
+#define INCBIN_STYLE_1_SIZE _size
+
+/* Style lookup: returning identifier */
+#define INCBIN_STYLE_IDENT(TYPE) \
+    INCBIN_CONCATENATE( \
+        INCBIN_STYLE_, \
+        INCBIN_CONCATENATE( \
+            INCBIN_EVAL(INCBIN_STYLE), \
+            INCBIN_CONCATENATE(_, TYPE)))
+
+/* Style lookup: returning string literal */
+#define INCBIN_STYLE_STRING(TYPE) \
+    INCBIN_STRINGIZE( \
+        INCBIN_STYLE_IDENT(TYPE)) \
+
+/* Generate the global labels by indirectly invoking the macro with our style
+ * type and concatenating the name against them. */
+#define INCBIN_GLOBAL_LABELS(NAME, TYPE) \
+    INCBIN_INVOKE( \
+        INCBIN_GLOBAL, \
+        INCBIN_CONCATENATE( \
+            NAME, \
+            INCBIN_INVOKE( \
+                INCBIN_STYLE_IDENT, \
+                TYPE))) \
+    INCBIN_INVOKE( \
+        INCBIN_TYPE, \
+        INCBIN_CONCATENATE( \
+            NAME, \
+            INCBIN_INVOKE( \
+                INCBIN_STYLE_IDENT, \
+                TYPE)))
+
+/**
+ * @brief Externally reference binary data included in another translation unit.
+ *
+ * Produces three external symbols that reference the binary data included in
+ * another translation unit.
+ *
+ * The symbol names are a concatenation of `INCBIN_PREFIX' before *NAME*; with
+ * "Data", as well as "End" and "Size" after. An example is provided below.
+ *
+ * @param NAME The name given for the binary data
+ *
+ * @code
+ * INCBIN_EXTERN(Foo);
+ *
+ * // Now you have the following symbols:
+ * // extern const unsigned char <prefix>FooData[];
+ * // extern const unsigned char *const <prefix>FooEnd;
+ * // extern const unsigned int <prefix>FooSize;
+ * @endcode
+ */
+#define INCBIN_EXTERN(NAME) \
+    INCBIN_EXTERNAL const INCBIN_ALIGN unsigned char \
+        INCBIN_CONCATENATE( \
+            INCBIN_CONCATENATE(INCBIN_PREFIX, NAME), \
+            INCBIN_STYLE_IDENT(DATA))[]; \
+    INCBIN_EXTERNAL const INCBIN_ALIGN unsigned char *const \
+    INCBIN_CONCATENATE( \
+        INCBIN_CONCATENATE(INCBIN_PREFIX, NAME), \
+        INCBIN_STYLE_IDENT(END)); \
+    INCBIN_EXTERNAL const unsigned int \
+        INCBIN_CONCATENATE( \
+            INCBIN_CONCATENATE(INCBIN_PREFIX, NAME), \
+            INCBIN_STYLE_IDENT(SIZE))
+
+/**
+ * @brief Include a binary file into the current translation unit.
+ *
+ * Includes a binary file into the current translation unit, producing three symbols
+ * for objects that encode the data and size respectively.
+ *
+ * The symbol names are a concatenation of `INCBIN_PREFIX' before *NAME*; with
+ * "Data", as well as "End" and "Size" after. An example is provided below.
+ *
+ * @param NAME The name to associate with this binary data (as an identifier.)
+ * @param FILENAME The file to include (as a string literal.)
+ *
+ * @code
+ * INCBIN(Icon, "icon.png");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char <prefix>IconData[];
+ * // const unsigned char *const <prefix>IconEnd;
+ * // const unsigned int <prefix>IconSize;
+ * @endcode
+ *
+ * @warning This must be used in global scope
+ * @warning The identifiers may be different if INCBIN_STYLE is not default
+ *
+ * To externally reference the data included by this in another translation unit
+ * please @see INCBIN_EXTERN.
+ */
+#ifdef _MSC_VER
+#define INCBIN(NAME, FILENAME) \
+    INCBIN_EXTERN(NAME)
+#else
+#define INCBIN(NAME, FILENAME) \
+    __asm__(INCBIN_SECTION \
+            INCBIN_GLOBAL_LABELS(NAME, DATA) \
+            INCBIN_ALIGN_HOST \
+            INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(DATA) ":\n" \
+            INCBIN_MACRO " \"" FILENAME "\"\n" \
+            INCBIN_GLOBAL_LABELS(NAME, END) \
+            INCBIN_ALIGN_BYTE \
+            INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(END) ":\n" \
+                INCBIN_BYTE "1\n" \
+            INCBIN_GLOBAL_LABELS(NAME, SIZE) \
+            INCBIN_ALIGN_HOST \
+            INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(SIZE) ":\n" \
+                INCBIN_INT INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(END) " - " \
+                           INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(DATA) "\n" \
+            INCBIN_ALIGN_HOST \
+            ".text\n" \
+    ); \
+    INCBIN_EXTERN(NAME)
+
+#endif
+#endif
diff --git a/incbin/test/.gitignore b/incbin/test/.gitignore
new file mode 100644
index 0000000..377c803
--- /dev/null
+++ b/incbin/test/.gitignore
@@ -0,0 +1 @@
+/asserts
diff --git a/incbin/test/Makefile b/incbin/test/Makefile
new file mode 100644
index 0000000..aa31bec
--- /dev/null
+++ b/incbin/test/Makefile
@@ -0,0 +1,5 @@
+test: asserts
+	./asserts
+
+asserts: asserts.c ../incbin.h
+	$(CC) -o asserts asserts.c
diff --git a/incbin/test/asserts.c b/incbin/test/asserts.c
new file mode 100644
index 0000000..9028a2a
--- /dev/null
+++ b/incbin/test/asserts.c
@@ -0,0 +1,20 @@
+#include <assert.h>
+#include <stdlib.h>
+#include "../incbin.h"
+
+INCBIN(Lorem, "loremipsum.txt");
+INCBIN(Onebyte, "onebyte.txt");
+INCBIN(Sevenbytes, "sevenbytes.txt");
+
+int main(int argc, char **argv)
+{
+	assert(gLoremSize==962);
+	assert(&gLoremData[gLoremSize] == (const unsigned char*) &gLoremEnd);
+
+	assert(gOnebyteSize == 1);
+	assert(&gOnebyteData[gOnebyteSize] == (const unsigned char*) &gOnebyteEnd);
+
+	assert(gSevenbytesSize==7);
+	assert(&gSevenbytesData[gSevenbytesSize] == (const unsigned char*) &gSevenbytesEnd);
+	exit(0);
+}
diff --git a/incbin/test/loremipsum.txt b/incbin/test/loremipsum.txt
new file mode 100644
index 0000000..424477f
--- /dev/null
+++ b/incbin/test/loremipsum.txt
@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.
\ No newline at end of file
diff --git a/incbin/test/onebyte.txt b/incbin/test/onebyte.txt
new file mode 100644
index 0000000..500c070
--- /dev/null
+++ b/incbin/test/onebyte.txt
@@ -0,0 +1 @@
+X
\ No newline at end of file
diff --git a/incbin/test/sevenbytes.txt b/incbin/test/sevenbytes.txt
new file mode 100644
index 0000000..462f61f
--- /dev/null
+++ b/incbin/test/sevenbytes.txt
@@ -0,0 +1 @@
+XXXXXXX
\ No newline at end of file
diff --git a/mdloader_common.c b/mdloader_common.c
index d7aec82..b773318 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -17,6 +17,11 @@
  *  along with Massdrop Loader.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#define INCBIN_PREFIX
+#define INCBIN_STYLE INCBIN_STYLE_SNAKE
+#include "incbin/incbin.h"
+INCBIN(applet, "applet-mdflash.bin");
+
 #include "mdloader_common.h"
 #include "mdloader_parser.h"
 
@@ -751,12 +756,7 @@ int main(int argc, char *argv[])
     print_bootloader_version();
     if (verbose) printf("Device ID: %08X\n", mcu->cidr);
 
-    //Load applet
-    extern uint8_t data[]     asm("_binary_applet_mdflash_bin_start");
-    extern uint8_t data_end[] asm("_binary_applet_mdflash_bin_end");
-    size_t filebytes = (size_t)(data_end - data);
-
-    char *appletbuf = (char *)calloc(filebytes,1);
+    char *appletbuf = (char *)calloc(applet_size,1);
     if (appletbuf == NULL)
     {
         printf("Error: Could not allocate memory for applet file!\n");
@@ -764,12 +764,12 @@ int main(int argc, char *argv[])
     }
 
     int readbytes=0;
-    for (uint8_t *byte=data; byte<data_end; ++byte) {
+    for (const uint8_t *byte=applet_data; byte<applet_end; ++byte) {
         appletbuf[readbytes] = *byte;
         readbytes++;
     }
 
-    if (readbytes != filebytes)
+    if (readbytes != applet_size)
     {
         printf("Error: Applet read error!\n");
         goto closePort;

From 8d9b2fddea6e63b8b1dd14d175430a4217b481a7 Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Thu, 30 Sep 2021 13:31:53 +0100
Subject: [PATCH 3/4] fix read logic

---
 mdloader_common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index b773318..486768b 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -764,9 +764,9 @@ int main(int argc, char *argv[])
     }
 
     int readbytes=0;
-    for (const uint8_t *byte=applet_data; byte<applet_end; ++byte) {
-        appletbuf[readbytes] = *byte;
-        readbytes++;
+    for (; readbytes < applet_size; readbytes++)
+    {
+        appletbuf[readbytes] = applet_data[readbytes];
     }
 
     if (readbytes != applet_size)

From 88ab416310e9e7a8ec72528b3055232439c058d6 Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Thu, 30 Sep 2021 14:42:44 +0100
Subject: [PATCH 4/4] strip out alloc+copy logic

---
 mdloader_common.c | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index 486768b..e3cd2f1 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -756,32 +756,8 @@ int main(int argc, char *argv[])
     print_bootloader_version();
     if (verbose) printf("Device ID: %08X\n", mcu->cidr);
 
-    char *appletbuf = (char *)calloc(applet_size,1);
-    if (appletbuf == NULL)
-    {
-        printf("Error: Could not allocate memory for applet file!\n");
-        goto closePort;
-    }
-
-    int readbytes=0;
-    for (; readbytes < applet_size; readbytes++)
-    {
-        appletbuf[readbytes] = applet_data[readbytes];
-    }
 
-    if (readbytes != applet_size)
-    {
-        printf("Error: Applet read error!\n");
-        goto closePort;
-    }
-
-    if (readbytes < sizeof(appinfo_t))
-    {
-        printf("Error: Applet binary too small!\n");
-        goto closePort;
-    }
-
-    memcpy(&appinfo, appletbuf + readbytes - sizeof(appinfo_t), sizeof(appinfo_t));
+    memcpy(&appinfo, applet_data + applet_size - sizeof(appinfo_t), sizeof(appinfo_t));
     if (appinfo.magic != 0x4142444D)
     {
         printf("Error: Applet info not found!\n");
@@ -797,17 +773,14 @@ int main(int argc, char *argv[])
     //printf("Applet data:\n");
     //print_hex_listing(appletbuf, readbytes, 0, 0);
 
-    if (verbose) printf("Applet size: %i\n", readbytes);
+    if (verbose) printf("Applet size: %i\n", applet_size);
 
-    if (!send_file(appinfo.load_addr, readbytes, appletbuf))
+    if (!send_file(appinfo.load_addr, applet_size, (char*)applet_data))
     {
         printf("Error: Could not send applet!\n");
-        free(appletbuf);
         goto closePort;
     }
 
-    free(appletbuf);
-
     //printf("Applet data in RAM:\n");
     //char *data_recv = recv_file(appinfo.load_addr, readbytes);
     //if (data_recv)