From e5c027b49b72d8245ebec26cb92d918377fd81e0 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Thu, 5 Apr 2012 01:02:49 +0200 Subject: Verify status of encrypt/decrypt calls to detect failed padding --- src/keystore.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/keystore.cpp') diff --git a/src/keystore.cpp b/src/keystore.cpp index e76f7790f..23f9e32fa 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -84,6 +84,8 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn) 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); @@ -146,6 +148,8 @@ bool CCryptoKeyStore::GetKey(const CBitcoinAddress &address, CKey& keyOut) const 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; -- cgit v1.2.3