change secure pass module interface

Author: roman-modelist-dev

keychain_cmd_app/secure_module_dummy.cpp

@@ -12,9 +12,9 @@ sec_mod_dummy::sec_mod_dummy()
 sec_mod_dummy::~sec_mod_dummy()
 {}
 
-std::string sec_mod_dummy::get_passwd_trx(const graphene::chain::transaction& trx) const
+std::wstring sec_mod_dummy::get_passwd_trx(const graphene::chain::transaction& trx) const
 {
-  return std::string("blank_password");
+  return std::wstring(L"blank_password");
 }
 
 std::string sec_mod_dummy::get_uid() const
@@ -27,12 +27,12 @@ void sec_mod_dummy::print_mnemonic(const string_list& mnemonic) const
 
 }
 
-std::string sec_mod_dummy::get_passwd_trx_raw(const std::string& raw_trx) const
+std::wstring sec_mod_dummy::get_passwd_trx_raw(const std::string& raw_trx) const
 {
-  return std::string("blank_password");
+  return std::wstring(L"blank_password");
 }
 
-std::string sec_mod_dummy::get_passwd(const std::string& str) const
+std::wstring sec_mod_dummy::get_passwd(const std::string& str) const
 {
-  return std::string("blank_password");
+  return std::wstring(L"blank_password");
 }

keychain_cmd_app/secure_module_dummy.hpp

@@ -15,9 +15,9 @@ class sec_mod_dummy: public secure_dlg_mod_base
 public:
   sec_mod_dummy();
   virtual ~sec_mod_dummy();
-  virtual std::string get_passwd_trx_raw(const std::string& raw_trx) const override;
-  virtual std::string get_passwd_trx(const graphene::chain::transaction& trx) const override;
-  virtual std::string get_passwd(const std::string& str) const override;
+  virtual std::wstring get_passwd_trx_raw(const std::string& raw_trx) const override;
+  virtual std::wstring get_passwd_trx(const graphene::chain::transaction& trx) const override;
+  virtual std::wstring get_passwd(const std::string& str) const override;
   virtual void print_mnemonic(const string_list& mnemonic) const override;
   virtual std::string get_uid() const override;
 

keychain_lib/include/keychain_lib/key_encryptor.hpp

@@ -22,10 +22,10 @@ class encryptor_singletone
 
   keyfile_format::encrypted_data encrypt_keydata(
     keyfile_format::cipher_etype etype,
-    const std::string& key,
+    const std::wstring& key,
     const std::string& keydata);
 
-  std::string decrypt_keydata(const std::string& key, keyfile_format::encrypted_data& enc_data);
+  std::string decrypt_keydata(const std::wstring& key, keyfile_format::encrypted_data& enc_data);
 
 private:
   EVP_CIPHER_CTX* m_ctx;

keychain_lib/include/keychain_lib/keychain_commands.hpp

@@ -43,13 +43,13 @@ struct keychain_error: std::runtime_error
 class keychain_base
 {
 public:
-    using string_list = std::list<std::string>;
+    using string_list = std::list<std::wstring>;
     keychain_base(std::string&& uid_hash_);
     virtual ~keychain_base();
     virtual void operator()(const fc::variant& command) = 0;
-    boost::signals2::signal<std::string(const std::string&)> get_passwd_trx_raw;
-    boost::signals2::signal<std::string(const graphene::chain::transaction&)> get_passwd_trx;
-    boost::signals2::signal<std::string(const std::string&)> get_passwd;
+    boost::signals2::signal<std::wstring(const std::string&)> get_passwd_trx_raw;
+    boost::signals2::signal<std::wstring(const graphene::chain::transaction&)> get_passwd_trx;
+    boost::signals2::signal<std::wstring(const std::string&)> get_passwd;
     boost::signals2::signal<void(const string_list&)> print_mnemonic;
     std::string uid_hash;
 };
@@ -214,6 +214,8 @@ struct keychain_command<CMD_SIGN> : keychain_command_base
         }
         else if (!params.keyname.empty())
         {
+          auto curdir = bfs::current_path();
+          
           auto first = bfs::directory_iterator(bfs::path("./"));
           auto it = std::find_if(first, bfs::directory_iterator(),find_keyfile_by_username(params.keyname.c_str(), &keyfile));
           if (it == bfs::directory_iterator())
@@ -231,7 +233,7 @@ struct keychain_command<CMD_SIGN> : keychain_command_base
           // If we can parse transaction we need to use get_passwd_trx function
           // else use get_passwd_trx_raw()
           // At this moment parsing of transaction is not implemented
-          std::string passwd = std::move(*(keychain->get_passwd_trx_raw(params.transaction)));
+          std::wstring passwd = std::move(*(keychain->get_passwd_trx_raw(params.transaction)));
           key_data = std::move(encryptor.decrypt_keydata(passwd.c_str(), encrypted_data));
         }
         else

keychain_lib/include/keychain_lib/keychain_wrapper.hpp

@@ -13,12 +13,12 @@ namespace keychain_app {
 class secure_dlg_mod_base
 {
 public:
-  using string_list = std::list<std::string>;
+  using string_list = std::list<std::wstring>;
 
   virtual ~secure_dlg_mod_base(){}
-  virtual std::string get_passwd_trx_raw(const std::string& raw_trx) const = 0;
-  virtual std::string get_passwd_trx(const graphene::chain::transaction& trx) const = 0;
-  virtual std::string get_passwd(const std::string& str) const = 0;
+  virtual std::wstring get_passwd_trx_raw(const std::string& raw_trx) const = 0;
+  virtual std::wstring get_passwd_trx(const graphene::chain::transaction& trx) const = 0;
+  virtual std::wstring get_passwd(const std::string& str) const = 0;
   virtual void print_mnemonic(const string_list& mnemonic) const = 0;
   virtual std::string get_uid() const = 0;
 };

keychain_lib/src/key_encryptor.cpp

@@ -36,7 +36,7 @@ encryptor_singletone& encryptor_singletone::instance()
 
 keyfile_format::encrypted_data encryptor_singletone::encrypt_keydata(
   keyfile_format::cipher_etype etype,
-  const std::string& key,
+  const std::wstring& key,
   const std::string& keydata)
 {
   keyfile_format::encrypted_data enc_data;
@@ -52,7 +52,8 @@ keyfile_format::encrypted_data encryptor_singletone::encrypt_keydata(
   //I cannot figure out the exact reason what exactly is wrong with the key (it is need to debug asm function
   // to find out reason)
   //The solution (from lib/fc) is to create hash from password string and encrypt data on hash key
-  auto key_hash = fc::sha512::hash(key);
+  const char* key_data = reinterpret_cast<const char*>(key.data());
+  auto key_hash = fc::sha512::hash(key_data, key.size()* sizeof(std::wstring::value_type));
 
   if(1 != EVP_EncryptInit_ex(m_ctx, get_cipher(etype), NULL, reinterpret_cast<const uint8_t*>(&key_hash),
                              reinterpret_cast<const uint8_t*>(enc_data.iv.c_str())))
@@ -81,7 +82,7 @@ keyfile_format::encrypted_data encryptor_singletone::encrypt_keydata(
   return enc_data;
 }
 
-std::string encryptor_singletone::decrypt_keydata(const std::string& key, keyfile_format::encrypted_data& data)
+std::string encryptor_singletone::decrypt_keydata(const std::wstring& key, keyfile_format::encrypted_data& data)
 {
   int decr_length = 0;
   int length = 0;
@@ -98,7 +99,8 @@ std::string encryptor_singletone::decrypt_keydata(const std::string& key, keyfil
   //I cannot figure out the exact reason what exactly is wrong with the key (it is need to debug asm function
   // to find out reason)
   //The solution (from lib/fc) is to create hash from password string and encrypt data on hash key
-  auto key_hash = fc::sha512::hash(key);
+  const char* key_data = reinterpret_cast<const char*>(key.data());
+  auto key_hash = fc::sha512::hash(key_data, key.size()* sizeof(std::wstring::value_type));
 
   if(1 != EVP_DecryptInit_ex(m_ctx, get_cipher(data.cipher_type), NULL, reinterpret_cast<const uint8_t*>(&key_hash),
                              reinterpret_cast<const uint8_t*>(data.iv.c_str())))

keychain_lib/src/keychain.cpp

@@ -33,8 +33,8 @@ keychain_commands_singletone::keychain_commands_singletone()
   });
 }
 
-keychain::keychain(std::string&& uid_hash, const char* default_key_dir)
-  : keychain_base(std::move(uid_hash))
+keychain::keychain(std::string&& uid_hash_, const char* default_key_dir)
+  : keychain_base(std::move(uid_hash_))
   , m_init_path(bfs::current_path())
 {
   std::string user_dir(default_key_dir);