cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-17 17:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

consensus: guard against openssl's new strict DER checks

Browse Source 
New versions of OpenSSL will reject non-canonical DER signatures. However,
it'll happily decode them. Decode then re-encode before verification in order
to ensure that it is properly consumed.

Github-Pull: #5634
Rebased-From: 488ed32f2ada1d1dd108fc245d025c4d5f252783
This commit is contained in:
Cory Fields 2015-01-09 16:39:12 -05:00 committed by Wladimir J. van der Laan
parent 0a94661e8d
commit b8e81b7ccd
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/key.cpp
View File

@ -227,10 +227,20 @@ public:
} }
bool Verify(const uint256 &hash, const std::vector<unsigned char>& vchSig) { bool Verify(const uint256 &hash, const std::vector<unsigned char>& vchSig) {
// -1 = error, 0 = bad sig, 1 = good // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first.
if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) 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; return false;
return true;
// -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 SignCompact(const uint256 &hash, unsigned char *p64, int &rec) { bool SignCompact(const uint256 &hash, unsigned char *p64, int &rec) {