SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pyo3 crate to 0.18.3 (#1255)

Browse Source 
Co-authored-by: Dongjia "toka" Zhang <tokazerkje@outlook.com>
This commit is contained in:
Kevin Phoenix 2023-05-10 11:01:51 -07:00 committed by GitHub
parent a2719cf559
commit 6883c776ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/pylibafl/Cargo.toml
View File

@ -4,7 +4,7 @@ version = "0.10.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
pyo3 = { version = "0.17", features = ["extension-module"] } pyo3 = { version = "0.18.3", features = ["extension-module"] }
pyo3-log = "0.8.1" pyo3-log = "0.8.1"
libafl_qemu = { path = "../../libafl_qemu", version = "0.10.0", features = ["python"] } libafl_qemu = { path = "../../libafl_qemu", version = "0.10.0", features = ["python"] }
libafl_sugar = { path = "../../libafl_sugar", version = "0.10.0", features = ["python"] } libafl_sugar = { path = "../../libafl_sugar", version = "0.10.0", features = ["python"] }

2
libafl/Cargo.toml
View File

@ -100,7 +100,7 @@ wait-timeout = { version = "0.2", optional = true } # used by CommandExecutor to
z3 = { version = "0.11", features = ["static-link-z3"], optional = true } # for concolic mutation z3 = { version = "0.11", features = ["static-link-z3"], optional = true } # for concolic mutation
pyo3 = { version = "0.17", optional = true, features = ["serde", "macros"] } pyo3 = { version = "0.18.3", optional = true, features = ["serde", "macros"] }
concat-idents = { version = "1.1.3", optional = true } concat-idents = { version = "1.1.3", optional = true }
libcasr = { version = "2.5", optional = true} libcasr = { version = "2.5", optional = true}

3
libafl_qemu/Cargo.toml
View File

@ -49,8 +49,7 @@ syscall-numbers = "3.0"
meminterval = "0.3" meminterval = "0.3"
thread_local = "1.1.4" thread_local = "1.1.4"
capstone = "0.11.0" capstone = "0.11.0"
#pyo3 = { version = "0.15", features = ["extension-module"], optional = true } pyo3 = { version = "0.18.3", optional = true }
pyo3 = { version = "0.17", features = ["pyproto"], optional = true }
rangemap = "1.0" rangemap = "1.0"
log = "0.4.17" log = "0.4.17"

8
libafl_qemu/src/emu.rs
View File

@ -85,7 +85,7 @@ impl From<libafl_qemu_sys::MemOpIdx> for MemAccessInfo {
} }
#[cfg(feature = "python")] #[cfg(feature = "python")]
use pyo3::{prelude::*, PyIterProtocol}; use pyo3::prelude::*;
pub const SKIP_EXEC_HOOK: u64 = u64::MAX; pub const SKIP_EXEC_HOOK: u64 = u64::MAX;
@ -444,8 +444,8 @@ impl Iterator for GuestMaps {
} }
#[cfg(all(emulation_mode = "usermode", feature = "python"))] #[cfg(all(emulation_mode = "usermode", feature = "python"))]
#[pyproto] #[pymethods]
impl PyIterProtocol for GuestMaps { impl GuestMaps {
fn __iter__(slf: PyRef<Self>) -> PyRef<Self> { fn __iter__(slf: PyRef<Self>) -> PyRef<Self> {
slf slf
} }
@ -1184,7 +1184,7 @@ pub mod pybind {
if any.is_none() { if any.is_none() {
SyscallHookResult::new(None) SyscallHookResult::new(None)
} else { } else {
let a: Result<&PyInt, _> = any.cast_as(); let a: Result<&PyInt, _> = any.downcast();
if let Ok(i) = a { if let Ok(i) = a {
SyscallHookResult::new(Some( SyscallHookResult::new(Some(
i.extract().expect("Invalid syscall hook return value"), i.extract().expect("Invalid syscall hook return value"),

3
libafl_sugar/Cargo.toml
View File

@ -32,8 +32,7 @@ libafl_targets = { path = "../libafl_targets", version = "0.10.0" }
libafl_qemu = { path = "../libafl_qemu", version = "0.10.0" } libafl_qemu = { path = "../libafl_qemu", version = "0.10.0" }
typed-builder = "0.12" # Implement the builder pattern at compiletime typed-builder = "0.12" # Implement the builder pattern at compiletime
#pyo3 = { version = "0.17", features = ["extension-module"], optional = true } pyo3 = { version = "0.18.3", optional = true }
pyo3 = { version = "0.17", optional = true }
log = "0.4.17" log = "0.4.17"
[lib] [lib]