DONTMERGE: attempt to get debug_scan_qr working

It turns out whatever miniz is producing, its not compatible with
compress/uncompress from zlib with the flags we are using. It seems we
don't include any header bytes in the compressed data and so we'd probably
need to prepend a fake header to get this to work.

This commit doesn't enable the debug_scan_qr tests so shouldn't fail the
build.

Author: jgriffiths

libjade/include/miniz.h

@@ -0,0 +1,44 @@
+#ifndef _SW_JADE_MINIZ_H_
+#define _SW_JADE_MINIZ_H_ 1
+#include <zlib.h>
+
+#define TDEFL_DEFAULT_MAX_PROBES 0
+#define TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF 0
+#define TDEFL_FINISH 0
+
+typedef struct tdefl_compressor
+{
+    int unused;
+} tdefl_compressor;
+
+typedef struct tdefl_compressor tinfl_decompressor;
+
+typedef int tdefl_status;
+typedef int tinfl_status;
+
+#define TDEFL_STATUS_OKAY Z_OK
+#define TDEFL_STATUS_DONE Z_OK
+#define TINFL_STATUS_DONE Z_OK
+
+static inline tdefl_status tdefl_init(void* ctx, void* unused, void* unused2, int flags)
+{
+    return TDEFL_STATUS_OKAY;
+}
+
+static inline tdefl_status tdefl_compress(tdefl_compressor* ctx, const uint8_t* data, size_t *data_len, uint8_t* output, size_t *output_len, int flags)
+{
+    // Defer to zlib
+    return compress2(output, output_len, data, *data_len, Z_BEST_COMPRESSION);
+}
+
+static inline tinfl_status tinfl_init(tinfl_decompressor* ctx)
+{
+    return TDEFL_STATUS_OKAY;
+}
+
+static inline tinfl_status tinfl_decompress(tinfl_decompressor* ctx, const uint8_t* data, size_t *data_len, uint8_t* output, uint8_t* output_nex, size_t *output_len, int flags)
+{
+    return uncompress2(output, output_len, data, data_len);
+}
+
+#endif // _SW_JADE_MINIZ_H_

libjade/libjade.c

@@ -151,7 +151,6 @@ static void unsupported_process(void* process, char* name)
 }
 #define UNSUPPORTED(n) void n##_process(void* p) { unsupported_process(p, #n); }
 
-UNSUPPORTED(debug_scan_qr)
 UNSUPPORTED(get_bip85_bip39_entropy)
 UNSUPPORTED(get_bip85_rsa_entropy)
 int get_bip85_bip39_entropy_cbor(const CborValue* params, CborEncoder* output, const char** errmsg)

main/amalgamated.c

@@ -86,9 +86,7 @@ void __wrap_abort(void);
 #include "./process/dashboard.c"
 #include "./process/debug_clean.c"
 #include "./process/debug_handshake.c"
-#ifndef CONFIG_LIBJADE
 #include "./process/debug_scan_qr.c"
-#endif // CONFIG_LIBJADE
 #include "./process/debug_set_mnemonic.c"
 #ifndef CONFIG_LIBJADE
 #include "./process/get_bip85_entropy.c"

make_libjade.sh

@@ -71,6 +71,6 @@ ${SW_JADE_CC} -c ${SW_JADE_CFLAGS} \
 # libjade.so
 ${SW_JADE_CXX} -shared -pthread -Wl,--no-undefined \
     -fPIC -DPIC -fvisibility=hidden \
-    libjade/libjade.o libjade/bc_ur.o ${SW_JADE_LDFLAGS} -lm -o libjade.so
+    libjade/libjade.o libjade/bc_ur.o ${SW_JADE_LDFLAGS} -lm -lz -o libjade.so
 
 rm -f libjade/libjade.o libjade/bc_ur.o