X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkey.cpp;h=1c700d0754ffdb62c79d07c2b83f9a701d5507f0;hb=8e064484abe4d65e15e3ec1bcdbb2b91f97dd726;hp=20ea691a5d340324a2df44a3931ce58c2a0703e1;hpb=9e58e0a8ca28b15a4bfa677f5b23891972db40fd;p=novacoin.git

diff --git a/src/key.cpp b/src/key.cpp
index 20ea691..1c700d0 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -334,32 +334,12 @@ CSecret CKey::GetSecret(bool &fCompressed) const
 bool CKey::WritePEM(BIO *streamObj, const SecureString &strPassKey) const // dumppem 4KJLA99FyqMMhjjDe7KnRXK4sjtv9cCtNS /tmp/test.pem 123
 {
     EVP_PKEY *evpKey = EVP_PKEY_new();
-    bool result = true;
+    if (!EVP_PKEY_assign_EC_KEY(evpKey, pkey))
+        return error("CKey::WritePEM() : Error initializing EVP_PKEY instance.");
+    if(!PEM_write_bio_PKCS8PrivateKey(streamObj, evpKey, EVP_aes_256_cbc(), (char *)&strPassKey[0], strPassKey.size(), NULL, NULL))
+        return error("CKey::WritePEM() : Error writing private key data to stream object");
 
-    do
-    {
-        if (!EVP_PKEY_assign_EC_KEY(evpKey, pkey))
-        {
-            result = error("CKey::WritePEM() : Error initializing EVP_PKEY instance.");
-            break;
-        }
-
-        if(!PEM_write_bio_PKCS8PrivateKey(streamObj, evpKey, EVP_aes_256_cbc(), (char *)&strPassKey[0], strPassKey.size(), NULL, NULL))
-        {
-            result = error("CKey::WritePEM() : Error writing private key data to stream object");
-            break;
-        }
-
-        if(!PEM_write_bio_PUBKEY(streamObj, evpKey))
-        {
-            result = error("CKey::WritePEM() : Error writing public key data to stream object");
-            break;
-        }
-    }
-    while(false);
-
-    EVP_PKEY_free(evpKey);
-    return result;
+    return true;
 }
 
 CSecret CKey::GetSecret() const
@@ -561,8 +541,6 @@ bool CPubKey::VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchS
     CPubKey key;
     if (!key.SetCompactSignature(hash, vchSig))
         return false;
-    if ((*this) != key)
-        return false;
     return true;
 }