From 1530afe4adb9367358cb3d4363ac3b11bf67a2f8 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Sat, 13 Jan 2018 15:28:35 +0100
Subject: [PATCH] vendor: update trezor-crypto, adapt codebase to changes

---
 SConscript.boardloader              |  2 --
 SConscript.bootloader               |  2 --
 SConscript.firmware                 |  4 ++--
 SConscript.unix                     |  4 +---
 embed/extmod/modtrezorcrypto/rand.c | 18 ------------------
 embed/extmod/modtrezorcrypto/rand.h | 18 ------------------
 vendor/trezor-crypto                |  2 +-
 7 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 embed/extmod/modtrezorcrypto/rand.h

diff --git a/SConscript.boardloader b/SConscript.boardloader
index 25e875d84..1f18ff74f 100644
--- a/SConscript.boardloader
+++ b/SConscript.boardloader
@@ -11,8 +11,6 @@ SOURCE_MOD = []
 CCFLAGS_MOD += '-Wno-sequence-point '
 CPPPATH_MOD += [
     'vendor/trezor-crypto',
-    'vendor/trezor-crypto/aes',
-    'vendor/trezor-crypto/ed25519-donna',
 ]
 CPPDEFINES_MOD += [
     'AES_128',
diff --git a/SConscript.bootloader b/SConscript.bootloader
index 76605e1b7..9b26be583 100644
--- a/SConscript.bootloader
+++ b/SConscript.bootloader
@@ -11,8 +11,6 @@ SOURCE_MOD = []
 CCFLAGS_MOD += '-Wno-sequence-point '
 CPPPATH_MOD += [
     'vendor/trezor-crypto',
-    'vendor/trezor-crypto/aes',
-    'vendor/trezor-crypto/ed25519-donna',
 ]
 CPPDEFINES_MOD += [
     'AES_128',
diff --git a/SConscript.firmware b/SConscript.firmware
index 08085cdb7..ea5bf07c9 100644
--- a/SConscript.firmware
+++ b/SConscript.firmware
@@ -18,12 +18,11 @@ SOURCE_MOD += [
 CCFLAGS_MOD += '-Wno-sequence-point '
 CPPPATH_MOD += [
     'vendor/trezor-crypto',
-    'vendor/trezor-crypto/aes',
-    'vendor/trezor-crypto/ed25519-donna',
 ]
 CPPDEFINES_MOD += [
     'AES_128',
     'AES_192',
+    'RAND_PLATFORM_INDEPENDENT',
     ('USE_KECCAK', '1'),
     ('USE_ETHEREUM', '1'),
 ]
@@ -63,6 +62,7 @@ SOURCE_MOD += [
     'vendor/trezor-crypto/hmac.c',
     'vendor/trezor-crypto/nist256p1.c',
     'vendor/trezor-crypto/pbkdf2.c',
+    'vendor/trezor-crypto/rand.c',
     'vendor/trezor-crypto/ripemd160.c',
     'vendor/trezor-crypto/secp256k1.c',
     'vendor/trezor-crypto/sha2.c',
diff --git a/SConscript.unix b/SConscript.unix
index 6b32db980..735daf975 100644
--- a/SConscript.unix
+++ b/SConscript.unix
@@ -19,8 +19,6 @@ SOURCE_MOD += [
 CCFLAGS_MOD += '-Wno-sequence-point '
 CPPPATH_MOD += [
     'vendor/trezor-crypto',
-    'vendor/trezor-crypto/aes',
-    'vendor/trezor-crypto/ed25519-donna',
 ]
 CPPDEFINES_MOD += [
     'AES_128',
@@ -31,7 +29,6 @@ CPPDEFINES_MOD += [
 SOURCE_MOD += [
     'embed/extmod/modtrezorcrypto/modtrezorcrypto.c',
     'embed/extmod/modtrezorcrypto/crc.c',
-    'embed/extmod/modtrezorcrypto/rand.c',
     'vendor/trezor-crypto/address.c',
     'vendor/trezor-crypto/aes/aescrypt.c',
     'vendor/trezor-crypto/aes/aeskey.c',
@@ -64,6 +61,7 @@ SOURCE_MOD += [
     'vendor/trezor-crypto/hmac.c',
     'vendor/trezor-crypto/nist256p1.c',
     'vendor/trezor-crypto/pbkdf2.c',
+    'vendor/trezor-crypto/rand.c',
     'vendor/trezor-crypto/ripemd160.c',
     'vendor/trezor-crypto/secp256k1.c',
     'vendor/trezor-crypto/sha2.c',
diff --git a/embed/extmod/modtrezorcrypto/rand.c b/embed/extmod/modtrezorcrypto/rand.c
index f4a5a9ab5..dd9f92706 100644
--- a/embed/extmod/modtrezorcrypto/rand.c
+++ b/embed/extmod/modtrezorcrypto/rand.c
@@ -12,21 +12,3 @@ uint32_t random32(void)
 {
 	return rng_get();
 }
-
-uint32_t random_uniform(uint32_t n)
-{
-	uint32_t x, max = 0xFFFFFFFF - (0xFFFFFFFF % n);
-	while ((x = random32()) >= max);
-	return x / (max / n);
-}
-
-void random_buffer(uint8_t *buf, size_t len)
-{
-	uint32_t r = 0;
-	for (size_t i = 0; i < len; i++) {
-		if (i % 4 == 0) {
-			r = random32();
-		}
-		buf[i] = (r >> ((i % 4) * 8)) & 0xFF;
-	}
-}
diff --git a/embed/extmod/modtrezorcrypto/rand.h b/embed/extmod/modtrezorcrypto/rand.h
deleted file mode 100644
index 913e15852..000000000
--- a/embed/extmod/modtrezorcrypto/rand.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Pavol Rusnak, SatoshiLabs
- *
- * Licensed under TREZOR License
- * see LICENSE file for details
- */
-
-#ifndef __RAND_H__
-#define __RAND_H__
-
-#include <stdint.h>
-#include <stdlib.h>
-
-uint32_t random32(void);
-uint32_t random_uniform(uint32_t n);
-void random_buffer(uint8_t *buf, size_t len);
-
-#endif
diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto
index 8d8bc9c76..0d8a3beea 160000
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@@ -1 +1 @@
-Subproject commit 8d8bc9c762b504ee8c66f94d93600d417d92841e
+Subproject commit 0d8a3beeaf22af837f558a5b5e9ae98cdd47a767