fix

ghostway0 · May 3, 2024 · 772bf14 · 772bf14
1 parent 6b637a0
commit 772bf14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/seraphis_wallet/jamtis_keys.h b/src/seraphis_wallet/jamtis_keys.h
@@ -57,9 +57,6 @@ namespace sp
 namespace jamtis
 {
 
-////
-// A set of jamtis keys for mock-ups/unit testing
-///
 struct JamtisKeys
 {
     crypto::secret_key k_m;           //master

diff --git a/src/seraphis_wallet/key_container.cpp b/src/seraphis_wallet/key_container.cpp
@@ -178,8 +178,11 @@ void KeyContainer::recover_jamtis_keys(const ser_JamtisKeys &ser_keys, sp::jamti
     keys_out.D_fa    = ser_keys.D_fa;
 }
 //-------------------------------------------------------------------------------------------------------------------
+bool KeyContainer::compare_keys(KeyContainer &other, const crypto::chacha_key &chacha_key)
+{
+    // 1. decrypt keys if they are encrypted in memory
+    other.decrypt(chacha_key);
 
-<<<<<<< HEAD
     // 2. decrypt if encrypted in memory
     decrypt(chacha_key);
 
@@ -195,8 +198,6 @@ void KeyContainer::recover_jamtis_keys(const ser_JamtisKeys &ser_keys, sp::jamti
     return r;
 }
 //-------------------------------------------------------------------------------------------------------------------
-=======
->>>>>>> 7cca5f918 (jamtis v2)
 // KeyGuard
 //-------------------------------------------------------------------------------------------------------------------
 KeyGuard::KeyGuard(const KeyGuard &other) :