diff --git a/Cargo.lock b/Cargo.lock index b39ad35..8de06b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -215,7 +215,7 @@ checksum = "09113ac46fb70539ed96b74af4382516fc25bfc463164eeb0ca036b9f77371d8" dependencies = [ "itertools 0.10.5", "lazy_static", - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", @@ -317,9 +317,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -327,18 +327,18 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] [[package]] name = "darling" -version = "0.13.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -346,27 +346,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.43", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.43", ] [[package]] @@ -646,9 +646,9 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memflow" -version = "0.2.0-beta11" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c33dc6396994b264c27800fd6b2270062381d01a27a1c3676de75dbb4210573" +checksum = "5e4ab23adc6b68aa85d9d2d43c04f31c51b895acb323f807ff95ed8d844639b1" dependencies = [ "abi_stable", "bitflags 1.3.2", @@ -677,20 +677,20 @@ dependencies = [ [[package]] name = "memflow-derive" -version = "0.2.0-beta3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee50e66f855a8a9c93b7c107fab899b25952ba8c7f0e97602a662a99c84fbef7" +checksum = "d766f6681f968c92eb0359fc4bc99039ebe2568df4bb884c7cb7b16023e94d32" dependencies = [ "darling", - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.43", ] [[package]] name = "memflow-win32" -version = "0.2.0-beta11" +version = "0.2.0" dependencies = [ "clap", "log", @@ -709,7 +709,7 @@ dependencies = [ [[package]] name = "memflow-win32-defs" -version = "0.2.0-beta11" +version = "0.2.0" dependencies = [ "clap", "dirs", @@ -878,16 +878,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "2.0.0" @@ -899,9 +889,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -1122,7 +1112,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -1173,7 +1163,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -1189,9 +1179,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -1238,9 +1228,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -1279,14 +1269,14 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -1306,9 +1296,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -1530,7 +1520,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", "wasm-bindgen-shared", ] @@ -1552,7 +1542,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1806,9 +1796,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" dependencies = [ "memchr", ] @@ -1827,20 +1817,20 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] diff --git a/memflow-win32-defs/Cargo.toml b/memflow-win32-defs/Cargo.toml index f956d27..0054316 100644 --- a/memflow-win32-defs/Cargo.toml +++ b/memflow-win32-defs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "memflow-win32-defs" -version = "0.2.0-beta11" +version = "0.2.0" authors = ["ko1N ", "Aurimas Blažulionis <0x60@pm.me>"] edition = "2018" description = "static offset templates for " @@ -13,7 +13,7 @@ keywords = [ "memflow", "introspection", "memory", "dma" ] categories = [ "api-bindings", "memory-management", "os" ] [dependencies] -memflow = { version = "=0.2.0-beta11", default-features = false } +memflow = { version = "0.2", default-features = false } log = { version = "^0.4.14", default-features = false } no-std-compat = { version = "^0.4.1", features = ["alloc"] } serde = { version = "^1.0.133", default-features = false, optional = true, features = ["derive"] } diff --git a/memflow-win32/Cargo.toml b/memflow-win32/Cargo.toml index f6d0368..e65d8ad 100644 --- a/memflow-win32/Cargo.toml +++ b/memflow-win32/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "memflow-win32" -version = "0.2.0-beta11" +version = "0.2.0" authors = ["ko1N ", "Aurimas Blažulionis <0x60@pm.me>"] edition = "2021" rust-version = "1.65" @@ -21,13 +21,13 @@ codecov = { repository = "github", branch = "master", service = "github" } crate-type = ["lib", "cdylib"] [dependencies] -memflow = { version = "=0.2.0-beta11", default-features = false } +memflow = { version = "0.2", default-features = false } log = { version = "^0.4.14", default-features = false } pelite = { version = "^0.10.0", default-features = false } widestring = { version = "^1.0.2", default-features = false, features = ["alloc"] } no-std-compat = { version = "^0.4.1", features = ["alloc"] } serde = { version = "^1.0.133", default-features = false, optional = true, features = ["derive"] } -memflow-win32-defs = { version = "0.2.0-beta11", path = "../memflow-win32-defs", default-features = false } +memflow-win32-defs = { version = "0.2", path = "../memflow-win32-defs", default-features = false } # will be replaced by our own signature scanner regex = { version = "^1.5.0", optional = true } @@ -42,8 +42,8 @@ toml = "^0.7.3" [build_dependencies] toml = "^0.7.3" serde = { version = "^1.0.133", default-features = false, features = ["derive", "alloc"] } -memflow = { version = "=0.2.0-beta11", default-features = false } -memflow-win32-defs = { version = "0.2.0-beta11", path = "../memflow-win32-defs", features = ["symstore"] } +memflow = { version = "0.2", default-features = false } +memflow-win32-defs = { version = "0.2", path = "../memflow-win32-defs", features = ["symstore"] } [features] default = ["std", "serde_derive", "embed_offsets", "symstore", "download_progress", "regex", "memflow/default"] diff --git a/memflow-win32/src/kernel/start_block/aarch64.rs b/memflow-win32/src/kernel/start_block/aarch64.rs index 3e47908..5607b9e 100644 --- a/memflow-win32/src/kernel/start_block/aarch64.rs +++ b/memflow-win32/src/kernel/start_block/aarch64.rs @@ -34,7 +34,7 @@ fn find_pt(addr: Address, mem: &[u8]) -> Option
{ mem[0x800..] .chunks(8) .map(|c| u64::from_le_bytes(c.try_into().unwrap())) - .filter(|a| (a & 0xfff) == 0x703) + .filter(|a| (a & 0xff) == 0x03) .nth(5)?; Some(addr)