aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-01-18 14:28:19 +0100
committerGitHub <noreply@github.com>2023-01-18 14:28:19 +0100
commitc32f11caf341d7879614f1ac4c4e31a6a66df35f (patch)
treec9df1b51a23cc6c35f7c7cea6d97340f2064e27c
parent2515944cdaf07af947826e43c4fe0510b8956115 (diff)
parent5445db80af6a330d543dcd33f251bf4b62b3394e (diff)
downloadservo-c32f11caf341d7879614f1ac4c4e31a6a66df35f.tar.gz
servo-c32f11caf341d7879614f1ac4c4e31a6a66df35f.zip
Auto merge of #29219 - servo:dependabot/cargo/schannel-0.1.21, r=delan
Bump schannel from 0.1.19 to 0.1.21 Bumps [schannel](https://github.com/steffengy/schannel-rs) from 0.1.19 to 0.1.21. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/steffengy/schannel-rs/commit/e93c3bcf588630717bc592fe9f36fc4b740589b5"><code>e93c3bc</code></a> Release v0.1.21</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/74e761e1e44ec87eb4432878dce8b7760892f422"><code>74e761e</code></a> Update windows-sys to 0.42 (<a href="https://github-redirect.dependabot.com/steffengy/schannel-rs/issues/82">#82</a>)</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/471182575b652e655d044fb3a4d6ed781919a394"><code>4711825</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/steffengy/schannel-rs/issues/87">#87</a> from arlosi/fix-tests</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/0230156169cc8d9518c87c07d553a642bab7cfcd"><code>0230156</code></a> update to newest self-signed.badssl.com:443 cert</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/abd8f52577ce8bc7db77f23c891477322fb8f5ca"><code>abd8f52</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/steffengy/schannel-rs/issues/78">#78</a> from Expyron/master</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/7ed2b5f5d57f8041629934045ba99c2897371a8c"><code>7ed2b5f</code></a> Update context_buffer.rs</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/595c509b48c1477fbb0d21c9431cdb90df809c23"><code>595c509</code></a> Use MSI installation files for CI</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/237e82c54367c287b11277cfc0ca68cda6df09c4"><code>237e82c</code></a> Change CI minimum tested version to 1.46</li> <li><a href="https://github.com/steffengy/schannel-rs/commit/334cc45ca0fd52d761b142b555dc677468c695af"><code>334cc45</code></a> Remove dependency on <code>lazy_static</code></li> <li><a href="https://github.com/steffengy/schannel-rs/commit/bd07438aa7fde335cbd2e4f86c802b88ac772307"><code>bd07438</code></a> * chore(test): update to newest self-signed.badssl.com:443 cert</li> <li>Additional commits viewable in <a href="https://github.com/steffengy/schannel-rs/compare/v0.1.19...v0.1.21">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=schannel&package-manager=cargo&previous-version=0.1.19&new-version=0.1.21)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
-rw-r--r--Cargo.lock51
1 files changed, 32 insertions, 19 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 288ec330432..b9e83eda1f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4527,7 +4527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
dependencies = [
"lock_api 0.4.7",
- "parking_lot_core 0.9.2",
+ "parking_lot_core 0.9.6",
]
[[package]]
@@ -4561,9 +4561,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.2"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"
+checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -5284,12 +5284,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.19"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
dependencies = [
- "lazy_static",
- "winapi",
+ "windows-sys",
]
[[package]]
@@ -7522,46 +7521,60 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
-version = "0.34.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
+ "windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
+[[package]]
name = "windows_aarch64_msvc"
-version = "0.34.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
[[package]]
name = "windows_i686_gnu"
-version = "0.34.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
[[package]]
name = "windows_i686_msvc"
-version = "0.34.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.34.0"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.34.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
[[package]]
name = "winit"