X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkey.cpp;h=1ed4e25087db9e8786db0a40170f5aef19efe1ae;hb=510a23a2c838245cd4681ed0b4fbce48e8ebf506;hp=2c3a8498f510f610989085b611a4c2a33c472cf1;hpb=b53a9002dadbb1887bebd7bc7bdb5468a29f4ebf;p=novacoin.git

diff --git a/src/key.cpp b/src/key.cpp
index 2c3a849..1ed4e25 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -497,35 +497,37 @@ bool CPubKey::Verify(const uint256 &hash, const std::vector<unsigned char>& vchS
     if (vchSig.empty() || !IsValid())
         return false;
 
-    const unsigned char* pbegin = &vbytes[0];
     EC_KEY *pkey = EC_KEY_new_by_curve_name(NID_secp256k1);
-    if (!o2i_ECPublicKey(&pkey, &pbegin, size()))
-        return false; // Unable to parse public key
-
-    // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first.
-    unsigned char *norm_der = NULL;
     ECDSA_SIG *norm_sig = ECDSA_SIG_new();
-    const unsigned char* sigptr = &vchSig[0];
+
     assert(norm_sig);
-    if (d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size()) == NULL)
+    assert(pkey);
+
+    bool ret = false;
+    do
     {
-        /* As of OpenSSL 1.0.0p d2i_ECDSA_SIG frees and nulls the pointer on
-        * error. But OpenSSL's own use of this function redundantly frees the
-        * result. As ECDSA_SIG_free(NULL) is a no-op, and in the absence of a
-        * clear contract for the function behaving the same way is more
-        * conservative.
-        */
-        ECDSA_SIG_free(norm_sig);
-        return false;
-    }
-    int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der);
+        int derlen;
+        uint8_t *norm_der = NULL;
+        const uint8_t* pbegin = &vbytes[0];
+        const uint8_t* sigptr = &vchSig[0];
+
+        // Trying to parse public key
+        if (!o2i_ECPublicKey(&pkey, &pbegin, size()))
+            break;
+        // New versions of OpenSSL are rejecting a non-canonical DER signatures, de/re-serialize first.
+        if (d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size()) == NULL)
+            break;
+        if ((derlen = i2d_ECDSA_SIG(norm_sig, &norm_der)) <= 0)
+            break;
+
+        // -1 = error, 0 = bad sig, 1 = good
+        ret = ECDSA_verify(0, (const unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1;
+        OPENSSL_free(norm_der);
+    } while(false);
+
     ECDSA_SIG_free(norm_sig);
-    if (derlen <= 0)
-        return false;
+    EC_KEY_free(pkey);
 
-    // -1 = error, 0 = bad sig, 1 = good
-    bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1;
-    OPENSSL_free(norm_der);
     return ret;
 }