X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fkey.cpp;h=6657ffd70b328e6f47edd79722a99bedbf5ad7b6;hp=355d6ddf60b0890449b7b07fe4784a3be75e1bb6;hb=3e59ebf3286bcd620e6ff79fa84eb9aa50a6c59e;hpb=d2a1ea23d1f40ea70be9c835f2ec949bca3713ea

diff --git a/src/key.cpp b/src/key.cpp
index 355d6dd..6657ffd 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -165,15 +165,14 @@ const unsigned char vchMaxModHalfOrder[32] = {
 
 const unsigned char *vchZero = NULL;
 
-void CKey::SetCompressedPubKey()
+void CKey::SetCompressedPubKey(bool fCompressed)
 {
-    EC_KEY_set_conv_form(pkey, POINT_CONVERSION_COMPRESSED);
-    fCompressedPubKey = true;
+    EC_KEY_set_conv_form(pkey, fCompressed ? POINT_CONVERSION_COMPRESSED : POINT_CONVERSION_UNCOMPRESSED);
 }
 
 void CKey::Reset()
 {
-    fCompressedPubKey = fSet = false;
+    fSet = false;
     if (pkey != NULL)
         EC_KEY_free(pkey);
     pkey = EC_KEY_new_by_curve_name(NID_secp256k1);
@@ -193,7 +192,6 @@ CKey::CKey(const CKey& b)
     if (pkey == NULL)
         throw key_error("CKey::CKey(const CKey&) : EC_KEY_dup failed");
     fSet = b.fSet;
-    fCompressedPubKey = b.fCompressedPubKey;
 }
 
 CKey::CKey(const CSecret& b, bool fCompressed)
@@ -209,7 +207,6 @@ CKey& CKey::operator=(const CKey& b)
     if (!EC_KEY_copy(pkey, b.pkey))
         throw key_error("CKey::operator=(const CKey&) : EC_KEY_copy failed");
     fSet = b.fSet;
-    fCompressedPubKey = b.fCompressedPubKey;
     return (*this);
 }
 
@@ -226,7 +223,7 @@ bool CKey::IsNull() const
 
 bool CKey::IsCompressed() const
 {
-    return fCompressedPubKey;
+    return (EC_KEY_get_conv_form(pkey) == POINT_CONVERSION_COMPRESSED);
 }
 
 bool CKey::CheckSignatureElement(const unsigned char *vch, int len, bool half) {
@@ -264,8 +261,7 @@ void CKey::MakeNewKey(bool fCompressed)
 {
     if (!EC_KEY_generate_key(pkey))
         throw key_error("CKey::MakeNewKey() : EC_KEY_generate_key failed");
-    if (fCompressed)
-        SetCompressedPubKey();
+    SetCompressedPubKey(fCompressed);
     fSet = true;
 }
 
@@ -311,8 +307,7 @@ bool CKey::SetSecret(const CSecret& vchSecret, bool fCompressed)
     }
     BN_clear_free(bn);
     fSet = true;
-    if (fCompressed || fCompressedPubKey)
-        SetCompressedPubKey();
+    SetCompressedPubKey(fCompressed);
     return true;
 }
 
@@ -327,7 +322,7 @@ CSecret CKey::GetSecret(bool &fCompressed) const
     int n=BN_bn2bin(bn,&vchRet[32 - nBytes]);
     if (n != nBytes)
         throw key_error("CKey::GetSecret(): BN_bn2bin failed");
-    fCompressed = fCompressedPubKey;
+    fCompressed = IsCompressed();
     return vchRet;
 }
 
@@ -422,6 +417,7 @@ bool CKey::SignCompact(uint256 hash, std::vector<unsigned char>& vchSig)
     vchSig.resize(65,0);
     int nBitsR = BN_num_bits(sig->r);
     int nBitsS = BN_num_bits(sig->s);
+    bool fCompressedPubKey = IsCompressed();
     if (nBitsR <= 256 && nBitsS <= 256)
     {
         int8_t nRecId = -1;
@@ -429,8 +425,7 @@ bool CKey::SignCompact(uint256 hash, std::vector<unsigned char>& vchSig)
         {
             CKey keyRec;
             keyRec.fSet = true;
-            if (fCompressedPubKey)
-                keyRec.SetCompressedPubKey();
+            keyRec.SetCompressedPubKey(fCompressedPubKey);
             if (ECDSA_SIG_recover_key_GFp(keyRec.pkey, sig, (unsigned char*)&hash, sizeof(hash), i, 1) == 1)
                 if (keyRec.GetPubKey() == this->GetPubKey())
                 {