Merge branch '0.4.x' into 0.5.x

[novacoin.git] / src / crypter.cpp

diff --git a/src/crypter.cpp b/src/crypter.cpp
index e821b08..727cf09 100644 (file)
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 #include <string>
 #include "headers.h"
-#ifdef __WXMSW__
+#ifdef WIN32
 #include <windows.h>
 #endif
 
@@ -15,7 +15,7 @@
 #include "main.h"
 #include "util.h"
 
-bool CCrypter::SetKeyFromPassphrase(const std::string& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod)
+bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod)
 {
     if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE)
         return false;