summaryrefslogtreecommitdiff
path: root/patches/monero/0009-polyseed.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/monero/0009-polyseed.patch')
-rw-r--r--patches/monero/0009-polyseed.patch23
1 files changed, 20 insertions, 3 deletions
diff --git a/patches/monero/0009-polyseed.patch b/patches/monero/0009-polyseed.patch
index 4044aea..de546f7 100644
--- a/patches/monero/0009-polyseed.patch
+++ b/patches/monero/0009-polyseed.patch
@@ -1,4 +1,4 @@
-From e28bd4b5afd73a07d086422a9bc264047e245a7b Mon Sep 17 00:00:00 2001
+From 3514a626e1ee02dfa6cbcfb60efe506f60a682fb Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Tue, 12 Mar 2024 09:42:37 +0100
Subject: [PATCH 09/12] polyseed
@@ -15,6 +15,8 @@ Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
contrib/epee/include/wipeable_string.h | 7 +
contrib/epee/src/wipeable_string.cpp | 10 +
external/CMakeLists.txt | 2 +
+ external/polyseed | 1 +
+ external/utf8proc | 1 +
src/CMakeLists.txt | 1 +
src/cryptonote_basic/CMakeLists.txt | 1 +
src/cryptonote_basic/account.cpp | 23 ++-
@@ -32,9 +34,10 @@ Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
src/wallet/api/wallet_manager.h | 10 +
src/wallet/wallet2.cpp | 100 ++++++++--
src/wallet/wallet2.h | 30 ++-
- 27 files changed, 855 insertions(+), 24 deletions(-)
+ 28 files changed, 856 insertions(+), 24 deletions(-)
create mode 100644 contrib/depends/packages/polyseed.mk
create mode 100644 contrib/depends/patches/polyseed/force-static-mingw.patch
+ create mode 160000 external/polyseed
create mode 100644 src/polyseed/CMakeLists.txt
create mode 100644 src/polyseed/pbkdf2.c
create mode 100644 src/polyseed/pbkdf2.h
@@ -241,6 +244,20 @@ index f9ed6a69a..8fcf792d7 100644
+add_subdirectory(utf8proc EXCLUDE_FROM_ALL)
add_subdirectory(bc-ur)
add_subdirectory(randomx EXCLUDE_FROM_ALL)
+diff --git a/external/polyseed b/external/polyseed
+new file mode 160000
+index 000000000..dfb05d8ed
+--- /dev/null
++++ b/external/polyseed
+@@ -0,0 +1 @@
++Subproject commit dfb05d8edb682b0e8f743b1b70c9131712ff4157
+diff --git a/external/utf8proc b/external/utf8proc
+new file mode 160000
+index 000000000..dfb05d8ed
+--- /dev/null
++++ b/external/utf8proc
+@@ -0,0 +1 @@
++Subproject commit 3de4596fbe28956855df2ecb3c11c0bbc3535838
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3335d3c21..06b708cf0 100644
--- a/src/CMakeLists.txt
@@ -1376,5 +1393,5 @@ index 1d7e430b9..91cf2a376 100644
uint32_t m_multisig_threshold;
std::vector<crypto::public_key> m_multisig_signers;
--
-2.39.5 (Apple Git-154)
+2.43.0