remove trezor-crypto, use mbedtls, use lowercase for trezor modules

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "vendor/trezor-qrenc"]
 	path = vendor/trezor-qrenc
 	url = https://github.com/trezor/trezor-qrenc.git
-[submodule "vendor/trezor-crypto"]
-	path = vendor/trezor-crypto
-	url = https://github.com/trezor/trezor-crypto.git
 [submodule "vendor/mbedtls"]
 	path = vendor/mbedtls
 	url = https://github.com/trezor/mbedtls.git

extmod/modTrezorCrypto/trezor-crypto

@@ -1 +0,0 @@
-../../vendor/trezor-crypto

extmod/modtrezorcrypto/base58.c

@@ -0,0 +1,161 @@
+/**
+ * Copyright (c) 2012-2014 Luke Dashjr
+ * Copyright (c) 2013-2014 Pavol Rusnak
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * 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 OR COPYRIGHT HOLDERS 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.
+ */
+
+#include <string.h>
+#include <sys/types.h>
+#include "base58.h"
+
+static const int8_t b58digits_map[] = {
+	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+	-1, 0, 1, 2, 3, 4, 5, 6, 7, 8,-1,-1,-1,-1,-1,-1,
+	-1, 9,10,11,12,13,14,15,16,-1,17,18,19,20,21,-1,
+	22,23,24,25,26,27,28,29,30,31,32,-1,-1,-1,-1,-1,
+	-1,33,34,35,36,37,38,39,40,41,42,43,-1,44,45,46,
+	47,48,49,50,51,52,53,54,55,56,57,-1,-1,-1,-1,-1,
+};
+
+bool b58tobin(void *bin, size_t *binszp, const char *b58)
+{
+	size_t binsz = *binszp;
+	const unsigned char *b58u = (void*)b58;
+	unsigned char *binu = bin;
+	size_t outisz = (binsz + 3) / 4;
+	uint32_t outi[outisz];
+	uint64_t t;
+	uint32_t c;
+	size_t i, j;
+	uint8_t bytesleft = binsz % 4;
+	uint32_t zeromask = bytesleft ? (0xffffffff << (bytesleft * 8)) : 0;
+	unsigned zerocount = 0;
+	size_t b58sz;
+
+	b58sz = strlen(b58);
+
+	memset(outi, 0, outisz * sizeof(*outi));
+
+	// Leading zeros, just count
+	for (i = 0; i < b58sz && !b58digits_map[b58u[i]]; ++i)
+		++zerocount;
+
+	for ( ; i < b58sz; ++i)
+	{
+		if (b58u[i] & 0x80)
+			// High-bit set on invalid digit
+			return false;
+		if (b58digits_map[b58u[i]] == -1)
+			// Invalid base58 digit
+			return false;
+		c = (unsigned)b58digits_map[b58u[i]];
+		for (j = outisz; j--; )
+		{
+			t = ((uint64_t)outi[j]) * 58 + c;
+			c = (t & 0x3f00000000) >> 32;
+			outi[j] = t & 0xffffffff;
+		}
+		if (c)
+			// Output number too big (carry to the next int32)
+			return false;
+		if (outi[0] & zeromask)
+			// Output number too big (last int32 filled too far)
+			return false;
+	}
+
+	j = 0;
+	switch (bytesleft) {
+		case 3:
+			*(binu++) = (outi[0] &   0xff0000) >> 16;
+		case 2:
+			*(binu++) = (outi[0] &     0xff00) >>  8;
+		case 1:
+			*(binu++) = (outi[0] &       0xff);
+			++j;
+		default:
+			break;
+	}
+
+	for (; j < outisz; ++j)
+	{
+		*(binu++) = (outi[j] >> 0x18) & 0xff;
+		*(binu++) = (outi[j] >> 0x10) & 0xff;
+		*(binu++) = (outi[j] >>    8) & 0xff;
+		*(binu++) = (outi[j] >>    0) & 0xff;
+	}
+
+	// Count canonical base58 byte count
+	binu = bin;
+	for (i = 0; i < binsz; ++i)
+	{
+		if (binu[i])
+			break;
+		--*binszp;
+	}
+	*binszp += zerocount;
+
+	return true;
+}
+
+static const char b58digits_ordered[] = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+
+bool b58enc(char *b58, size_t *b58sz, const void *data, size_t binsz)
+{
+	const uint8_t *bin = data;
+	int carry;
+	ssize_t i, j, high, zcount = 0;
+	size_t size;
+
+	while (zcount < (ssize_t)binsz && !bin[zcount])
+		++zcount;
+
+	size = (binsz - zcount) * 138 / 100 + 1;
+	uint8_t buf[size];
+	memset(buf, 0, size);
+
+	for (i = zcount, high = size - 1; i < (ssize_t)binsz; ++i, high = j)
+	{
+		for (carry = bin[i], j = size - 1; (j > high) || carry; --j)
+		{
+			carry += 256 * buf[j];
+			buf[j] = carry % 58;
+			carry /= 58;
+		}
+	}
+
+	for (j = 0; j < (ssize_t)size && !buf[j]; ++j);
+
+	if (*b58sz <= zcount + size - j)
+	{
+		*b58sz = zcount + size - j + 1;
+		return false;
+	}
+
+	if (zcount)
+		memset(b58, '1', zcount);
+	for (i = zcount; j < (ssize_t)size; ++i, ++j)
+		b58[i] = b58digits_ordered[buf[j]];
+	b58[i] = '\0';
+	*b58sz = i + 1;
+
+	return true;
+}

extmod/modtrezorcrypto/base58.h

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2013-2014 Tomas Dzetkulic
+ * Copyright (c) 2013-2014 Pavol Rusnak
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * 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 OR COPYRIGHT HOLDERS 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.
+ */
+
+#ifndef __BASE58_H__
+#define __BASE58_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+
+bool b58tobin(void *bin, size_t *binszp, const char *b58);
+bool b58enc(char *b58, size_t *b58sz, const void *data, size_t binsz);
+
+#endif

extmod/modtrezorcrypto/modtrezorcrypto-base58.h

@@ -5,7 +5,7 @@
  * see LICENSE.md file for details
  */
 
-#include "trezor-crypto/base58.h"
+#include "base58.h"
 
 // class Base58(object):
 typedef struct _mp_obj_Base58_t {

extmod/modtrezorcrypto/modtrezorcrypto.c

@@ -15,10 +15,10 @@
 
 #if MICROPY_PY_TREZORCRYPTO
 
-#include "modTrezorCrypto-base58.h"
+#include "modtrezorcrypto-base58.h"
-#include "modTrezorCrypto-ripemd160.h"
+#include "modtrezorcrypto-ripemd160.h"
-#include "modTrezorCrypto-sha256.h"
+#include "modtrezorcrypto-sha256.h"
-#include "modTrezorCrypto-sha512.h"
+#include "modtrezorcrypto-sha512.h"
 
 // module stuff
 

extmod/modtrezorui/modtrezorui-display.h

@@ -5,10 +5,10 @@
  * see LICENSE.md file for details
  */
 
-#include "modTrezorUi-inflate.h"
+#include "modtrezorui-inflate.h"
-#include "modTrezorUi-font_RobotoMono_Regular.h"
+#include "modtrezorui-font_robotomono_regular.h"
-#include "modTrezorUi-font_Roboto_Regular.h"
+#include "modtrezorui-font_roboto_regular.h"
-#include "modTrezorUi-font_Roboto_Bold.h"
+#include "modtrezorui-font_roboto_bold.h"
 
 #include "trezor-qrenc/qr_encode.h"
 

extmod/modtrezorui/modtrezorui.c

@@ -19,16 +19,16 @@
 #define RESY 240
 
 #if defined STM32_HAL_H
-#include "modTrezorUi-stmhal.h"
+#include "modtrezorui-stmhal.h"
 #elif defined UNIX
-#include "modTrezorUi-unix.h"
+#include "modtrezorui-unix.h"
 #else
 #error Unsupported port. Only STMHAL and UNIX ports are supported.
 #endif
 
-#include "modTrezorUi-display.h"
+#include "modtrezorui-display.h"
 
-#include "modTrezorUi-touch.h"
+#include "modtrezorui-touch.h"
 
 // module stuff
 

tools/ttf2c

@@ -7,7 +7,7 @@ MAX_GLYPH = ord('~')
 def process_face(name, style, size):
     face = freetype.Face('/usr/share/fonts/truetype/%s-%s.ttf' % (name, style))
     face.set_pixel_sizes(0, size)
-    with open('%s-%s-%s.c' % (name, style, size), 'wt') as f:
+    with open('%s-%s-%s.c' % (name.lower(), style.lower(), size), 'wt') as f:
         f.write('// first two bytes are width and height of the glyph\n')
         f.write('// third, fourth and fifth bytes are advance, bearingX and bearingY of the horizontal metrics of the glyph\n')
         f.write('// rest is packed 4-bit glyph data\n\n')

vendor/micropython

@@ -1 +1 @@
-Subproject commit fe1e443bd439be3e0c7942f0ed3f7cbfd3efd5dc
+Subproject commit c83524cb4a55d862f348c63d28341485c6920398

vendor/trezor-crypto

@@ -1 +0,0 @@
-Subproject commit f4dd151eb9ef989b88dc79218a2b0115934e4268