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);
return EncodeBase58Check(vch);
}
+bool CMalleablePubKey::setvch(const std::vector<unsigned char> &vchPubKeyPair)
+{
+ CDataStream ssKey(vchPubKeyPair, SER_NETWORK, PROTOCOL_VERSION);
+ ssKey >> *this;
+
+ return IsValid();
+}
+
std::vector<unsigned char> CMalleablePubKey::Raw() const
{
CDataStream ssKey(SER_NETWORK, PROTOCOL_VERSION);
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() || !keyH.IsValid())
return false;
- }
vchSecretL = pvchSecretL;
vchSecretH = pvchSecretH;
- nVersion = CURRENT_VERSION;
return true;
}
CMalleablePubKey CMalleableKey::GetMalleablePubKey() const
{
- CKey L, H;
- L.SetSecret(vchSecretL, true);
- H.SetSecret(vchSecretH, true);
-
- std::vector<unsigned char> vchPubKeyL = L.GetPubKey().Raw();
- std::vector<unsigned char> vchPubKeyH = H.GetPubKey().Raw();
-
- return CMalleablePubKey(vchPubKeyL, vchPubKeyH);
+ CKey L(vchSecretL), H(vchSecretH);
+ return CMalleablePubKey(L.GetPubKey().Raw(), H.GetPubKey().Raw());
}
// Check ownership
}
if (!R.IsValid()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : R is invalid");
+ printf("CMalleableKey::CheckKeyVariant() : R is invalid");
+ return false;
}
if (!vchPubKeyVariant.IsValid()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : public key variant is invalid");
+ printf("CMalleableKey::CheckKeyVariant() : public key variant is invalid");
+ return false;
}
CPoint point_R;
if (!point_R.setPubKey(R)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to decode R value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to decode R value");
+ return false;
}
- CKey H;
- H.SetSecret(vchSecretH, true);
+ CKey H(vchSecretH);
std::vector<unsigned char> vchPubKeyH = H.GetPubKey().Raw();
CPoint point_H;
if (!point_H.setPubKey(vchPubKeyH)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to decode H value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to decode H value");
+ return false;
}
CPoint point_P;
if (!point_P.setPubKey(vchPubKeyVariant)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to decode P value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to decode P value");
+ return false;
}
// Infinity points are senseless
if (point_P.IsInfinity()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : P is infinity");
+ printf("CMalleableKey::CheckKeyVariant() : P is infinity");
+ return false;
}
CBigNum bnl;
std::vector<unsigned char> vchRl;
if (!point_R.getBytes(vchRl)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to convert Rl value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to convert Rl value");
+ return false;
}
// Calculate Hash(R*l)
// Infinity points are senseless
if (point_Ps.IsInfinity()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Ps is infinity");
+ printf("CMalleableKey::CheckKeyVariant() : Ps is infinity");
+ return false;
}
// Check ownership
}
if (!R.IsValid()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : R is invalid");
+ printf("CMalleableKey::CheckKeyVariant() : R is invalid");
+ return false;
}
if (!vchPubKeyVariant.IsValid()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : public key variant is invalid");
+ printf("CMalleableKey::CheckKeyVariant() : public key variant is invalid");
+ return false;
}
CPoint point_R;
if (!point_R.setPubKey(R)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to decode R value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to decode R value");
+ return false;
}
- CKey H;
- H.SetSecret(vchSecretH, true);
+ CKey H(vchSecretH);
std::vector<unsigned char> vchPubKeyH = H.GetPubKey().Raw();
CPoint point_H;
if (!point_H.setPubKey(vchPubKeyH)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to decode H value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to decode H value");
+ return false;
}
CPoint point_P;
if (!point_P.setPubKey(vchPubKeyVariant)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to decode P value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to decode P value");
+ return false;
}
// Infinity points are senseless
if (point_P.IsInfinity()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : P is infinity");
+ printf("CMalleableKey::CheckKeyVariant() : P is infinity");
+ return false;
}
CBigNum bnl;
std::vector<unsigned char> vchRl;
if (!point_R.getBytes(vchRl)) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Unable to convert Rl value");
+ printf("CMalleableKey::CheckKeyVariant() : Unable to convert Rl value");
+ return false;
}
// Calculate Hash(R*l)
// Infinity points are senseless
if (point_Ps.IsInfinity()) {
- throw key_error("CMalleableKey::CheckKeyVariant() : Ps is infinity");
+ printf("CMalleableKey::CheckKeyVariant() : Ps is infinity");
+ return false;
}
// Check ownership
CBigNum bnp = bnHash + bnh;
std::vector<unsigned char> vchp = bnp.getBytes();
- privKeyVariant.SetSecret(CSecret(vchp.begin(), vchp.end()), true);
+ privKeyVariant.SetSecret(CSecret(vchp.begin(), vchp.end()));
return true;
}
// CMalleableKeyView
+CMalleableKeyView::CMalleableKeyView(const std::string &strMalleableKey)
+{
+ SetString(strMalleableKey);
+}
+
CMalleableKeyView::CMalleableKeyView(const CMalleableKey &b)
{
if (b.vchSecretL.size() != 32)
throw key_error("CMalleableKeyView::CMalleableKeyView() : L size must be 32 bytes");
if (b.vchSecretH.size() != 32)
- throw key_error("CMalleableKeyView::CMalleableKeyView() : L size must be 32 bytes");
+ throw key_error("CMalleableKeyView::CMalleableKeyView() : H size must be 32 bytes");
vchSecretL = b.vchSecretL;
- CKey H;
- H.SetSecret(b.vchSecretH, true);
-
+ CKey H(b.vchSecretH);
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)
{
vchSecretL = b.vchSecretL;
- CKey H;
- H.SetSecret(b.vchSecretH, true);
+ CKey H(b.vchSecretH);
vchPubKeyH = H.GetPubKey().Raw();
- nVersion = b.nVersion;
return (*this);
}
CMalleablePubKey CMalleableKeyView::GetMalleablePubKey() const
{
- CKey keyL;
- keyL.SetSecret(vchSecretL, true);
+ CKey keyL(vchSecretL);
return CMalleablePubKey(keyL.GetPubKey(), vchPubKeyH);
}
// Check ownership
bool CMalleableKeyView::CheckKeyVariant(const CPubKey &R, const CPubKey &vchPubKeyVariant) const
{
+ if (!IsValid()) {
+ throw key_error("CMalleableKeyView::CheckKeyVariant() : Attempting to run on invalid view object.");
+ }
+
if (!R.IsValid()) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : R is invalid");
+ printf("CMalleableKeyView::CheckKeyVariant() : R is invalid");
+ return false;
}
if (!vchPubKeyVariant.IsValid()) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : public key variant is invalid");
+ printf("CMalleableKeyView::CheckKeyVariant() : public key variant is invalid");
+ return false;
}
CPoint point_R;
if (!point_R.setPubKey(R)) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : Unable to decode R value");
+ printf("CMalleableKeyView::CheckKeyVariant() : Unable to decode R value");
+ return false;
}
CPoint point_H;
if (!point_H.setPubKey(vchPubKeyH)) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : Unable to decode H value");
+ printf("CMalleableKeyView::CheckKeyVariant() : Unable to decode H value");
+ return false;
}
CPoint point_P;
if (!point_P.setPubKey(vchPubKeyVariant)) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : Unable to decode P value");
+ printf("CMalleableKeyView::CheckKeyVariant() : Unable to decode P value");
+ return false;
}
// Infinity points are senseless
if (point_P.IsInfinity()) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : P is infinity");
+ printf("CMalleableKeyView::CheckKeyVariant() : P is infinity");
+ return false;
}
CBigNum bnl;
std::vector<unsigned char> vchRl;
if (!point_R.getBytes(vchRl)) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : Unable to convert Rl value");
+ printf("CMalleableKeyView::CheckKeyVariant() : Unable to convert Rl value");
+ return false;
}
// Calculate Hash(R*l)
// Infinity points are senseless
if (point_Ps.IsInfinity()) {
- throw key_error("CMalleableKeyView::CheckKeyVariant() : Ps is infinity");
+ printf("CMalleableKeyView::CheckKeyVariant() : Ps is infinity");
+ return false;
}
// Check ownership
}
-bool CMalleableKeyView::IsNull() const
+bool CMalleableKeyView::IsValid() const
{
- return nVersion != CURRENT_VERSION;
+ return vchSecretL.size() == 32 && GetMalleablePubKey().IsValid();
}
//// Asymmetric encryption
cryptogram = ecies_encrypt(ctx, (unsigned char*)&data[0], data.size(), error);
if (cryptogram == NULL) {
- free(ctx);
+ delete ctx;
ctx = NULL;
throw key_error(std::string("Error in encryption: %s") + error);
}
unsigned char *key_data = cryptogram_key_data(cryptogram);
memcpy(&encrypted[0], key_data, encrypted.size());
cryptogram_free(cryptogram);
- free(ctx);
+ delete ctx;
}
void CKey::DecryptData(const std::vector<unsigned char>& encrypted, std::vector<unsigned char>& data)
decrypted = ecies_decrypt(ctx, cryptogram, &length, error);
cryptogram_free(cryptogram);
- free(ctx);
+ delete ctx;
if (decrypted == NULL) {
throw key_error(std::string("Error in decryption: %s") + error);
data.resize(length);
memcpy(&data[0], decrypted, length);
free(decrypted);
-}
+}
\ No newline at end of file
git://git.novaco.in / novacoin.git / blobdiff