fCompressedPubKey = b.fCompressedPubKey;
}
+CKey::CKey(const CSecret& b, bool fCompressed)
+{
+ pkey = EC_KEY_new_by_curve_name(NID_secp256k1);
+ if (pkey == NULL)
+ throw key_error("CKey::CKey(const CKey&) : EC_KEY_dup failed");
+ SetSecret(b, fCompressed);
+}
+
CKey& CKey::operator=(const CKey& b)
{
if (!EC_KEY_copy(pkey, b.pkey))
return vchRet;
}
+CSecret CKey::GetSecret() const
+{
+ bool fCompressed;
+ return GetSecret(fCompressed);
+}
+
CPrivKey CKey::GetPrivKey() const
{
int nSize = i2d_ECPrivateKey(pkey, NULL);
bool CMalleablePubKey::operator==(const CMalleablePubKey &b)
{
- return (nVersion == b.nVersion &&
- pubKeyL == b.pubKeyL &&
- pubKeyH == b.pubKeyH);
+ return pubKeyL == b.pubKeyL && pubKeyH == b.pubKeyH;
}
{
vchSecretL.clear();
vchSecretH.clear();
-
- nVersion = 0;
}
void CMalleableKey::MakeNewKeys()
{
- CKey L, H;
- bool fCompressed = true;
-
- L.MakeNewKey(true);
- H.MakeNewKey(true);
+ Reset();
- vchSecretL = L.GetSecret(fCompressed);
- vchSecretH = H.GetSecret(fCompressed);
+ CKey keyL, keyH;
+ keyL.MakeNewKey();
+ keyH.MakeNewKey();
- nVersion = CURRENT_VERSION;
+ vchSecretL = keyL.GetSecret();
+ vchSecretH = keyH.GetSecret();
}
CMalleableKey::CMalleableKey()
bool CMalleableKey::IsNull() const
{
- return nVersion != CURRENT_VERSION;
+ return vchSecretL.size() != 32 || vchSecretH.size() != 32;
}
bool CMalleableKey::SetSecrets(const CSecret &pvchSecretL, const CSecret &pvchSecretH)
{
Reset();
- CKey L, H;
- if (pvchSecretL.size() != 32 || pvchSecretH.size() != 32 || !L.SetSecret(pvchSecretL, true) || !H.SetSecret(pvchSecretH, true))
- {
- nVersion = 0;
+ CKey keyL(pvchSecretL);
+ CKey keyH(pvchSecretH);
+
+ if (!keyL.IsValid() || !keyL.IsValid())
return false;
- }
vchSecretL = pvchSecretL;
vchSecretH = pvchSecretH;
- nVersion = CURRENT_VERSION;
return true;
}
H.SetSecret(b.vchSecretH, true);
vchPubKeyH = H.GetPubKey().Raw();
- nVersion = b.nVersion;
}
CMalleableKeyView::CMalleableKeyView(const CMalleableKeyView &b)
{
vchSecretL = b.vchSecretL;
vchPubKeyH = b.vchPubKeyH;
- nVersion = CURRENT_VERSION;
}
CMalleableKeyView& CMalleableKeyView::operator=(const CMalleableKey &b)
CKey H;
H.SetSecret(b.vchSecretH, true);
vchPubKeyH = H.GetPubKey().Raw();
- nVersion = b.nVersion;
return (*this);
}
}
-bool CMalleableKeyView::IsNull() const
+bool CMalleableKeyView::IsValid() const
{
- return nVersion != CURRENT_VERSION;
+ return vchSecretL.size() == 32 && GetMalleablePubKey().IsValid();
}
//// Asymmetric encryption