Merge pull request #4091

a4272de wallet2: unlock keys file before calling verify_password (needed for Windows) (stoffu)
2018-07-27 14:22:34 -05:00
parent b293c487fb a4272de797
commit 92b5d6c204
5 changed files with 71 additions and 10 deletions
@@ -609,7 +609,7 @@ namespace tools
    /*!
     * \brief verifies given password is correct for default wallet keys file
     */
-    bool verify_password(const epee::wipeable_string& password) const;
+    bool verify_password(const epee::wipeable_string& password);
    cryptonote::account_base& get_account(){return m_account;}
    const cryptonote::account_base& get_account()const{return m_account;}

@@ -1146,6 +1146,9 @@ namespace tools
    bool unblackball_output(const crypto::public_key &output);
    bool is_output_blackballed(const crypto::public_key &output) const;

+    bool lock_keys_file();
+    bool unlock_keys_file();
+    bool is_keys_file_locked() const;
  private:
    /*!
     * \brief  Stores wallet information to wallet file.