diff --git a/Cargo.lock b/Cargo.lock index e4904a28f..c3252c247 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1199,7 +1199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid 0.9.6", - "der_derive", + "der_derive 0.7.3", "flagset", "pem-rfc7468 0.7.0", "zeroize", @@ -1212,6 +1212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b" dependencies = [ "const-oid 0.10.2", + "der_derive 0.8.0", "pem-rfc7468 1.0.0", "zeroize", ] @@ -1240,6 +1241,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "der_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59600e2c2d636fde9b65e99cc6445ac770c63d3628195ff39932b8d6d7409903" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "deranged" version = "0.5.8" @@ -2743,13 +2755,13 @@ dependencies = [ "expect-test", "ironrdp-core", "ironrdp-error", - "md-5 0.10.6", + "md-5", "num-bigint 0.4.6", "num-derive", "num-integer", "num-traits", "pkcs1 0.7.5", - "sha1 0.10.6", + "sha1 0.11.0", "tap", "x509-cert", ] @@ -2769,7 +2781,7 @@ dependencies = [ name = "ironrdp-rdcleanpath" version = "0.2.2" dependencies = [ - "der 0.7.10", + "der 0.8.0", ] [[package]] @@ -3341,16 +3353,6 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest 0.10.7", -] - [[package]] name = "md-5" version = "0.11.0" @@ -4182,7 +4184,7 @@ dependencies = [ "hmac", "http", "inout", - "md-5 0.11.0", + "md-5", "p256", "p384", "p521", @@ -5603,7 +5605,7 @@ dependencies = [ "getrandom 0.3.4", "group", "hmac", - "md-5 0.11.0", + "md-5", "md4", "num-derive", "num-traits", diff --git a/crates/ironrdp-pdu/Cargo.toml b/crates/ironrdp-pdu/Cargo.toml index 17ba0dcf4..39cf1b6d7 100644 --- a/crates/ironrdp-pdu/Cargo.toml +++ b/crates/ironrdp-pdu/Cargo.toml @@ -35,12 +35,12 @@ tap = "1" bit_field = "0.10" byteorder = "1.5" # TODO: remove der-parser = "10.0" -md5 = { package = "md-5", version = "0.10" } +md5 = { package = "md-5", version = "0.11" } num-bigint = "0.4" num-derive.workspace = true # TODO: remove num-integer = "0.1" num-traits.workspace = true # TODO: remove -sha1 = "0.10" +sha1 = "0.11" x509-cert = { version = "0.2", default-features = false, features = ["std"] } pkcs1 = "0.7" diff --git a/crates/ironrdp-rdcleanpath/Cargo.toml b/crates/ironrdp-rdcleanpath/Cargo.toml index 7c88376bc..d30bb499a 100644 --- a/crates/ironrdp-rdcleanpath/Cargo.toml +++ b/crates/ironrdp-rdcleanpath/Cargo.toml @@ -17,7 +17,7 @@ doctest = false test = false [dependencies] -der = { version = "0.7", features = ["alloc", "derive"] } # public +der = { version = "0.8", features = ["alloc", "derive"] } # public [lints] workspace = true diff --git a/crates/ironrdp-rdcleanpath/src/lib.rs b/crates/ironrdp-rdcleanpath/src/lib.rs index b884ba853..644d15497 100644 --- a/crates/ironrdp-rdcleanpath/src/lib.rs +++ b/crates/ironrdp-rdcleanpath/src/lib.rs @@ -255,7 +255,7 @@ impl RDCleanPathPdu { let (Ok(header_encoded_len), Ok(body_length)) = ( header.encoded_len().and_then(usize::try_from), - usize::try_from(header.length), + usize::try_from(header.length()), ) else { return DetectionResult::Failed; }; @@ -264,7 +264,7 @@ impl RDCleanPathPdu { return DetectionResult::Failed; }; - match der::asn1::ContextSpecific::::decode_explicit(&mut slice_reader, der::TagNumber::N0) { + match der::asn1::ContextSpecific::::decode_explicit(&mut slice_reader, der::TagNumber(0)) { Ok(Some(version)) if version.value == VERSION_1 => DetectionResult::Detected { version: VERSION_1, total_length,