diff --git a/Cargo.lock b/Cargo.lock index 9312e1680e..f119137867 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -280,6 +280,25 @@ dependencies = [ "generic-array 0.14.3", ] +[[package]] +name = "block-cipher-trait" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" +dependencies = [ + "generic-array 0.12.3", +] + +[[package]] +name = "block-modes" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" +dependencies = [ + "block-cipher-trait", + "block-padding", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -623,6 +642,17 @@ dependencies = [ "log 0.4.11", ] +[[package]] +name = "des" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74ba5f1b5aee9772379c2670ba81306e65a93c0ee3caade7a1d22b188d88a3af" +dependencies = [ + "block-cipher-trait", + "byteorder", + "opaque-debug 0.2.3", +] + [[package]] name = "device-types" version = "0.1.4" @@ -2364,8 +2394,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", - "security-framework-sys", + "security-framework 0.4.4", + "security-framework-sys 0.4.3", "tempfile", ] @@ -2512,6 +2542,21 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "p12" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14e9eb95896174110548df49573a1512e0c02f43ea2b1b2b963b946abd759e27" +dependencies = [ + "block-cipher-trait", + "block-modes", + "des", + "lazy_static", + "rc2", + "ring", + "yasna", +] + [[package]] name = "parking_lot" version = "0.11.0" @@ -2544,17 +2589,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -[[package]] -name = "pem" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b" -dependencies = [ - "base64 0.12.3", - "once_cell", - "regex", -] - [[package]] name = "percent-encoding" version = "2.1.0" @@ -3069,6 +3103,16 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rc2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039209d71774c9b2ae967ffb66b73ed253b3c384c198ec0d620fdd5369c78e5e" +dependencies = [ + "block-cipher-trait", + "opaque-debug 0.2.3", +] + [[package]] name = "rdrand" version = "0.4.0" @@ -3224,6 +3268,30 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls-connector" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498854dcb920e6fde17046164487977a6177d1ccc5ea58379edb910e9e60a251" +dependencies = [ + "log 0.4.11", + "rustls", + "rustls-native-certs", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" +dependencies = [ + "openssl-probe", + "rustls", + "schannel", + "security-framework 1.0.0", +] + [[package]] name = "ryu" version = "1.0.5" @@ -3287,7 +3355,20 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", - "security-framework-sys", + "security-framework-sys 0.4.3", +] + +[[package]] +name = "security-framework" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys 1.0.0", ] [[package]] @@ -3300,6 +3381,16 @@ dependencies = [ "libc", ] +[[package]] +name = "security-framework-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.9.0" @@ -3853,8 +3944,8 @@ checksum = "2d147f992a9942eb288eb52f58ba1868eee976d4983f2013867fde3736c52d0c" dependencies = [ "cfg-if", "mio 0.7.0", - "native-tls", - "pem", + "p12", + "rustls-connector", ] [[package]] @@ -4697,3 +4788,9 @@ checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" dependencies = [ "linked-hash-map", ] + +[[package]] +name = "yasna" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb" diff --git a/iml-rabbit/Cargo.toml b/iml-rabbit/Cargo.toml index 30f5286bb0..95ed51d3fa 100644 --- a/iml-rabbit/Cargo.toml +++ b/iml-rabbit/Cargo.toml @@ -9,10 +9,10 @@ deadpool-lapin = {git = "https://github.com/bikeshedder/deadpool", default-featu futures = "0.3" iml-manager-env = {path = "../iml-manager-env", version = "0.3"} iml-wire-types = {path = "../iml-wire-types", version = "0.3"} -lapin = "1.2" +lapin = {version = "1.2", default-features = false, features = ["rustls"]} serde_json = "1" thiserror = "1.0" -tokio-amqp = "0.1" +tokio-amqp = {version = "0.1", default-features = false} tracing = "0.1" warp = {version = "0.2", optional = true}