diff --git a/serialno.c b/serialno.c
index b8c674163..e16f31afa 100644
--- a/serialno.c
+++ b/serialno.c
@@ -28,9 +28,9 @@
 
 void fill_serialno_fixed(char *s)
 {
-	uint8_t uuid[32];
-	desig_get_unique_id((uint32_t *)uuid);
-	sha256_Raw(uuid, 12, uuid);
-	sha256_Raw(uuid, 32, uuid);
+	uint32_t uuid[8];
+	desig_get_unique_id(uuid);
+	sha256_Raw((const uint8_t *)uuid, 12, (uint8_t *)uuid);
+	sha256_Raw((const uint8_t *)uuid, 32, (uint8_t *)uuid);
 	data2hex(uuid, 12, s);
 }
diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto
index 7ce6b8b14..62b8f845f 160000
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@@ -1 +1 @@
-Subproject commit 7ce6b8b14761ab770ff896f7d9c7a76d434e3df2
+Subproject commit 62b8f845f28539df7b305664ae56ba57a8cbc44c