X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcrypter.cpp;h=d6c3bc3eab783238cbe07ac92f64df86f6067d56;hb=3eaf7fd0364abb129c282e80b9d095db8fbede52;hp=e808d064f9fa9d8b8eba781b6a554ee68906fb1a;hpb=6f895c2539c4ddefce658bb2ec7083774bbbd5a3;p=novacoin.git

diff --git a/src/crypter.cpp b/src/crypter.cpp
index e808d06..d6c3bc3 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "crypter.h"
-#include "scrypt.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -26,17 +25,6 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v
                           (unsigned char *)&strKeyData[0], strKeyData.size(), nRounds, chKey, chIV);
     }
 
-    if (nDerivationMethod == 1)
-    {
-        // Passphrase conversion
-        uint256 scryptHash = scrypt_salted_multiround_hash((const void*)strKeyData.c_str(), strKeyData.size(), &chSalt[0], 8, nRounds);
-
-        i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0],
-                          (unsigned char *)&scryptHash, sizeof scryptHash, nRounds, chKey, chIV);
-        OPENSSL_cleanse(&scryptHash, sizeof scryptHash);
-    }
-
-
     if (i != (int)WALLET_CRYPTO_KEY_SIZE)
     {
         OPENSSL_cleanse(&chKey, sizeof chKey);