Make crypter.h little compact

diff --git a/src/crypter.cpp b/src/crypter.cpp
index 04c25e7..ae2b0f4 100644 (file)
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -13,6 +13,23 @@
 #include <windows.h>
 #endif
 
+//
+//CMasterKey
+//
+
+CMasterKey::CMasterKey()
+{
+    // 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 = 0;
+    vchOtherDerivationParameters = std::vector<unsigned char>(0);
+}
+
+//
+//CCrypter
+//
+
 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)
@@ -102,6 +119,31 @@ bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingM
     return true;
 }
 
+void CCrypter::CleanKey()
+{
+    OPENSSL_cleanse(&chKey, sizeof chKey);
+    OPENSSL_cleanse(&chIV, sizeof chIV);
+    fKeySet = false;
+}
+
+CCrypter::CCrypter()
+{
+    fKeySet = false;
+
+    // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
+    // Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
+    // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.
+    LockedPageManager::instance.LockRange(&chKey[0], sizeof chKey);
+    LockedPageManager::instance.LockRange(&chIV[0], sizeof chIV);
+}
+
+CCrypter::~CCrypter()
+{
+    CleanKey();
+
+    LockedPageManager::instance.UnlockRange(&chKey[0], sizeof chKey);
+    LockedPageManager::instance.UnlockRange(&chIV[0], sizeof chIV);
+}
 
 bool EncryptSecret(CKeyingMaterial& vMasterKey, const CSecret &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext)
 {

diff --git a/src/crypter.h b/src/crypter.h
index 733d9a3..493c7fb 100644 (file)
--- a/src/crypter.h
+++ b/src/crypter.h
@@ -48,14 +48,7 @@ public:
         READWRITE(nDeriveIterations);
         READWRITE(vchOtherDerivationParameters);
     )
-    CMasterKey()
-    {
-        // 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 = 0;
-        vchOtherDerivationParameters = std::vector<unsigned char>(0);
-    }
+    CMasterKey();
 };
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
@@ -73,32 +66,9 @@ public:
     bool Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext);
     bool Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext);
     bool SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigned char>& chNewIV);
-
-    void CleanKey()
-    {
-        OPENSSL_cleanse(&chKey, sizeof chKey);
-        OPENSSL_cleanse(&chIV, sizeof chIV);
-        fKeySet = false;
-    }
-
-    CCrypter()
-    {
-        fKeySet = false;
-
-        // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
-        // Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
-        // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.
-        LockedPageManager::instance.LockRange(&chKey[0], sizeof chKey);
-        LockedPageManager::instance.LockRange(&chIV[0], sizeof chIV);
-    }
-
-    ~CCrypter()
-    {
-        CleanKey();
-
-        LockedPageManager::instance.UnlockRange(&chKey[0], sizeof chKey);
-        LockedPageManager::instance.UnlockRange(&chIV[0], sizeof chIV);
-    }
+    void CleanKey();
+    CCrypter();
+    ~CCrypter();
 };
 
 bool EncryptSecret(CKeyingMaterial& vMasterKey, const CSecret &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext);