From 99c6dd2079e3bb404ce075708120650cfe8a17fd Mon Sep 17 00:00:00 2001 From: Martin Hoffmann Date: Tue, 18 Jun 2024 10:06:24 +0200 Subject: [PATCH] Reorder Cargo.toml (and do a soft upgrade). (#1210) This PR reorders the dependency list in Cargo.toml alphabetically. It also does a soft cargo update. --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 24 +++++++----------------- 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07acb33c3..b4b056563 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -828,9 +828,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.2" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3935c160d00ac752e09787e6e6bfc26494c2183cc922f1bc678a60d4733bc2" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1442,9 +1442,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -1554,9 +1554,9 @@ dependencies = [ [[package]] name = "object" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -1696,7 +1696,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", "windows-targets 0.52.5", ] @@ -1976,9 +1976,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.5.0", ] diff --git a/Cargo.toml b/Cargo.toml index 33afc60e8..7a674b03e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,8 @@ basic-cookies = { version = "^0.1", optional = true } bytes = "1" chrono = { version = "^0.4", features = ["serde"] } clap = "^2.33" +cryptoki = { version = "^0.3", optional = true } +cryptoki-sys = { version = "=0.1.4", optional = true } # pin cryptoki-sys because of compilation issues on various systems fern = { version = "^0.5", features = ["syslog-4"] } futures = "^0.3" futures-util = "^0.3" @@ -35,9 +37,7 @@ hex = "^0.4" hyper = { version = "^0.14", features = ["server"] } intervaltree = "0.2.6" jmespatch = { version = "^0.3", features = ["sync"], optional = true } -kmip = { version = "0.4.2", package = "kmip-protocol", features = [ - "tls-with-openssl", -], optional = true } +kmip = { version = "0.4.2", package = "kmip-protocol", features = [ "tls-with-openssl" ], optional = true } kvx = { version = "0.9.3", features = ["macros"] } libflate = "^1" log = "^0.4" @@ -45,34 +45,24 @@ once_cell = { version = "^1.7.2", optional = true } openidconnect = { version = "^2.0.0", optional = true, default_features = false } openssl = { version = "^0.10", features = ["v110"] } oso = { version = "^0.12", optional = true, default_features = false } -cryptoki = { version = "^0.3", optional = true } -cryptoki-sys = { version = "=0.1.4", optional = true } # pin cryptoki-sys because of compilation issues on various systems r2d2 = { version = "0.8.9", optional = true } rand = "^0.8" -regex = { version = "1.5.5", optional = true, default_features = false, features = [ - "std", -] } +regex = { version = "1.5.5", optional = true, default_features = false, features = [ "std" ] } reqwest = { version = "0.11", features = ["json"] } rpassword = { version = "^5.0", optional = true } #rpki = { version = "0.18.0", features = ["ca", "compat", "rrdp"] } rpki = { git = "https://github.com/nLnetLabs/rpki-rs", features = [ "ca", "compat", "rrdp" ] } +rustls-pemfile = "1.0.4" scrypt = { version = "^0.6", optional = true, default-features = false } serde = { version = "^1.0", features = ["derive", "rc"] } serde_json = "^1.0" -tokio = { version = "1", features = [ - "macros", - "rt", - "rt-multi-thread", - "signal", - "time", -] } +tokio = { version = "1", features = [ "macros", "rt", "rt-multi-thread", "signal", "time" ] } tokio-rustls = "0.24.1" -rustls-pemfile = "1.0.4" # needed to parse pem files for use in our HTTPS listener toml = "^0.5" unicode-normalization = { version = "^0.1", optional = true } url = { version = "2.3.1", features = ["serde"] } urlparse = { version = "^0.7", optional = true } -uuid = { version = "1.1", features = ["v4"] } # keep this in sync with rpki-rs +uuid = { version = "1.1", features = ["v4"] } # Disable compiler optimizations for the pkcs11 crate because otherwise with a release build the # `pReserved = ptr::null_mut()` assignment done by `CK_C_INITIALIZE_ARGS::default()` appears to be optimized out. This