diff --git a/rust/Cargo.lock.in b/rust/Cargo.lock.in index b67601eaa6..56e4fdde43 100644 --- a/rust/Cargo.lock.in +++ b/rust/Cargo.lock.in @@ -85,7 +85,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" dependencies = [ - "asn1-rs-derive", + "asn1-rs-derive 0.5.1", "asn1-rs-impl", "displaydoc", "nom", @@ -95,6 +95,21 @@ dependencies = [ "time", ] +[[package]] +name = "asn1-rs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60" +dependencies = [ + "asn1-rs-derive 0.6.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits 0.2.19", + "rusticata-macros", + "thiserror 2.0.12", +] + [[package]] name = "asn1-rs-derive" version = "0.5.1" @@ -107,6 +122,18 @@ dependencies = [ "synstructure 0.13.2", ] +[[package]] +name = "asn1-rs-derive" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", + "synstructure 0.13.2", +] + [[package]] name = "asn1-rs-impl" version = "0.2.0" @@ -345,7 +372,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ - "asn1-rs", + "asn1-rs 0.6.2", "displaydoc", "nom", "num-bigint 0.4.6", @@ -697,11 +724,11 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "ldap-parser" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fde2bd93cf7db2fdba06379826baee0d5414ea093c8c1946701b5a6df046d3" +checksum = "db3356a3bd19e90fdc8b29f32c48e21b1bb1c5d129c1df7000ce3071c6f9e6b1" dependencies = [ - "asn1-rs", + "asn1-rs 0.7.1", "rusticata-macros", "thiserror 2.0.12", ] @@ -998,7 +1025,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" dependencies = [ - "asn1-rs", + "asn1-rs 0.6.2", ] [[package]] @@ -1466,7 +1493,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f93180ada23141ed2643b7b4a7b20c7efea6af9c6bdc997c15b813bfa6e2c20" dependencies = [ - "asn1-rs", + "asn1-rs 0.6.2", "nom", "rusticata-macros", "thiserror 1.0.69", @@ -1484,7 +1511,7 @@ version = "8.0.0-rc1-dev" dependencies = [ "aes", "aes-gcm", - "asn1-rs", + "asn1-rs 0.6.2", "base64", "bendy", "bitflags 1.3.2", @@ -2026,7 +2053,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ - "asn1-rs", + "asn1-rs 0.6.2", "data-encoding", "der-parser", "lazy_static", diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in index d7984f1c1c..5f9700e6d5 100644 --- a/rust/Cargo.toml.in +++ b/rust/Cargo.toml.in @@ -76,7 +76,7 @@ lazy_static = "~1.5.0" base64 = "~0.22.1" bendy = { version = "~0.3.3", default-features = false } asn1-rs = { version = "~0.6.2" } -ldap-parser = { version = "~0.4.1" } +ldap-parser = { version = "~0.5.0" } hex = "~0.4.3" psl = "2" diff --git a/rust/src/ldap/types.rs b/rust/src/ldap/types.rs index 224d9376dc..8ee2ccfa0f 100644 --- a/rust/src/ldap/types.rs +++ b/rust/src/ldap/types.rs @@ -21,7 +21,7 @@ use std::convert::From; use std::fmt; use std::fmt::{Display, Formatter}; -use asn1_rs::{FromBer, ParseResult}; +use ldap_parser::asn1_rs::{FromBer, ParseResult}; use ldap_parser::error::LdapError; use crate::ldap::filters::*;