Merge branch 'main' into serde_json-1.0.81

This commit is contained in:
KitaitiMakoto 2022-05-04 19:56:18 +00:00
commit 74a1daac8c
3 changed files with 18 additions and 6 deletions

20
Cargo.lock generated
View file

@ -2825,18 +2825,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.38"
version = "0.10.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
dependencies = [
"bitflags 1.3.2",
"cfg-if 1.0.0",
"foreign-types",
"libc",
"once_cell",
"openssl-macros",
"openssl-sys",
]
[[package]]
name = "openssl-macros"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
"syn 1.0.92",
]
[[package]]
name = "openssl-probe"
version = "0.1.5"
@ -2845,9 +2857,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
version = "0.9.72"
version = "0.9.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0"
dependencies = [
"autocfg 1.0.1",
"cc",

View file

@ -12,7 +12,7 @@ array_tool = "1.0"
base64 = "0.13"
heck = "0.4.0"
hex = "0.4"
openssl = "0.10.22"
openssl = "0.10.40"
rocket = "0.4.6"
reqwest = { version = "0.9", features = ["socks"] }
serde = "1.0"

View file

@ -13,7 +13,7 @@ itertools = "0.10.3"
lazy_static = "1.0"
ldap3 = "0.10.4"
migrations_internals= "1.4.0"
openssl = "0.10.22"
openssl = "0.10.40"
rocket = "0.4.6"
rocket_i18n = "0.4.1"
reqwest = "0.9"