From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 5 Apr 2012 22:22:47 +0000 (-0400)
Subject: Merge branch '0.5.x' into 0.6.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~27
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=3e0e10add3f8d1dffd419dc8968935b124389690

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/keystore.cpp
---

3e0e10add3f8d1dffd419dc8968935b124389690
diff --cc src/keystore.cpp
index e76f779,2e4de87..23f9e32
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@@ -84,8 -71,9 +84,10 @@@ bool CCryptoKeyStore::Unlock(const CKey
              CSecret vchSecret;
              if(!DecryptSecret(vMasterKeyIn, vchCryptedSecret, Hash(vchPubKey.begin(), vchPubKey.end()), vchSecret))
                  return false;
+             if (vchSecret.size() != 32)
+                 return false;
              CKey key;
 +            key.SetPubKey(vchPubKey);
              key.SetSecret(vchSecret);
              if (key.GetPubKey() == vchPubKey)
                  break;
@@@ -146,7 -133,8 +148,9 @@@ bool CCryptoKeyStore::GetKey(const CBit
              CSecret vchSecret;
              if (!DecryptSecret(vMasterKey, vchCryptedSecret, Hash(vchPubKey.begin(), vchPubKey.end()), vchSecret))
                  return false;
+             if (vchSecret.size() != 32)
+                 return false;
 +            keyOut.SetPubKey(vchPubKey);
              keyOut.SetSecret(vchSecret);
              return true;
          }