milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

PSBT: Improved global keys version and xpub handling

This commit is contained in:
Dr Maxim Orlovsky 2020-12-16 16:46:28 +01:00
parent 21c11e3315
commit b84faa7f5e
No known key found for this signature in database
GPG Key ID: FFC0250947E5C6F7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/psbt/map/global.rs
View File

@ -263,15 +263,15 @@ impl Decodable for Global {
"Can't deserialize ExtendedPublicKey from global XPUB key data" "Can't deserialize ExtendedPublicKey from global XPUB key data"
))?; ))?;
if pair.value.len() % 4 != 0 { if pair.value.is_empty() || pair.value.len() % 4 != 0 {
return Err(encode::Error::ParseFailed("Incorrect length of global xpub list")) return Err(encode::Error::ParseFailed("Incorrect length of global xpub derivation data"))
} }
let keys_count = pair.value.len() / 4 - 1; let child_count = pair.value.len() / 4 - 1;
let mut decoder = Cursor::new(pair.value); let mut decoder = Cursor::new(pair.value);
let mut fingerprint = [0u8; 4]; let mut fingerprint = [0u8; 4];
decoder.read_exact(&mut fingerprint[..])?; decoder.read_exact(&mut fingerprint[..])?;
let mut path = Vec::<ChildNumber>::with_capacity(keys_count); let mut path = Vec::<ChildNumber>::with_capacity(child_count);
while let Ok(index) = u32::consensus_decode(&mut decoder) { while let Ok(index) = u32::consensus_decode(&mut decoder) {
path.push(ChildNumber::from(index)) path.push(ChildNumber::from(index))
} }
@ -295,8 +295,10 @@ impl Decodable for Global {
return Err(encode::Error::ParseFailed("Wrong global version value length (must be 4 bytes)")) return Err(encode::Error::ParseFailed("Wrong global version value length (must be 4 bytes)"))
} }
version = Some(Decodable::consensus_decode(&mut decoder)?); version = Some(Decodable::consensus_decode(&mut decoder)?);
if decoder.position() != vlen as u64 { // We only understand version 0 PSBTs. According to BIP-174 we
return Err(encode::Error::ParseFailed("data not consumed entirely when explicitly deserializing")) // should throw an error if we see anything other than version 0.
if version != Some(0) {
return Err(encode::Error::ParseFailed("PSBT versions greater than 0 are not supported"))
} }
} else { } else {
return Err(Error::DuplicateKey(pair.key).into()) return Err(Error::DuplicateKey(pair.key).into())