X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcrypter.h;h=733d9a31230a76f87516656f30f75dcabdbeda87;hb=5f3f7465db4444e49dd4a896f88c090b40d0a303;hp=849116c3b3b108a77e6a9dd4c4af568ac6bed8df;hpb=57c556df79e2b413da4715e3867922933083b513;p=novacoin.git

diff --git a/src/crypter.h b/src/crypter.h
index 849116c..733d9a3 100644
--- a/src/crypter.h
+++ b/src/crypter.h
@@ -7,7 +7,6 @@
 #include "allocators.h" /* for SecureString */
 #include "key.h"
 #include "serialize.h"
-//#include <openssl/crypto.h> // for OPENSSL_cleanse()
 
 const unsigned int WALLET_CRYPTO_KEY_SIZE = 32;
 const unsigned int WALLET_CRYPTO_SALT_SIZE = 8;
@@ -54,29 +53,9 @@ public:
         // 25000 rounds is just under 0.1 seconds on a 1.86 GHz Pentium M
         // ie slightly lower than the lowest hardware we need bother supporting
         nDeriveIterations = 25000;
-        nDerivationMethod = 1;
+        nDerivationMethod = 0;
         vchOtherDerivationParameters = std::vector<unsigned char>(0);
     }
-
-    CMasterKey(unsigned int nDerivationMethodIndex)
-    {
-        switch (nDerivationMethodIndex)
-        {
-            case 0: // sha512
-            default:
-                nDeriveIterations = 25000;
-                nDerivationMethod = 0;
-                vchOtherDerivationParameters = std::vector<unsigned char>(0);
-            break;
-
-            case 1: // scrypt+sha512
-                nDeriveIterations = 10000;
-                nDerivationMethod = 1;
-                vchOtherDerivationParameters = std::vector<unsigned char>(0);
-            break;
-        }
-    }
-
 };
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;