CKey();
CKey(const CKey& b);
+ CKey(const CSecret& b, bool fCompressed=true);
CKey& operator=(const CKey& b);
bool IsNull() const;
bool IsCompressed() const;
- void MakeNewKey(bool fCompressed);
+ void MakeNewKey(bool fCompressed=true);
bool SetPrivKey(const CPrivKey& vchPrivKey);
- bool SetSecret(const CSecret& vchSecret, bool fCompressed = false);
+ bool SetSecret(const CSecret& vchSecret, bool fCompressed = true);
CSecret GetSecret(bool &fCompressed) const;
+ CSecret GetSecret() const;
CPrivKey GetPrivKey() const;
bool SetPubKey(const CPubKey& vchPubKey);
CPubKey GetPubKey() const;
// Calculate G*m + q
bool ECMULGEN(const CBigNum &bnMultiplier, const CPoint &qPoint);
- bool IsInfinity() { return EC_POINT_is_at_infinity(group, point); }
+ bool IsInfinity() { return EC_POINT_is_at_infinity(group, point) != 0; }
};
class CMalleablePubKey
{
private:
- unsigned char nVersion;
CPubKey pubKeyL;
CPubKey pubKeyH;
friend class CMalleableKey;
static const unsigned char CURRENT_VERSION = 1;
public:
- CMalleablePubKey() { nVersion = CMalleablePubKey::CURRENT_VERSION; }
+ CMalleablePubKey() { }
CMalleablePubKey(const CMalleablePubKey& mpk)
{
- nVersion = mpk.nVersion;
pubKeyL = mpk.pubKeyL;
pubKeyH = mpk.pubKeyH;
}
+ CMalleablePubKey(const std::vector<unsigned char> &vchPubKeyPair) { setvch(vchPubKeyPair); }
CMalleablePubKey(const std::string& strMalleablePubKey) { SetString(strMalleablePubKey); }
- CMalleablePubKey(const CPubKey &pubKeyInL, const CPubKey &pubKeyInH) : pubKeyL(pubKeyInL), pubKeyH(pubKeyInH) { nVersion = CMalleablePubKey::CURRENT_VERSION; }
+ CMalleablePubKey(const CPubKey &pubKeyInL, const CPubKey &pubKeyInH) : pubKeyL(pubKeyInL), pubKeyH(pubKeyInH) { }
IMPLEMENT_SERIALIZE(
- READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(pubKeyL);
READWRITE(pubKeyH);
)
bool operator==(const CMalleablePubKey &b);
bool operator!=(const CMalleablePubKey &b) { return !(*this == b); }
CMalleablePubKey& operator=(const CMalleablePubKey& mpk) {
- nVersion = mpk.nVersion;
pubKeyL = mpk.pubKeyL;
pubKeyH = mpk.pubKeyH;
return *this;
return pubKeyL.GetID();
}
+ bool setvch(const std::vector<unsigned char> &vchPubKeyPair);
std::vector<unsigned char> Raw() const;
CPubKey& GetL() { return pubKeyL; }
class CMalleableKey
{
private:
- unsigned char nVersion;
CSecret vchSecretL;
CSecret vchSecretH;
friend class CMalleableKeyView;
- static const unsigned char CURRENT_VERSION = 1;
-
public:
CMalleableKey();
CMalleableKey(const CMalleableKey &b);
~CMalleableKey();
IMPLEMENT_SERIALIZE(
- READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(vchSecretL);
READWRITE(vchSecretH);
)
bool SetString(const std::string& strMalleablePubKey);
std::vector<unsigned char> Raw() const;
CMalleableKey& operator=(const CMalleableKey& mk) {
- nVersion = mk.nVersion;
vchSecretL = mk.vchSecretL;
vchSecretH = mk.vchSecretH;
return *this;
class CMalleableKeyView
{
private:
- unsigned char nVersion;
CSecret vchSecretL;
CPubKey vchPubKeyH;
- static const unsigned char CURRENT_VERSION = 1;
-
public:
- CMalleableKeyView() { nVersion = 0; };
+ CMalleableKeyView() { };
CMalleableKeyView(const CMalleableKey &b);
+ CMalleableKeyView(const std::string &strMalleableKey);
CMalleableKeyView(const CMalleableKeyView &b);
CMalleableKeyView& operator=(const CMalleableKey &b);
~CMalleableKeyView();
IMPLEMENT_SERIALIZE(
- READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(vchSecretL);
READWRITE(vchPubKeyH);
)
- bool IsNull() const;
- bool IsValid() const { return !IsNull() && GetMalleablePubKey().IsValid(); }
+ bool IsValid() const;
std::string ToString() const;
bool SetString(const std::string& strMalleablePubKey);
std::vector<unsigned char> Raw() const;
CMalleableKeyView& operator=(const CMalleableKeyView& mkv) {
- nVersion = mkv.nVersion;
vchSecretL = mkv.vchSecretL;
vchPubKeyH = mkv.vchPubKeyH;
return *this;