rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #527 from triska/master

Browse Source 
Add type checks to increase robustness of library(crypto)
This commit is contained in:
Mark Thom
2020-05-18 11:18:58 -03:00
committed by GitHub
parent c14259060c a423eb5323
commit ac755b0ada
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/prolog/machine/system_calls.rs
View File

@@ -5275,7 +5275,10 @@ impl MachineState {
let salt = hkdf::Salt::new(digest_alg, &salt);
let mut bytes : Vec<u8> = Vec::new();
bytes.resize(length, 0);
salt.extract(&data).expand(&[&info[..]], MyKey(length)).unwrap().fill(&mut bytes).unwrap();
match salt.extract(&data).expand(&[&info[..]], MyKey(length)) {
Ok(r) => { r.fill(&mut bytes).unwrap(); }
_ => { self.fail = true; return Ok(()); }
}
Addr::HeapCell(self.heap.to_list(bytes.iter().map(|b| HeapCellValue::Integer(Rc::new(Integer::from(*b))))))
};
@@ -5294,7 +5297,10 @@ impl MachineState {
u64::try_from(n).unwrap()
}
Ok(Number::Integer(n)) => {
n.to_u64().unwrap()
match n.to_u64() {
Some(i) => { i }
None => { self.fail = true; return Ok(()); }
}
}
_ => {
unreachable!()