X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fkey.cpp;h=1c700d0754ffdb62c79d07c2b83f9a701d5507f0;hp=45270a058f89e994a1c593161fc53b8e15d99cd3;hb=73e57db0e728423c3541f5ad7b260e8fd9e6e7d1;hpb=277aab9a229676e03125453b2b2bcf5b21444d84 diff --git a/src/key.cpp b/src/key.cpp index 45270a0..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