X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcrypter.cpp;h=727cf090f3f1a37d397158184533b0c1b6d4841e;hb=a93ab877877925c60b2dbf56bdde8aa46b6b7391;hp=5b7bfec06a22844ea168acbc1bb4621eecd58948;hpb=c7057326eaba2d50410016a9825f0052dd0248b5;p=novacoin.git

diff --git a/src/crypter.cpp b/src/crypter.cpp
index 5b7bfec..727cf09 100644
--- 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;
@@ -31,7 +31,7 @@ bool CCrypter::SetKeyFromPassphrase(const std::string& strKeyData, const std::ve
         i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0],
                           (unsigned char *)&strKeyData[0], strKeyData.size(), nRounds, chKey, chIV);
 
-    if (i != WALLET_CRYPTO_KEY_SIZE)
+    if (i != (int)WALLET_CRYPTO_KEY_SIZE)
     {
         memset(&chKey, 0, sizeof chKey);
         memset(&chIV, 0, sizeof chIV);