* Commit dual-boot support for Creative ZVx family

 * Add mkzenboot: makes it possible to integrate Rockbox bootloader with
   Creative firmwares without the need of distributing binaries
 * Add Tadeusz PyÅ› to credits, who figured out the minifs file system
 * Fix bootloader


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18352 a1c6a512-1295-4272-9138-f99709370657

9 files changed, 1414 insertions, 5 deletions

diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index 9f8cf1c91c..1258f9e1d4 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -33,4 +33,6 @@ telechips.c
 meizu_m6sl.c
 #elif defined(ONDA_VX747)
 ondavx747.c
+#elif defined(CREATIVE_ZVM)
+creativezvm.c
 #endif
diff --git a/bootloader/creativezvm.c b/bootloader/creativezvm.c
new file mode 100644
index 0000000000..f7a6d343d5
--- /dev/null
+++ b/bootloader/creativezvm.c
@@ -0,0 +1,113 @@
+/***************************************************************************
+*             __________               __   ___.
+*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+*                     \/            \/     \/    \/            \/
+* $Id$
+*
+* Copyright (C) 2008 by Maurus Cuelenaere
+*
+* All files in this archive are subject to the GNU General Public License.
+* See the file COPYING in the source tree root for full license agreement.
+*
+* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+* KIND, either express or implied.
+*
+****************************************************************************/
+
+#include "system.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "thread.h"
+#include "ata.h"
+#include "ata-target.h"
+#include "disk.h"
+#include "font.h"
+#include "backlight.h"
+#include "button.h"
+#include "common.h"
+
+
+static void load_fw(unsigned char* ptr, unsigned int len)
+{
+    (void)ptr;
+    (void)len;
+    asm volatile("ldr pc, =0x1EE0000");
+}
+
+void main(void)
+{
+    unsigned char* loadbuffer;
+    int buffer_size;
+    int(*kernel_entry)(void);
+    int ret;
+    
+        /* Make sure interrupts are disabled */
+        set_irq_level(IRQ_DISABLED);
+    set_fiq_status(FIQ_DISABLED);
+    system_init();
+    kernel_init();
+        
+        /* Now enable interrupts */
+        set_irq_level(IRQ_ENABLED);
+    set_fiq_status(FIQ_ENABLED);
+    backlight_init();
+    lcd_init();
+    font_init();
+    button_init();
+
+    lcd_enable(true);
+    lcd_setfont(FONT_SYSFIXED);
+    reset_screen();
+    printf("Rockbox boot loader");
+    printf("Version %s", APPSVERSION);
+    
+        ret = ata_init();
+        if(ret)
+                printf("ATA error: %d", ret);
+    
+    if(1)
+    {
+        printf("Loading Creative firmware...");
+        
+        loadbuffer = (unsigned char*)0x00A00000;
+        ret = load_minifs_file("creativeos.jrm", loadbuffer);
+        if(ret != -1)
+        {
+                set_irq_level(IRQ_DISABLED);
+            set_fiq_status(FIQ_DISABLED);
+            /* Doesn't return! */
+            load_fw(loadbuffer, ret);
+        }
+        else
+            printf("FAILED!");
+    }
+    else
+    {
+        disk_init();
+
+        ret = disk_mount_all();
+        if (ret <= 0)
+            error(EDISK, ret);
+        
+        printf("Loading Rockbox firmware...");
+
+        loadbuffer = (unsigned char*)0x00900000;
+        buffer_size = (unsigned char*)0x01900000 - loadbuffer;
+
+        ret = load_firmware(loadbuffer, BOOTFILE, buffer_size);
+        if(ret < 0)
+            error(EBOOTFILE, ret);
+        
+        else if(ret == EOK)
+        {
+            kernel_entry = (void*) loadbuffer;
+            ret = kernel_entry();
+            printf("FAILED!");
+        }
+    }
+    
+    while(1);
+}
diff --git a/docs/CREDITS b/docs/CREDITS
index 8e087e0655..f9bacd51d5 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -412,6 +412,7 @@ Jun Gu
 Daniel Weck
 Clément Pit-Claudel
 Jelle Geerts
+Tadeusz PyÅ›
 
 The libmad team
 The wavpack team
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index b7a0fcef57..647e8e986c 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config-creativezvm.h
@@ -166,11 +166,11 @@
 #define USB_PRODUCT_ID 0x4133
 
 /*DEBUGGING!*/
-#ifdef BOOTLOADER
+/*
 #define THREAD_EXTRA_CHECKS 1
 #define DEBUG 1
 #define debug(msg) printf(msg)
 #define BUTTON_DEBUG
-#endif
+*/
 
 #endif
diff --git a/firmware/target/arm/tms320dm320/boot.lds b/firmware/target/arm/tms320dm320/boot.lds
index 5a4182fe29..97274a2c04 100644
--- a/firmware/target/arm/tms320dm320/boot.lds
+++ b/firmware/target/arm/tms320dm320/boot.lds
@@ -7,7 +7,7 @@ STARTUP(target/arm/tms320dm320/crt0.o)
 
 #define DRAMSIZE (MEMORYSIZE * 0x100000)
 
-#define DRAMORIG 0x00900000
+#define DRAMORIG 0x01900000 /* actually it's 0x00900000 */
 #define IRAMORIG 0x00000000
 #define IRAMSIZE 16K
 #define FLASHORIG 0x00100000
@@ -22,7 +22,7 @@ MEMORY
 
 SECTIONS
 {
-    . = DRAMORIG + 0x1000000;
+    . = DRAMORIG;
 
     .text : {
         loadaddress = .;
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
index 0c4dd4bfbe..1732c5d2c4 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
@@ -28,6 +28,8 @@
 #include "panic.h"

 #include "ata-target.h"

 #include "dm320.h"

+#include "ata.h"

+#include "string.h"

 

 void sleep_ms(int ms)

 {

@@ -109,3 +111,106 @@ void GIO2(void)
     IO_INTC_IRQ1 = INTR_IRQ1_EXT2; /* Mask GIO2 interrupt */

     return;

 }

+

+/*

+ ---------------------------------------------------------------------------

+ Creative File Systems parsing code

+ ---------------------------------------------------------------------------

+ */

+

+struct main_header

+{

+    char mblk[4];

+    unsigned char sector_size[4];

+    unsigned char disk_size[8];

+    struct partition_header

+    {

+        unsigned char end[4];

+        unsigned char start[4];

+        char name[8];

+    } partitions[31];

+};

+

+struct minifs_file

+{

+    char name[0x10];

+    unsigned char unk[4];

+    unsigned char size[4];

+    unsigned char chain1[4];

+    unsigned char chain2[4];

+};

+

+struct minifs_chain

+{

+    unsigned char unknown[4];

+    unsigned char chain[2*0x27FE];

+    unsigned char unknown2[4];

+    unsigned char length[4];

+};

+

+

+#define DIR_BITMAP_START       0x0143

+#define DIR_START              0x0144

+#define DATASPACE_BITMAP_START 0x0145

+#define DATASPACE_START        0x0146

+

+#define CLUSTER_CHAIN_SIZE     0x5008

+#define CLUSTER_CHAIN_HEAD     0x0000

+#define CLUSTER_CHAIN_BITMAP   0x0001

+#define CLUSTER_CHAIN_CHAIN    0x0002

+

+

+static unsigned short le2int16(unsigned char* buf)

+{

+   return (buf[1] << 8) | buf[0];

+}

+

+static unsigned int le2int32(unsigned char* buf)

+{

+   return (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];

+}

+

+int load_minifs_file(char* filename, unsigned char* location)

+{

+    struct main_header *hdr;

+    static struct minifs_file files[128];

+    struct minifs_chain *chain;

+    unsigned int i;

+    int found = -1;

+    unsigned char sector[512];

+    static unsigned char chain_data[42*512]; /* stack overflow if not static */

+    

+    /* Reading MBLK */

+    ata_read_sectors(0, 1, &sector);

+    hdr = (struct main_header*)&sector;

+    

+    /* Reading directory listing */

+#define CLUSTER2SECTOR(x) ( (le2int32(hdr->partitions[0].start) + (x)*8) )

+    ata_read_sectors(CLUSTER2SECTOR(DIR_START), 8, &files);

+    

+    for(i=0; i<127; i++)

+    {

+        if(strcmp(files[i].name, filename) == 0)

+            found = i;

+    }

+    

+    if(found == -1)

+        return -1;

+    

+#define GET_CHAIN(x)   ( CLUSTER2SECTOR(CLUSTER_CHAIN_CHAIN)*512 + (x)*CLUSTER_CHAIN_SIZE )

+#define FILE2SECTOR(x) ( CLUSTER2SECTOR(DATASPACE_START + (x)) )

+    

+    /* Reading chain list */

+    ata_read_sectors(GET_CHAIN(le2int32(files[found].chain1))/512, 41, &chain_data[0]);

+    

+    chain = (struct minifs_chain*)&chain_data[GET_CHAIN(le2int32(files[found].chain1))%512];

+    

+    /* Copying data */

+    for(i=0; i<le2int32(chain->length); i++)

+    {

+        ata_read_sectors(FILE2SECTOR(le2int16(&chain->chain[i*2])), 8, location);

+        location += 0x1000;

+    }

+    

+    return le2int32(files[found].size);

+}

diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h
index 63417d1219..6e5699e887 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h
+++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h
@@ -74,5 +74,6 @@ void ata_reset(void);
 void ata_device_init(void);
 bool ata_is_coldstart(void);
 void ide_power_enable(bool on);
+int load_minifs_file(char* filename, unsigned char* location);
 
 #endif
diff --git a/tools/Makefile b/tools/Makefile
index f2497291d9..2e3f1e0fc1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,7 +13,7 @@ LDFLAGS := -g
 
 CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf   \
  generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat database \
- lngdump telechips gigabeats creative hmac-sha1 mktccboot mknkboot rbspeexenc
+ lngdump telechips gigabeats creative hmac-sha1 mktccboot mknkboot rbspeexenc mkzenboot
 
 all:
         @echo "Run make in your build directory!"
@@ -51,6 +51,12 @@ mktccboot: mktccboot.c telechips.o
 mknkboot: mknkboot.c
         $(SILENT)$(CC) $(CFLAGS) $+ -o $@
 
+mkzenboot.o: mkzenboot.c
+        $(SILENT)$(CC) $(CFLAGS) -DSTANDALONE -c -o $@ $+
+
+mkzenboot: mkzenboot.o hmac-sha1.o
+        $(SILENT)$(CC) $(LDFLAGS) -lz $+ -o $@
+
 lngdump: lngdump.c
         $(SILENT)$(CC) $(CFLAGS) $+ -o $@
 
diff --git a/tools/mkzenboot.c b/tools/mkzenboot.c
new file mode 100644
index 0000000000..2ed9284583
--- /dev/null
+++ b/tools/mkzenboot.c
@@ -0,0 +1,1181 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Maurus Cuelenaere
+ *
+ * Based on zenutils by Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <inttypes.h>
+#include <zlib.h>
+#include "hmac-sha1.h"
+
+static int filesize(FILE* fd)
+{
+    int tmp, tmp2 = ftell(fd);
+    fseek(fd, 0, SEEK_END);
+    tmp = ftell(fd);
+    fseek(fd, tmp2, SEEK_SET);
+    return tmp;
+}
+
+static unsigned int le2int(unsigned char* buf)
+{
+   return ((buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]);
+}
+
+static void int2le(unsigned int val, unsigned char* addr)
+{
+    addr[0] = val & 0xFF;
+    addr[1] = (val >> 8) & 0xff;
+    addr[2] = (val >> 16) & 0xff;
+    addr[3] = (val >> 24) & 0xff;
+}
+
+static const char* find_firmware_key(const unsigned char* buffer, size_t len)
+{
+    char szkey1[] = "34d1";
+    size_t cchkey1 = strlen(szkey1);
+    char szkey2[] = "TbnCboEbn";
+    size_t cchkey2 = strlen(szkey2);
+    uint32_t i;
+    for (i = 0; i < (uint32_t)len; i++)
+    {
+        if (len >= cchkey1)
+        {
+            if (!strncmp((char*)&buffer[i], szkey1, cchkey1))
+                return (const char*)&buffer[i];
+        }
+        if (len >= cchkey2)
+        {
+            if (!strncmp((char*)&buffer[i], szkey2, cchkey2))
+                return (const char*)&buffer[i];
+        }
+    }
+    return NULL;
+}
+
+static uint32_t find_firmware_offset(unsigned char* buffer, size_t len)
+{
+    uint32_t i;
+    for (i = 0; i < (uint32_t)len; i += 0x10)
+    {
+        if (buffer[i + sizeof(uint32_t)] != 0
+            && buffer[i + sizeof(uint32_t) + 1] != 0
+            && buffer[i + sizeof(uint32_t) + 2] != 0
+            && buffer[i + sizeof(uint32_t) + 3] != 0)
+        {
+            return i;
+        }
+        if(i > 0xFF) /* Arbitrary guess */
+            return 0;
+    }
+    return 0;
+}
+
+static bool crypt_firmware(const char* key, unsigned char* buffer, size_t len)
+{
+    char key_cpy[255];
+    unsigned int i;
+    unsigned int tmp = 0;
+    int key_length = strlen(key);
+    
+    strcpy(key_cpy, key);
+    for(i=0; i < strlen(key); i++)
+        key_cpy[i] = key[i] - 1;
+    
+    for(i=0; i < len; i++)
+    {
+        buffer[i] ^= key_cpy[tmp] | 0x80;
+        tmp = (tmp + 1) % key_length;
+    }
+    
+    return true;
+}
+
+static bool inflate_to_buffer(const unsigned char *buffer, size_t len, unsigned char* out_buffer, size_t out_len, char** err_msg)
+{
+    /* Initialize Zlib */
+    z_stream d_stream;
+    int ret;
+
+    d_stream.zalloc = Z_NULL;
+    d_stream.zfree = Z_NULL;
+    d_stream.opaque = Z_NULL;
+
+    d_stream.next_in  = (unsigned char*)buffer;
+    d_stream.avail_in = len;
+
+    ret = inflateInit(&d_stream);
+    if (ret != Z_OK)
+    {
+        *err_msg = d_stream.msg;
+        return false;
+    }
+        
+    d_stream.next_out = out_buffer;
+    d_stream.avail_out = out_len;
+    
+    ret = inflate(&d_stream, Z_SYNC_FLUSH);
+    if(ret < 0)
+    {
+        *err_msg = d_stream.msg;
+        return false;
+    }
+    else
+        inflateEnd(&d_stream);
+    
+    return true;
+}
+
+#define CODE_MASK      0xC0
+#define ARGS_MASK      0x3F
+
+#define REPEAT_CODE    0x00
+#define BLOCK_CODE     0x40
+#define LONG_RUN_CODE  0x80
+#define SHORT_RUN_CODE 0xC0
+
+#define BLOCK_ARGS     0x1F
+#define BLOCK_MODE     0x20
+
+
+static void decode_run(unsigned char* dst, uint16_t len, unsigned char val,
+                int* dstidx)
+{
+    memset(dst + *dstidx, val, len);
+    *dstidx += len;
+}
+
+static void decode_pattern(unsigned char* src, unsigned char* dst,
+                    uint16_t len, int* srcidx, int* dstidx,
+                    bool bdecode, int npasses)
+{
+    int i, j;
+    for (i = 0; i < npasses; i++)
+    {
+        if (bdecode)
+        {
+            for (j = 0; j < len; j++)
+            {
+                uint16_t c, d;
+                c = src[*srcidx + j];
+                d = (c >> 5) & 7;
+                c = (c << 3) & 0xF8;
+                src[*srcidx + j] = (unsigned char)(c | d);
+            }
+            bdecode = false;
+        }
+        memcpy(dst + *dstidx, src + *srcidx, len);
+        *dstidx += len;
+    }
+    *srcidx += len;
+}
+
+static int cenc_decode(unsigned char* src, int srclen, unsigned char* dst, int dstlen)
+{
+    int i = 0, j = 0;
+    do
+    {
+        uint16_t c, d, e;
+        c = src[i++];
+        switch (c & CODE_MASK)
+        {
+        case REPEAT_CODE: /* 2 unsigned chars */
+            d = src[i++];
+            d = d + 2;
+
+            e = (c & ARGS_MASK) + 2;
+
+            decode_pattern(src, dst, e, &i, &j, false, d);
+            break;
+
+        case BLOCK_CODE: /* 1/2/3 unsigned chars */
+            d = c & BLOCK_ARGS;
+            if (!(c & BLOCK_MODE))
+            {
+                e = src[i++];
+                e = (d << 8) + (e + 0x21);
+
+                d = (uint16_t)(i ^ j);
+            }
+            else
+            {
+                e = d + 1;
+
+                d = (uint16_t)(i ^ j);
+            }
+            if (d & 1)
+            {
+                i++;
+            }
+
+            decode_pattern(src, dst, e, &i, &j, true, 1);
+            break;
+
+        case LONG_RUN_CODE: /* 3 unsigned chars */
+            d = src[i++];
+            e = ((c & ARGS_MASK) << 8) + (d + 0x42);
+
+            d = src[i++];
+            d = ((d & 7) << 5) | ((d >> 3) & 0x1F);
+
+            decode_run(dst, e, (unsigned char)(d), &j);
+            break;
+
+        case SHORT_RUN_CODE: /* 2 unsigned chars */
+            d = src[i++];
+            d = ((d & 3) << 6) | ((d >> 2) & 0x3F);
+
+            e = (c & ARGS_MASK) + 2;
+
+            decode_run(dst, e, (unsigned char)(d), &j);
+            break;
+        };
+    } while (i < srclen && j < dstlen);
+
+    return j;
+}
+
+/*
+ * Copyright (c) 1999, 2000, 2002 Virtual Unlimited B.V.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define BLOWFISHROUNDS  16
+#define BLOWFISHPSIZE   (BLOWFISHROUNDS+2)
+#define WORDS_BIGENDIAN 0
+
+struct blowfishParam
+{
+    uint32_t p[BLOWFISHPSIZE];
+    uint32_t s[1024];
+    uint32_t fdback[2];
+};
+
+typedef enum
+{
+    NOCRYPT,
+    ENCRYPT,
+    DECRYPT
+} cipherOperation;
+
+static inline uint32_t swapu32(uint32_t n)
+{
+    return (    ((n & 0xffU) << 24) |
+                ((n & 0xff00U) << 8) |
+                ((n & 0xff0000U) >> 8) |
+                ((n & 0xff000000U) >> 24) );
+}
+
+static uint32_t _bf_p[BLOWFISHPSIZE] = {
+    0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+    0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+    0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+    0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+    0x9216d5d9, 0x8979fb1b
+};
+
+static uint32_t _bf_s[1024] = {
+    0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+    0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+    0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+    0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+    0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+    0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+    0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+    0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+    0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+    0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+    0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+    0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+    0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+    0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+    0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+    0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+    0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+    0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+    0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+    0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+    0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+    0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+    0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+    0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+    0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+    0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+    0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+    0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+    0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+    0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+    0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+    0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+    0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+    0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+    0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+    0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+    0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+    0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+    0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+    0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+    0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+    0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+    0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+    0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+    0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+    0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+    0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+    0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+    0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+    0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+    0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+    0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+    0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+    0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+    0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+    0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+    0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+    0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+    0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+    0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+    0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+    0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+    0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+    0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+    0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+    0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+    0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+    0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+    0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+    0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+    0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+    0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+    0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+    0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+    0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+    0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+    0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+    0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+    0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+    0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+    0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+    0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+    0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+    0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+    0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+    0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+    0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+    0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+    0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+    0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+    0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+    0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+    0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+    0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+    0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+    0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+    0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+    0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+    0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+    0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+    0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+    0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+    0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+    0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+    0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+    0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+    0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+    0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+    0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+    0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+    0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+    0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+    0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+    0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+    0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+    0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+    0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+    0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+    0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+    0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+    0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+    0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+    0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+    0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+    0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+    0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+    0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+    0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
+    0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+    0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+    0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+    0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+    0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+    0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+    0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+    0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+    0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+    0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+    0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+    0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+    0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+    0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+    0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+    0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+    0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+    0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+    0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+    0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+    0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+    0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+    0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+    0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+    0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+    0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+    0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+    0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+    0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+    0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+    0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+    0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+    0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+    0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+    0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+    0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+    0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+    0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+    0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+    0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+    0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+    0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+    0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+    0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+    0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+    0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+    0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+    0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+    0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+    0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+    0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+    0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+    0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+    0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+    0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+    0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+    0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+    0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+    0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+    0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+    0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+    0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+    0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+    0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+    0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+    0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+    0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+    0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+    0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+    0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+    0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+    0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+    0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+    0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+    0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+    0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+    0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+    0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+    0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+    0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+    0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+    0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+    0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+    0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+    0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+    0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+    0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+    0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+    0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+    0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+    0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+    0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+    0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+    0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+    0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+    0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+    0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+    0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+    0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+    0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+    0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+    0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+    0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+    0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+    0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+    0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+    0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+    0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+    0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+    0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+    0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+    0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+    0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+    0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+    0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+    0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+    0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+    0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+    0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+    0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+    0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+    0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+    0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+    0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+    0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+    0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+    0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+    0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+};
+
+#define EROUND(l,r) l ^= *(p++); r ^= ((s[((l>>24)&0xff)+0x000]+s[((l>>16)&0xff)+0x100])^s[((l>>8)&0xff)+0x200])+s[((l>>0)&0xff)+0x300]
+#define DROUND(l,r) l ^= *(p--); r ^= ((s[((l>>24)&0xff)+0x000]+s[((l>>16)&0xff)+0x100])^s[((l>>8)&0xff)+0x200])+s[((l>>0)&0xff)+0x300]
+
+static int blowfishEncrypt(struct blowfishParam* bp, uint32_t* dst, const uint32_t* src)
+{
+    #if WORDS_BIGENDIAN
+    register uint32_t xl = src[0], xr = src[1];
+    #else
+    register uint32_t xl = swapu32(src[0]), xr = swapu32(src[1]);
+    #endif
+    register uint32_t* p = bp->p;
+    register uint32_t* s = bp->s;
+
+    EROUND(xl, xr); EROUND(xr, xl);
+    EROUND(xl, xr); EROUND(xr, xl);
+    EROUND(xl, xr); EROUND(xr, xl);
+    EROUND(xl, xr); EROUND(xr, xl);
+    EROUND(xl, xr); EROUND(xr, xl);
+    EROUND(xl, xr); EROUND(xr, xl);
+    EROUND(xl, xr); EROUND(xr, xl);
+    EROUND(xl, xr); EROUND(xr, xl);
+
+    #if WORDS_BIGENDIAN
+    dst[1] = xl ^ *(p++);
+    dst[0] = xr ^ *(p++);
+    #else
+    dst[1] = swapu32(xl ^ *(p++));
+    dst[0] = swapu32(xr ^ *(p++));
+    #endif
+
+    return 0;
+}
+
+static int blowfishDecrypt(struct blowfishParam* bp, uint32_t* dst, const uint32_t* src)
+{
+    #if WORDS_BIGENDIAN
+    register uint32_t xl = src[0], xr = src[1];
+    #else
+    register uint32_t xl = swapu32(src[0]), xr = swapu32(src[1]);
+    #endif
+    register uint32_t* p = bp->p+BLOWFISHPSIZE-1;
+    register uint32_t* s = bp->s;
+
+    DROUND(xl, xr); DROUND(xr, xl);
+    DROUND(xl, xr); DROUND(xr, xl);
+    DROUND(xl, xr); DROUND(xr, xl);
+    DROUND(xl, xr); DROUND(xr, xl);
+    DROUND(xl, xr); DROUND(xr, xl);
+    DROUND(xl, xr); DROUND(xr, xl);
+    DROUND(xl, xr); DROUND(xr, xl);
+    DROUND(xl, xr); DROUND(xr, xl);
+
+    #if WORDS_BIGENDIAN
+    dst[1] = xl ^ *(p--);
+    dst[0] = xr ^ *(p--);
+    #else
+    dst[1] = swapu32(xl ^ *(p--));
+    dst[0] = swapu32(xr ^ *(p--));
+    #endif
+
+    return 0;
+}
+
+static int blowfishSetup(struct blowfishParam* bp, const unsigned char* key, size_t keybits, cipherOperation op)
+{
+    if ((op != ENCRYPT) && (op != DECRYPT))
+        return -1;
+
+    if (((keybits & 7) == 0) && (keybits >= 32) && (keybits <= 448))
+    {
+        register uint32_t* p = bp->p;
+        register uint32_t* s = bp->s;
+        register unsigned int i, j, k;
+
+        uint32_t tmp, work[2];
+
+        memcpy(s, _bf_s, 1024 * sizeof(uint32_t));
+
+        for (i = 0, k = 0; i < BLOWFISHPSIZE; i++)
+        {
+            tmp = 0;
+            for (j = 0; j < 4; j++)
+            {
+                tmp <<= 8;
+                tmp |= key[k++];
+                if (k >= (keybits >> 3))
+                    k = 0;
+            }
+            p[i] = _bf_p[i] ^ tmp;
+        }
+
+        work[0] = work[1] = 0;
+
+        for (i = 0; i < BLOWFISHPSIZE; i += 2, p += 2)
+        {
+            blowfishEncrypt(bp, work, work);
+            #if WORDS_BIGENDIAN
+            p[0] = work[0];
+            p[1] = work[1];
+            #else
+            p[0] = swapu32(work[0]);
+            p[1] = swapu32(work[1]);
+            #endif
+        }
+
+        for (i = 0; i < 1024; i += 2, s += 2)
+        {
+            blowfishEncrypt(bp, work, work);
+            #if WORDS_BIGENDIAN
+            s[0] = work[0];
+            s[1] = work[1];
+            #else
+            s[0] = swapu32(work[0]);
+            s[1] = swapu32(work[1]);
+            #endif
+        }
+
+        /* clear fdback/iv */
+        bp->fdback[0] = 0;
+        bp->fdback[1] = 0;
+
+        return 0;
+    }
+    return -1;
+}
+
+static int blowfishSetIV(struct blowfishParam* bp, const unsigned char* iv)
+{
+    if (iv)
+        memcpy(bp->fdback, iv, 8);
+    else
+        memset(bp->fdback, 0, 8);
+
+    return 0;
+}
+
+#define BLOWFISH_BLOCKSIZE 8
+static int blowfishDecryptCBC(struct blowfishParam* bp, uint32_t* dst, const uint32_t* src, unsigned int nblocks)
+{
+    register const unsigned int blockwords = BLOWFISH_BLOCKSIZE >> 2;
+    register uint32_t* fdback = bp->fdback;
+    register uint32_t* buf = (uint32_t*) malloc(blockwords * sizeof(uint32_t));
+
+    if (buf)
+    {
+        while (nblocks > 0)
+        {
+            register uint32_t tmp;
+            register unsigned int i;
+
+            blowfishDecrypt(bp, buf, src);
+
+            for (i = 0; i < blockwords; i++)
+            {
+                tmp = src[i];
+                dst[i] = buf[i] ^ fdback[i];
+                fdback[i] = tmp;
+            }
+
+            dst += blockwords;
+            src += blockwords;
+
+            nblocks--;
+        }
+        free(buf);
+        return 0;
+    }
+
+    return -1;
+}
+
+static bool bf_cbc_decrypt(const unsigned char* key, size_t keylen,
+                           unsigned char* data, size_t datalen,
+                           const unsigned char* iv)
+{
+    struct blowfishParam param;
+    unsigned char *cipher;
+    unsigned int nblocks;
+    
+    if (datalen % BLOWFISH_BLOCKSIZE)
+        return false;
+
+    if (blowfishSetup(&param, key, keylen * 8, ENCRYPT))
+        return false;
+    if (blowfishSetIV(&param, iv))
+        return false;
+
+    cipher = malloc(datalen);
+    memcpy(cipher, data, datalen);
+
+    nblocks = datalen / BLOWFISH_BLOCKSIZE;
+    if (blowfishDecryptCBC(&param, (uint32_t*)data, (uint32_t*)cipher,
+                        nblocks))
+    {
+        free(cipher);
+        return false;
+    }
+
+    free(cipher);
+    return true;
+}
+
+static inline uint32_t swap(uint32_t val)
+{
+    return ((val & 0xFF) << 24)
+           | ((val & 0xFF00) << 8)
+           | ((val & 0xFF0000) >> 8)
+           | ((val & 0xFF000000) >> 24);
+}
+
+const char *tl_key = "1sN0TM3D az u~may th1nk*"
+                     "Creative Zen Vision:M";
+const char *null_key = "CTL:N0MAD|PDE0.DPMP.";
+
+int mkboot(const char* infile, const char* bootfile, const char* outfile)
+{
+    FILE *infd, *bootfd, *outfd;
+    unsigned char *buffer, *out_buffer, enc_data[40], hash_key[20];
+    char *err_msg;
+    const char *fw_key;
+    uint32_t i, fw_offset, fw_size, data_ptr, data_size, ciff_size, cenc_size, iv[2];
+    
+    infd = fopen(infile, "rb");
+    if(infd == NULL)
+    {
+        fprintf(stderr, "[ERR]  Could not open %s\n", infile);
+        return -1;
+    }
+    
+    buffer = malloc(filesize(infd));
+    if(buffer == NULL)
+    {
+        fprintf(stderr, "[ERR]  Could not allocate %d unsigned chars\n", filesize(infd));
+        fclose(infd);
+        return -2;
+    }
+    
+    if(fread(buffer, filesize(infd), 1, infd) != 1)
+    {
+        fprintf(stderr, "[ERR]  Short read\n");
+        fclose(infd);
+        free(buffer);
+        return -3;
+    }
+    
+    fclose(infd);
+    
+    /* Rudimentary Win32 PE reading */
+    if(memcmp(&buffer[0], "MZ", 2) != 0 &&
+       memcmp(&buffer[0x118], "PE", 2) != 0)
+    {
+        fprintf(stderr, "[ERR]  Input file isn't an executable\n");
+        free(buffer);
+        return -4;
+    }
+    
+    data_ptr = 0, data_size = 0;
+    for(i=0x210; i < 0x1000; i+=0x28)
+    {
+        if(strcmp((char*)&buffer[i], ".data") == 0)
+        {
+            data_ptr = le2int(&buffer[i+0x14]);
+            data_size = le2int(&buffer[i+0x10]);
+            break;
+        }
+    }
+    
+    if(data_ptr == 0 || data_size == 0)
+    {
+        fprintf(stderr, "[ERR]  Couldn't find .data section\n");
+        free(buffer);
+        return -5;
+    }
+    
+    fprintf(stderr, "[INFO] .data section is at 0x%x with size 0x%x\n", data_ptr, data_size);
+    
+    fw_offset = find_firmware_offset(&buffer[data_ptr], data_size);
+    if(fw_offset == 0)
+    {
+        fprintf(stderr, "[ERR]  Couldn't find firmware offset\n");
+        free(buffer);
+        return -6;
+    }
+    fw_size = le2int(&buffer[data_ptr+fw_offset]);
+    fprintf(stderr, "[INFO] Firmware offset is at 0x%x with size 0x%x\n", data_ptr+fw_offset, fw_size);
+    
+    fw_key = find_firmware_key(&buffer[0], filesize(infd));
+    if(fw_key == NULL)
+    {
+        fprintf(stderr, "[ERR]  Couldn't find firmware key\n");
+        free(buffer);
+        return -7;
+    }
+    fprintf(stderr, "[INFO] Firmware key is %s\n", fw_key);
+    
+    fprintf(stderr, "[INFO] Descrambling firmware... ");
+    if(!crypt_firmware(fw_key, &buffer[data_ptr+fw_offset+4], fw_size))
+    {
+        fprintf(stderr, "Fail!\n");
+        free(buffer);
+        return -8;
+    }
+    else
+        fprintf(stderr, "Done!\n");
+    
+    out_buffer = malloc(fw_size*2);
+    if(out_buffer == NULL)
+    {
+        fprintf(stderr, "[ERR]  Couldn't allocate %d unsigned chars", fw_size*2);
+        free(buffer);
+        return -9;
+    }
+    
+    memset(out_buffer, 0, fw_size*2);
+    
+    err_msg = NULL;
+    fprintf(stderr, "[INFO] Decompressing firmware... ");
+    if(!inflate_to_buffer(&buffer[data_ptr+fw_offset+4], fw_size, out_buffer, fw_size*2, &err_msg))
+    {
+        fprintf(stderr, "Fail!\n[ERR]  ZLib error: %s\n", err_msg);
+        free(buffer);
+        free(out_buffer);
+        return -10;
+    }
+    else
+    {
+        fprintf(stderr, "Done!\n");
+        free(buffer);
+    }
+    
+    if(memcmp(out_buffer, "FFIC", 4) != 0)
+    {
+        fprintf(stderr, "[ERR]  CIFF header doesn't match\n");
+        free(out_buffer);
+        return -11;
+    }
+    
+    ciff_size = le2int(&out_buffer[4])+8+28; /* CIFF block + NULL block*/
+    
+    bootfd = fopen(bootfile, "rb");
+    if(bootfd == NULL)
+    {
+        fprintf(stderr, "[ERR]  Could not open %s\n", bootfile);
+        free(out_buffer);
+        return -12;
+    }
+    
+    out_buffer = realloc(out_buffer, ciff_size+filesize(bootfd));
+    if(out_buffer == NULL)
+    {
+        fprintf(stderr, "[ERR]  Cannot allocate %d unsigned chars\n", ciff_size+40+filesize(bootfd));
+        fclose(bootfd);
+        return -13;
+    }
+    
+    fprintf(stderr, "[INFO] Locating encoded block... ");
+    
+    i = 8;
+    while(memcmp(&out_buffer[i], " LT©", 4) != 0 && i < ciff_size)
+    {
+        if(memcmp(&out_buffer[i], "FNIC", 4) == 0)
+                i += 4+4+96;
+        else if(memcmp(&out_buffer[i], "ATAD", 4) == 0)
+        {
+            i += 4;
+            i += le2int(&out_buffer[i]);
+            i += 4;
+        }
+        else
+        {
+            fprintf(stderr, "Fail!\n[ERR]  Unknown block\n");
+            fclose(bootfd);
+            free(out_buffer);
+            return -14;
+        }
+    }
+    
+    if(i > ciff_size || memcmp(&out_buffer[i], " LT©", 4) != 0)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Couldn't find encoded block\n");
+        fclose(bootfd);
+        free(out_buffer);
+        return -15;
+    }
+    
+    fprintf(stderr, "Done!\n");
+    
+    outfd = fopen(outfile, "wb+");
+    if(outfd == NULL)
+    {
+        fprintf(stderr, "[ERR]  Could not open %s\n", outfile);
+        fclose(bootfd);
+        free(out_buffer);
+        return -16;
+    }
+    
+    if(fwrite(&out_buffer[0], i, 1, outfd) != 1)
+    {
+        fprintf(stderr, "[ERR]  Short write\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -17;
+    }
+    
+    fprintf(stderr, "[INFO] Decrypting encoded block... ");
+    
+    iv[0] = 0;
+    iv[1] = swap(le2int(&out_buffer[i+4]));
+    if(bf_cbc_decrypt((unsigned char*)tl_key, strlen(tl_key)+1, &out_buffer[i+8],
+                      le2int(&out_buffer[i+4]), (const unsigned char*)&iv)
+       == false)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Couldn't decrypt encoded block\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -18;
+    }
+    
+    fprintf(stderr, "Done!\n");
+    
+    cenc_size = le2int(&out_buffer[i+8]);
+    
+    if(cenc_size > le2int(&out_buffer[i+4])*3)
+    {
+        fprintf(stderr, "[ERR]  Decrypted length of encoded block is unexpectedly large: 0x%08x\n", cenc_size);
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -19;
+    }
+    
+    buffer = malloc(cenc_size);
+    if(buffer == NULL)
+    {
+        fprintf(stderr, "[ERR]  Couldn't allocate %d unsigned chars\n", cenc_size);
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -20;
+    }
+    
+    memset(buffer, 0, cenc_size);
+    
+    fprintf(stderr, "[INFO] Decompressing encoded block... ");
+    
+    if(!cenc_decode(&out_buffer[i+12], le2int(&out_buffer[i+4])-4, &buffer[0], cenc_size))
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Couldn't decompress the encoded block\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        free(buffer);
+        return -21;
+    }
+    
+    fprintf(stderr, "Done!\n");
+    
+    fprintf(stderr, "[INFO] Renaming encoded block to Hcreativeos.jrm... ");
+    
+    memcpy(&enc_data, "ATAD", 4);
+    int2le(cenc_size+32, &enc_data[4]);
+    memset(&enc_data[8], 0, 32);
+    memcpy(&enc_data[8], "H\0c\0r\0e\0a\0t\0i\0v\0e\0o\0s\0.\0j\0r\0m", 30);
+    if(fwrite(enc_data, 40, 1, outfd) != 1)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Short write\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        free(buffer);
+        return -22;
+    }
+    
+    if(fwrite(&buffer[0], cenc_size, 1, outfd) != 1)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Short write\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        free(buffer);
+        return -23;
+    }
+    
+    free(buffer);
+    fprintf(stderr, "Done!\n[INFO] Adding Hjukebox2.jrm... ");
+    
+    memcpy(&enc_data, "ATAD", 4);
+    int2le(filesize(bootfd)+32, &enc_data[4]);
+    memset(&enc_data[8], 0, 32);
+    memcpy(&enc_data[8], "H\0j\0u\0k\0e\0b\0o\0x\0""2\0.\0j\0r\0m", 26);
+    if(fwrite(enc_data, 40, 1, outfd) != 1)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Short write\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -24;
+    }
+    
+    if(fread(&out_buffer[ciff_size], filesize(bootfd), 1, bootfd) != 1)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Short read\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -25;
+    }
+    
+    if(memcmp(&out_buffer[ciff_size], "EDOC", 4) != 0)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Faulty bootloader\n");
+        free(out_buffer);
+        fclose(bootfd);
+        fclose(outfd);
+        return -26;
+    }
+    
+    if(fwrite(&out_buffer[ciff_size], filesize(bootfd), 1, outfd) != 1)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Short write\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -27;
+    }
+    
+    fclose(bootfd);
+    fprintf(stderr, "Done!\n");
+    
+    if(fwrite(&out_buffer[i+8+le2int(&out_buffer[i+4])], ciff_size-i-8-le2int(&out_buffer[i+4]), 1, outfd) != 1)
+    {
+        fprintf(stderr, "[ERR]  Short write\n");
+        fclose(bootfd);
+        fclose(outfd);
+        free(out_buffer);
+        return -28;
+    }
+    
+    fseek(outfd, 4, SEEK_SET);
+    int2le(filesize(outfd)-8-28, enc_data);
+    if(fwrite(enc_data, 4, 1, outfd) != 1)
+    {
+        fprintf(stderr, "[ERR]  Short write\n");
+        fclose(outfd);
+        free(out_buffer);
+        return -29;
+    }
+    
+    free(out_buffer);
+    fflush(outfd);
+    
+    fprintf(stderr, "[INFO] Updating checksum... ");
+    
+    buffer = malloc(filesize(outfd)-28);
+    if(buffer == NULL)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Couldn't allocate %d unsigned chars\n", filesize(outfd)-28);
+        fclose(outfd);
+        return -30;
+    }
+    
+    fseek(outfd, 0, SEEK_SET);
+    if(fread(buffer, filesize(outfd)-28, 1, outfd) != 1)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Short read\n");
+        fclose(outfd);
+        free(buffer);
+        return -31;
+    }
+    
+    hmac_sha1((unsigned char*)null_key, strlen(null_key), &buffer[0], filesize(outfd)-28, &hash_key);
+    
+    fseek(outfd, filesize(outfd)-20, SEEK_SET);
+    if(fwrite(hash_key, 20, 1, outfd) != 1)
+    {
+        fprintf(stderr, "Fail!\n[ERR]  Short write\n");
+        fclose(outfd);
+        free(buffer);
+        return -32;
+    }
+    
+    fclose(outfd);
+    
+    fprintf(stderr, "Done!\n");
+    return 0;
+}
+
+#ifdef STANDALONE
+static void usage(void)
+{
+    printf("Usage: mkzenboot <firmware file> <boot file> <output file>\n");
+    exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+    char *infile, *bootfile, *outfile;
+
+    if(argc < 3)
+    {
+        usage();
+    }
+
+    infile = argv[1];
+    bootfile = argv[2];
+    outfile = argv[3];
+    
+    return mkboot(infile, bootfile, outfile);
+}
+#endif