Merge pull request #3536

c77d2bfa Add the possibility to export private view key for fast scan. (cslashm)
100b7bc1 Change mutex lock model to avoid dead lock and ensure locks are always released. (cslashm)
641dfc99 Automatic height setup when creating/restoring hw device. (cslashm)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/device/log.cpp b/src/device/log.cpp
index a2ad0f4f4..cbbcfc953 100644
--- a/src/device/log.cpp
+++ b/src/device/log.cpp
@@ -56,8 +56,8 @@ namespace hw {
     }
 
     #ifdef DEBUG_HWDEVICE
-    extern crypto::secret_key viewkey;
-    extern crypto::secret_key spendkey;
+    extern crypto::secret_key dbg_viewkey;
+    extern crypto::secret_key dbg_spendkey;
 
 
     void decrypt(char* buf, size_t len) {
@@ -69,7 +69,7 @@ namespace hw {
           if (buf[i] != 0) break;
         }
         if (i == 32) {
-          memmove(buf, hw::ledger::viewkey.data, 32);
+          memmove(buf, hw::ledger::dbg_viewkey.data, 32);
           return;
         }
         //spend key?
@@ -77,7 +77,7 @@ namespace hw {
           if (buf[i] != (char)0xff) break;
         }
         if (i == 32) {
-          memmove(buf, hw::ledger::spendkey.data, 32);
+          memmove(buf, hw::ledger::dbg_spendkey.data, 32);
           return;
         }
       }
@@ -161,4 +161,4 @@ namespace hw {
   }
   #endif //WITH_DEVICE_LEDGER    
 
-}
\ No newline at end of file
+}