Merge pull request #5349

0125988 Implement test for merkle tree malleability in CPartialMerkleTree (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan 2015-01-02 17:59:54 +01:00
commit f55c5e9749
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 19 additions and 2 deletions

View file

@ -93,10 +93,16 @@ uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, uns
} else {
// otherwise, descend into the subtrees to extract matched txids and hashes
uint256 left = TraverseAndExtract(height-1, pos*2, nBitsUsed, nHashUsed, vMatch), right;
if (pos*2+1 < CalcTreeWidth(height-1))
if (pos*2+1 < CalcTreeWidth(height-1)) {
right = TraverseAndExtract(height-1, pos*2+1, nBitsUsed, nHashUsed, vMatch);
else
if (right == left) {
// If the left and right branch should never be identical as the transaction
// hashes covered by them must be unique.
fBad = true;
}
} else {
right = left;
}
// and combine them before returning
return Hash(BEGIN(left), END(left), BEGIN(right), END(right));
}

View file

@ -10,6 +10,7 @@
#include <vector>
#include <boost/assign/list_of.hpp>
#include <boost/test/unit_test.hpp>
using namespace std;
@ -104,4 +105,14 @@ BOOST_AUTO_TEST_CASE(pmt_test1)
}
}
BOOST_AUTO_TEST_CASE(pmt_malleability)
{
std::vector<uint256> vTxid = boost::assign::list_of(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(9)(10);
std::vector<bool> vMatch = boost::assign::list_of(false)(false)(false)(false)(false)(false)(false)(false)(false)(true)(true)(false);
CPartialMerkleTree tree(vTxid, vMatch);
std::vector<uint256> vTxid2;
BOOST_CHECK(tree.ExtractMatches(vTxid) == 0);
}
BOOST_AUTO_TEST_SUITE_END()