X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkey.cpp;h=b1db7cbf0e6a6f313ce1509a6d659f4640412bba;hb=5f3f7465db4444e49dd4a896f88c090b40d0a303;hp=c37b1023fdf3d6bbf62986e48b92cb808ccae868;hpb=7f70ddc68f4afa4a87a15e620ba519afbc5c8b15;p=novacoin.git

diff --git a/src/key.cpp b/src/key.cpp
index c37b102..b1db7cb 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -6,12 +6,9 @@
 
 #include <openssl/ecdsa.h>
 #include <openssl/obj_mac.h>
-#include <openssl/ssl.h>
-#include <openssl/ecdh.h>
 
 #include "key.h"
 #include "base58.h"
-#include "ies.h"
 
 // Generate a private key from just the secret parameter
 int EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key)
@@ -201,6 +198,14 @@ CKey::CKey(const CKey& b)
     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))
@@ -326,6 +331,12 @@ CSecret CKey::GetSecret(bool &fCompressed) const
     return vchRet;
 }
 
+CSecret CKey::GetSecret() const
+{
+    bool fCompressed;
+    return GetSecret(fCompressed);
+}
+
 CPrivKey CKey::GetPrivKey() const
 {
     int nSize = i2d_ECPrivateKey(pkey, NULL);
@@ -738,9 +749,7 @@ bool CMalleablePubKey::SetString(const std::string& strMalleablePubKey)
 
 bool CMalleablePubKey::operator==(const CMalleablePubKey &b)
 {
-    return (nVersion == b.nVersion &&
-            pubKeyL == b.pubKeyL &&
-            pubKeyH == b.pubKeyH);
+    return pubKeyL == b.pubKeyL && pubKeyH == b.pubKeyH;
 }
 
 
@@ -750,22 +759,18 @@ void CMalleableKey::Reset()
 {
     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()
@@ -783,48 +788,31 @@ CMalleableKey::CMalleableKey(const CSecret &L, const CSecret &H)
     SetSecrets(L, H);
 }
 
-/*
-CMalleableKey& CMalleableKey::operator=(const CMalleableKey &b)
-{
-    SetSecrets(b.vchSecretL, b.vchSecretH);
-
-    return (*this);
-}
-*/
-
 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;
 }
 
-void CMalleableKey::GetSecrets(CSecret &pvchSecretL, CSecret &pvchSecretH) const
-{
-    pvchSecretL = vchSecretL;
-    pvchSecretH = vchSecretH;
-}
-
 CMalleablePubKey CMalleableKey::GetMalleablePubKey() const
 {
     CKey L, H;
@@ -1015,11 +1003,16 @@ bool CMalleableKey::SetString(const std::string& strMutableKey)
     CDataStream ssKey(vchTemp, SER_NETWORK, PROTOCOL_VERSION);
     ssKey >> *this;
 
-    return IsNull();
+    return IsValid();
 }
 
 // CMalleableKeyView
 
+CMalleableKeyView::CMalleableKeyView(const std::string &strMalleableKey)
+{
+    SetString(strMalleableKey);
+}
+
 CMalleableKeyView::CMalleableKeyView(const CMalleableKey &b)
 {
     if (b.vchSecretL.size() != 32)
@@ -1034,21 +1027,12 @@ CMalleableKeyView::CMalleableKeyView(const CMalleableKey &b)
     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(const CSecret &L, const CPubKey &pvchPubKeyH)
-{
-    vchSecretL = L;
-    vchPubKeyH = pvchPubKeyH.Raw();
-    nVersion = CURRENT_VERSION;
 }
 
 CMalleableKeyView& CMalleableKeyView::operator=(const CMalleableKey &b)
@@ -1058,7 +1042,6 @@ CMalleableKeyView& CMalleableKeyView::operator=(const CMalleableKey &b)
     CKey H;
     H.SetSecret(b.vchSecretH, true);
     vchPubKeyH = H.GetPubKey().Raw();
-    nVersion = b.nVersion;
 
     return (*this);
 }
@@ -1155,7 +1138,7 @@ bool CMalleableKeyView::SetString(const std::string& strMutableKey)
     CDataStream ssKey(vchTemp, SER_NETWORK, PROTOCOL_VERSION);
     ssKey >> *this;
 
-    return IsNull();
+    return IsValid();
 }
 
 std::vector<unsigned char> CMalleableKeyView::Raw() const
@@ -1168,9 +1151,9 @@ std::vector<unsigned char> CMalleableKeyView::Raw() const
 }
 
 
-bool CMalleableKeyView::IsNull() const
+bool CMalleableKeyView::IsValid() const
 {
-    return nVersion != CURRENT_VERSION;
+    return vchSecretL.size() == 32 && GetMalleablePubKey().IsValid();
 }
 
 //// Asymmetric encryption