From b6c462ab57368d81de64ad55929eb3383823b693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Wed, 6 Dec 2023 09:51:56 +0100 Subject: [PATCH 1/3] adjusting to newest branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- lib/default/rddl-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default/rddl-sdk b/lib/default/rddl-sdk index da5b9800de82..405f636d6898 160000 --- a/lib/default/rddl-sdk +++ b/lib/default/rddl-sdk @@ -1 +1 @@ -Subproject commit da5b9800de82832ff84fa84ed8f06cf8ccc4babb +Subproject commit 405f636d6898d46fbe0bc193d256611cf06d9f6d From cf1525a6d50628c5ae7da0e3364798e2a166fc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Wed, 6 Dec 2023 10:04:00 +0100 Subject: [PATCH 2/3] fixed previous merging and updating issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- lib/default/rddl/src/planetmintgo.h | 2 +- lib/default/rddl/src/rddl.c | 4 ++-- lib/default/rddl/src/rddl_cid.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/default/rddl/src/planetmintgo.h b/lib/default/rddl/src/planetmintgo.h index be4bb1a972e6..8793548a559c 100644 --- a/lib/default/rddl/src/planetmintgo.h +++ b/lib/default/rddl/src/planetmintgo.h @@ -37,7 +37,7 @@ int prepareTx( Google__Protobuf__Any* anyMsg, bool removeIPAddr( char* gps_data ); -#define MY_STACK_LIMIT 5120 +#define MY_STACK_LIMIT 7168 uint8_t* getStack( size_t size ); void clearStack(); diff --git a/lib/default/rddl/src/rddl.c b/lib/default/rddl/src/rddl.c index 782e8b216251..0b57330d896a 100644 --- a/lib/default/rddl/src/rddl.c +++ b/lib/default/rddl/src/rddl.c @@ -87,7 +87,7 @@ const char* setSeed( char* pMnemonic, size_t len ) if( !mnemonic_check( pMnemonic ) ) return ""; - mnemonic_to_seed(pMnemonic, "TREZOR", secret_seed, 0); + mnemonic_to_seed(pMnemonic, "", secret_seed, 0); return (const char*)pMnemonic; } @@ -105,7 +105,7 @@ bool getSeedFromMnemonic( const char* pMnemonic, size_t len, uint8_t* seedbuffer if( !mnemonic_check( pMnemonic ) ) return false; - mnemonic_to_seed(pMnemonic, "TREZOR", seedbuffer, NULL); + mnemonic_to_seed(pMnemonic, "", seedbuffer, NULL); return true; } diff --git a/lib/default/rddl/src/rddl_cid.c b/lib/default/rddl/src/rddl_cid.c index 67243586a4e2..fd1486f01347 100644 --- a/lib/default/rddl/src/rddl_cid.c +++ b/lib/default/rddl/src/rddl_cid.c @@ -26,7 +26,7 @@ char* create_cid_v1_from_string(const char* data) { size_t input_length = SHA256_DIGEST_LENGTH + 4; // calculate the length of the actual content to be encoded size_t buffer_size = (input_length + 4) / 5 * 8 + 1; // calculate the buffer size for the base32-encoded string - char* base32_cid = (char*)malloc(buffer_size + 2); // Allocate 2 extra bytes: one for the 'b' prefix and one for the null terminator + char* base32_cid = (char*)getStack(buffer_size + 2); // Allocate 2 extra bytes: one for the 'b' prefix and one for the null terminator base32_cid[0] = 'b'; // Add 'b' prefix base32_encode(pre_encoded_cid, input_length, base32_cid + 1, buffer_size, BASE32_ALPHABET_RFC4648); string_to_lowercase(base32_cid); From 53e4dabf5137336976e6f0763f98bdbadaae36d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Wed, 6 Dec 2023 13:27:03 +0100 Subject: [PATCH 3/3] added new version of rddl-sdk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- lib/default/rddl-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default/rddl-sdk b/lib/default/rddl-sdk index 405f636d6898..93559eb44832 160000 --- a/lib/default/rddl-sdk +++ b/lib/default/rddl-sdk @@ -1 +1 @@ -Subproject commit 405f636d6898d46fbe0bc193d256611cf06d9f6d +Subproject commit 93559eb448323891a7cf3065c5c9eaaff14616ba