From: fsb4000 <fsb4000@yandex.ru>
Date: Sun, 11 Jan 2015 08:15:29 +0000 (+0600)
Subject: OpenSSL fix
X-Git-Tag: nvc-v0.5.1~12^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=7bd596affe6c5888e0005cc6470f16b60e810d31

OpenSSL fix

https://github.com/bitcoin/bitcoin/pull/5634
---

diff --git a/src/key.cpp b/src/key.cpp
index ed04e0e..1b3f380 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -449,11 +449,23 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector<unsigned char>& v
 
 bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSig)
 {
-    // -1 = error, 0 = bad sig, 1 = good
-    if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1)
+    if (vchSig.empty())
         return false;
 
-    return true;
+    // 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];
+    d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size());
+    int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der);
+    ECDSA_SIG_free(norm_sig);
+    if (derlen <= 0)
+        return false;
+
+    // -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;
 }
 
 bool CKey::VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig)