GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CreatePAKListFromExtensionSpace just uses FromBytes for correctness

Browse source
This commit is contained in:
Gregory Sanders 2019-06-14 14:32:01 -04:00
parent 7e4f88b688
commit cc2f57a960
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/primitives/pak.cpp
View file

@ -175,22 +175,17 @@ bool ScriptHasValidPAKProof(const CScript& script, const uint256& genesis_hash,
CPAKList CreatePAKListFromExtensionSpace(const std::vector<std::vector<unsigned char>>& extension_space) CPAKList CreatePAKListFromExtensionSpace(const std::vector<std::vector<unsigned char>>& extension_space)
{ {
CPAKList paklist;
std::vector<std::vector<unsigned char>> offline_keys; std::vector<std::vector<unsigned char>> offline_keys;
std::vector<std::vector<unsigned char>> online_keys; std::vector<std::vector<unsigned char>> online_keys;
for (const auto& entry : extension_space) { for (const auto& entry : extension_space) {
// As soon as we find something that is possibly not 2 serialized pubkeys
// we stop looking. CPAKList::FromBytes does pubkey validation itself.
if (entry.size() != 66) { if (entry.size() != 66) {
break; return CPAKList();
} }
// Dumbly tries to extract two pubkeys, relies on FromBytes to parse/validate
offline_keys.emplace_back(entry.begin(), entry.begin()+33); offline_keys.emplace_back(entry.begin(), entry.begin()+33);
online_keys.emplace_back(entry.begin()+33, entry.end()); online_keys.emplace_back(entry.begin()+33, entry.end());
// Allow additional data, just ignore
if (offline_keys.size() == SECP256K1_WHITELIST_MAX_N_KEYS) {
break;
}
} }
CPAKList paklist;
if (!CPAKList::FromBytes(paklist, offline_keys, online_keys)) { if (!CPAKList::FromBytes(paklist, offline_keys, online_keys)) {
return CPAKList(); return CPAKList();
} }