// Add a key to the store.
virtual bool AddKey(const CKey& key) =0;
+ // Add a malleable key to store.
+ virtual bool AddMalleableKey(const CMalleableKey& mKey) =0;
+ virtual bool GetMalleableKey(const CMalleableKeyView &keyView, CMalleableKey &mKey) const =0;
+
// Check whether a key corresponding to a given address is present in the store.
virtual bool HaveKey(const CKeyID &address) const =0;
virtual bool GetKey(const CKeyID &address, CKey& keyOut) const =0;
virtual bool CheckOwnership(const CPubKey &pubKeyVariant, const CPubKey &R) const =0;
virtual bool CreatePrivKey(const CPubKey &pubKeyVariant, const CPubKey &R, CKey &privKey) const =0;
+ virtual void ListMalleableViews(std::list<CMalleableKeyView> &malleableViewList) const =0;
};
typedef std::map<CKeyID, std::pair<CSecret, bool> > KeyMap;
typedef std::map<CScriptID, CScript > ScriptMap;
typedef std::set<CScript> WatchOnlySet;
-typedef std::pair<CMalleableKeyView, CMalleableKey> MalleableKeyPair;
+typedef std::map<CMalleableKeyView, CMalleableKey> MalleableKeyMap;
/** Basic key store, that keeps keys in an address->secret map */
class CBasicKeyStore : public CKeyStore
{
protected:
KeyMap mapKeys;
+ MalleableKeyMap mapMalleableKeys;
+
ScriptMap mapScripts;
WatchOnlySet setWatchOnly;
- MalleableKeyPair malleableKeyPair;
public:
bool AddKey(const CKey& key);
+ bool AddMalleableKey(const CMalleableKey& mKey);
+ bool GetMalleableKey(const CMalleableKeyView &keyView, CMalleableKey &mKey) const
+ {
+ {
+ LOCK(cs_KeyStore);
+ MalleableKeyMap::const_iterator mi = mapMalleableKeys.find(keyView);
+ if (mi != mapMalleableKeys.end())
+ {
+ mKey = mi->second;
+ return true;
+ }
+ }
+ return false;
+ }
+
bool HaveKey(const CKeyID &address) const
{
bool result;
bool CheckOwnership(const CPubKey &pubKeyVariant, const CPubKey &R) const
{
- bool result;
{
LOCK(cs_KeyStore);
- result = const_cast<CBasicKeyStore*>(this)->malleableKeyPair.first.CheckKeyVariant(R, pubKeyVariant);
+ for (MalleableKeyMap::const_iterator mi = mapMalleableKeys.begin(); mi != mapMalleableKeys.end(); mi++)
+ {
+ if (mi->first.CheckKeyVariant(R, pubKeyVariant))
+ return true;
+ }
}
- return result;
+ return false;
}
bool CreatePrivKey(const CPubKey &pubKeyVariant, const CPubKey &R, CKey &privKey) const
{
- bool result;
{
LOCK(cs_KeyStore);
- result = const_cast<CBasicKeyStore*>(this)->malleableKeyPair.second.CheckKeyVariant(R, pubKeyVariant, privKey);
+ for (MalleableKeyMap::const_iterator mi = mapMalleableKeys.begin(); mi != mapMalleableKeys.end(); mi++)
+ {
+ if (mi->second.CheckKeyVariant(R, pubKeyVariant, privKey))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ void ListMalleableViews(std::list<CMalleableKeyView> &malleableViewList) const
+ {
+ malleableViewList.clear();
+
+ {
+ LOCK(cs_KeyStore);
+ for (MalleableKeyMap::const_iterator mi = mapMalleableKeys.begin(); mi != mapMalleableKeys.end(); mi++)
+ malleableViewList.push_back(CMalleableKeyView(mi->first));
}
- return result;
}
};
bool Unlock(const CKeyingMaterial& vMasterKeyIn);
public:
- CCryptoKeyStore();
+ CCryptoKeyStore() : fUseCrypto(false) { }
bool IsCrypted() const
{