diff --git a/Cargo.lock b/Cargo.lock index 64e536d5ba..3ec5837577 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -233,16 +233,14 @@ checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "bindgen" -version = "0.66.1" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.4.2", "cexpr", "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", + "itertools", "proc-macro2", "quote", "regex", @@ -274,23 +272,25 @@ dependencies = [ [[package]] name = "boring" -version = "3.1.0" +version = "4.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece" +checksum = "1f5aac023c3ba13725de1604aff621a9dbf9a4f3af1ea6fb712bca91ad729a8e" dependencies = [ "bitflags 2.4.2", "boring-sys", "foreign-types", "libc", "once_cell", + "openssl-macros", ] [[package]] name = "boring-sys" -version = "3.1.0" +version = "4.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481" +checksum = "ebabcc15924f3244f244cfb1dfe43c0b28236ea8c1f71dc8e5a146eae0342d79" dependencies = [ + "autocfg", "bindgen", "cmake", "fs_extra", @@ -1237,12 +1237,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.169" @@ -2940,6 +2934,17 @@ dependencies = [ "tonic-build", ] +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "opentelemetry" version = "0.27.1" @@ -3009,12 +3014,6 @@ dependencies = [ "windows-targets 0.52.0", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.4" @@ -3827,12 +3826,13 @@ dependencies = [ [[package]] name = "tokio-boring" -version = "3.1.0" +version = "4.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961385cffda2112d02c6e17169965ed604b9953078f2ec55740b8cf7b55c122e" +checksum = "e37b8f984fc360dee7b04fe901d10af3f4af08715ec21260cb600ac9cdad3a0c" dependencies = [ "boring", "boring-sys", + "once_cell", "tokio", ] diff --git a/linkerd/meshtls/boring/Cargo.toml b/linkerd/meshtls/boring/Cargo.toml index ae928c0e90..61618e91ec 100644 --- a/linkerd/meshtls/boring/Cargo.toml +++ b/linkerd/meshtls/boring/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" publish = false [dependencies] -boring = "3" +boring = "4" futures = { version = "0.3", default-features = false } -hex = "0.4" # used for debug logging +hex = "0.4" # used for debug logging linkerd-error = { path = "../../error" } linkerd-dns-name = { path = "../../dns/name" } linkerd-identity = { path = "../../identity" } @@ -19,7 +19,7 @@ linkerd-tls = { path = "../../tls" } linkerd-meshtls-verifier = { path = "../verifier" } tokio = { version = "1", features = ["macros", "sync"] } -tokio-boring = "3" +tokio-boring = "4" tracing = "0.1" [features] @@ -28,4 +28,3 @@ fips = ["boring/fips"] [dev-dependencies] linkerd-tls-test-util = { path = "../../tls/test-util" } linkerd-meshtls = { path = "../../meshtls" } -