diff --git a/Cargo.lock b/Cargo.lock index e594473ad..9a51f84c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -186,6 +186,7 @@ dependencies = [ "blake2", "cpufeatures", "password-hash", + "zeroize", ] [[package]] @@ -2850,7 +2851,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core 0.51.1", ] [[package]] @@ -3260,7 +3261,7 @@ dependencies = [ "netlink-packet-route", "netlink-sys", "netwatch", - "num_enum 0.7.3", + "num_enum", "once_cell", "parking_lot", "pin-project", @@ -4021,34 +4022,13 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - [[package]] name = "num_enum" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive 0.7.3", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] @@ -4057,7 +4037,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.90", @@ -4354,15 +4334,15 @@ dependencies = [ [[package]] name = "pgp" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49bb5f77aaf8ae1ed6fe63387ad513b10cd44716fd053ecc227b9493c096cdb2" +checksum = "1877a97fd422433220ad272eb008ec55691944b1200e9eb204e3cb2cb69d34e9" dependencies = [ "aes", "aes-gcm", "aes-kw", "argon2", - "base64 0.21.7", + "base64 0.22.1", "bitfield", "block-padding", "blowfish", @@ -4398,7 +4378,7 @@ dependencies = [ "nom", "num-bigint-dig", "num-traits", - "num_enum 0.5.11", + "num_enum", "ocb3", "p256", "p384", @@ -4632,7 +4612,7 @@ dependencies = [ "iroh-metrics", "libc", "netwatch", - "num_enum 0.7.3", + "num_enum", "rand 0.8.5", "serde", "smallvec", @@ -4734,23 +4714,13 @@ dependencies = [ "elliptic-curve", ] -[[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 = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -5306,9 +5276,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" dependencies = [ "const-oid", "digest", @@ -5806,6 +5776,7 @@ checksum = "89f599ac0c323ebb1c6082821a54962b839832b03984598375bff3975b804423" dependencies = [ "digest", "sha1", + "zeroize", ] [[package]] @@ -6560,7 +6531,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -6572,17 +6543,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" @@ -6593,7 +6553,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -7339,15 +7299,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.18" diff --git a/Cargo.toml b/Cargo.toml index c60c5a677..8fd69e592 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ num-traits = { workspace = true } once_cell = { workspace = true } parking_lot = "0.12" percent-encoding = "2.3" -pgp = { version = "0.14.0", default-features = false } +pgp = { version = "0.14.2", default-features = false } pin-project = "1" qrcodegen = "1.7.0" quick-xml = "0.37" diff --git a/deny.toml b/deny.toml index 3b559f047..a2e17e9d5 100644 --- a/deny.toml +++ b/deny.toml @@ -39,9 +39,6 @@ skip = [ { name = "http", version = "0.2.12" }, { name = "idna", version = "0.5.0" }, { name = "nix", version = "0.26.4" }, - { name = "num_enum_derive", version = "0.5.11" }, - { name = "num_enum", version = "0.5.11" }, - { name = "proc-macro-crate", version = "1.3.1" }, { name = "quick-error", version = "<2.0" }, { name = "rand_chacha", version = "<0.3" }, { name = "rand_core", version = "<0.6" }, @@ -52,7 +49,6 @@ skip = [ { name = "sync_wrapper", version = "0.1.2" }, { name = "syn", version = "1.0.109" }, { name = "time", version = "<0.3" }, - { name = "toml_edit", version = "0.19.15" }, { name = "wasi", version = "<0.11" }, { name = "windows_aarch64_gnullvm", version = "<0.52" }, { name = "windows_aarch64_msvc", version = "<0.52" }, @@ -65,7 +61,6 @@ skip = [ { name = "windows_x86_64_gnullvm", version = "<0.52" }, { name = "windows_x86_64_gnu", version = "<0.52" }, { name = "windows_x86_64_msvc", version = "<0.52" }, - { name = "winnow", version = "0.5.40" }, { name = "winreg", version = "0.50.0" }, ]