Unverified Commit f45bd69e by Enkelmann Committed by GitHub

Update Cargo and Ghidra dependencies (#206)

parent 4b1e5bc5
...@@ -76,12 +76,6 @@ checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" ...@@ -76,12 +76,6 @@ checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "cfg-if"
version = "1.0.0" version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
...@@ -120,22 +114,21 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" ...@@ -120,22 +114,21 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.4.4" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
dependencies = [ dependencies = [
"cfg-if",
"crossbeam-utils", "crossbeam-utils",
"maybe-uninit",
] ]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.7.2" version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
dependencies = [ dependencies = [
"autocfg", "cfg-if",
"cfg-if 0.1.10",
"lazy_static", "lazy_static",
] ]
...@@ -185,9 +178,9 @@ dependencies = [ ...@@ -185,9 +178,9 @@ dependencies = [
[[package]] [[package]]
name = "directories" name = "directories"
version = "3.0.2" version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7" checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
dependencies = [ dependencies = [
"dirs-sys", "dirs-sys",
] ]
...@@ -217,9 +210,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ...@@ -217,9 +210,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]] [[package]]
name = "fixedbitset" name = "fixedbitset"
version = "0.2.0" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
[[package]] [[package]]
name = "fnv" name = "fnv"
...@@ -245,16 +238,16 @@ version = "0.2.3" ...@@ -245,16 +238,16 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if",
"libc", "libc",
"wasi", "wasi",
] ]
[[package]] [[package]]
name = "goblin" name = "goblin"
version = "0.2.3" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884" checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926"
dependencies = [ dependencies = [
"log", "log",
"plain", "plain",
...@@ -334,7 +327,7 @@ version = "0.4.14" ...@@ -334,7 +327,7 @@ version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if",
] ]
[[package]] [[package]]
...@@ -350,15 +343,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -350,15 +343,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
[[package]] [[package]]
name = "memoffset"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
dependencies = [
"autocfg",
]
[[package]]
name = "nix" name = "nix"
version = "0.19.1" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cc", "cc",
"cfg-if 1.0.0", "cfg-if",
"libc", "libc",
"memoffset",
] ]
[[package]] [[package]]
...@@ -372,9 +375,9 @@ dependencies = [ ...@@ -372,9 +375,9 @@ dependencies = [
[[package]] [[package]]
name = "petgraph" name = "petgraph"
version = "0.5.1" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
dependencies = [ dependencies = [
"fixedbitset", "fixedbitset",
"indexmap", "indexmap",
......
...@@ -5,7 +5,7 @@ WORKDIR /cwe_checker ...@@ -5,7 +5,7 @@ WORKDIR /cwe_checker
COPY . . COPY . .
RUN cargo build --release RUN cargo build --release
FROM fkiecad/ghidra_headless_base:9.2.1 as runtime FROM fkiecad/ghidra_headless_base:10.0.4 as runtime
RUN apt-get -y update \ RUN apt-get -y update \
&& apt-get -y install sudo \ && apt-get -y install sudo \
......
...@@ -8,5 +8,5 @@ edition = "2018" ...@@ -8,5 +8,5 @@ edition = "2018"
structopt = "0.3" structopt = "0.3"
cwe_checker_lib = { path = "../cwe_checker_lib" } cwe_checker_lib = { path = "../cwe_checker_lib" }
serde_json = "1.0" serde_json = "1.0"
directories = "3.0" directories = "4.0.1"
nix = "0.19.1" nix = "0.23.0"
\ No newline at end of file \ No newline at end of file
...@@ -10,13 +10,13 @@ regex = "1.4.5" ...@@ -10,13 +10,13 @@ regex = "1.4.5"
serde = {version = "1.0", features = ["derive", "rc"]} serde = {version = "1.0", features = ["derive", "rc"]}
serde_json = "1.0" serde_json = "1.0"
serde_yaml = "0.8" serde_yaml = "0.8"
petgraph = { version = "0.5", features = ["default", "serde-1"] } petgraph = { version = "0.6", features = ["default", "serde-1"] }
fnv = "1.0" # a faster hash function for small keys like integers fnv = "1.0" # a faster hash function for small keys like integers
anyhow = "1.0" # for easy error types anyhow = "1.0" # for easy error types
crossbeam-channel = "0.4" crossbeam-channel = "0.5.1"
derive_more = "0.99" derive_more = "0.99"
directories = "3.0" directories = "4.0.1"
goblin = "0.2" goblin = "0.4.2"
itertools = "0.10.0" itertools = "0.10.0"
gcd = "2.0" gcd = "2.0"
......
...@@ -42,7 +42,7 @@ pub fn check_cwe( ...@@ -42,7 +42,7 @@ pub fn check_cwe(
match goblin::Object::parse(binary) { match goblin::Object::parse(binary) {
Ok(goblin::Object::Elf(elf_binary)) => { Ok(goblin::Object::Elf(elf_binary)) => {
for section_header in elf_binary.section_headers { for section_header in elf_binary.section_headers {
if let Some(Ok(section_name)) = elf_binary.shdr_strtab.get(section_header.sh_name) { if let Some(section_name) = elf_binary.shdr_strtab.get_at(section_header.sh_name) {
if section_name.starts_with(".debug") { if section_name.starts_with(".debug") {
let cwe_warning = CweWarning::new( let cwe_warning = CweWarning::new(
CWE_MODULE.name, CWE_MODULE.name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment