aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-06-05 18:52:07 -0400
committerGitHub <noreply@github.com>2020-06-05 18:52:07 -0400
commit2f6efcbc3a535ed6718457b2f8ab5c78002ca09c (patch)
tree896d622347033d10b7d7901b2a283297dddff478
parent937d9455cf75324b0638668d81f6b8dbc5b4f7ab (diff)
parent579068e362e571af8a658dff55a9a9675614a59a (diff)
downloadservo-2f6efcbc3a535ed6718457b2f8ab5c78002ca09c.tar.gz
servo-2f6efcbc3a535ed6718457b2f8ab5c78002ca09c.zip
Auto merge of #26797 - servo:dependabot/cargo/openssl-0.10.29, r=jdm
build(deps): bump openssl from 0.10.26 to 0.10.29 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.26 to 0.10.29. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/sfackler/rust-openssl/commit/d47dc792ce679b7102bb2faa4b9086415d62b404"><code>d47dc79</code></a> Release openssl v0.10.29</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/adde92879fa123f36a2e07d80e1bf457fe7ff364"><code>adde928</code></a> Release openssl-sys v0.9.55</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/847eeb16cb3b449560fea8f1e071c77049109513"><code>847eeb1</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1257">#1257</a> from sfackler/set-cert-store</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/1ed175f85f01726bd129b0d879b1c837c21552de"><code>1ed175f</code></a> FIx build</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/df03bbf5b80f17f3e01d0be57cd98e4237fa22b0"><code>df03bbf</code></a> Deal with upstream archive location change</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/40e66bab6b532e3a0e496eaa74c4553b051037a9"><code>40e66ba</code></a> Add SslContextBuilder::set_cert_store</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/b027f1603189919d5f63c6aff483243aaa188568"><code>b027f16</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1253">#1253</a> from coolreader18/no-vendor-env-var</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/9c8e7cdd2303b4985cc4bf91ad9053b97f406192"><code>9c8e7cd</code></a> Bump CI version</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/517fc81d4053537188232fdef7329e9f2a95d28e"><code>517fc81</code></a> Update openssl/src/lib.rs</li> <li><a href="https://github.com/sfackler/rust-openssl/commit/d6772960a3611892f09fb2e84cb194e60abb9f04"><code>d677296</code></a> Add documentation for OPENSSL_NO_VENDOR</li> <li>Additional commits viewable in <a href="https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.26...openssl-v0.10.29">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=openssl&package-manager=cargo&previous-version=0.10.26&new-version=0.10.29)](https://dependabot.com/compatibility-score/?dependency-name=openssl&package-manager=cargo&previous-version=0.10.26&new-version=0.10.29) 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) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
-rw-r--r--Cargo.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e2873121722..e475a1691a0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3765,9 +3765,9 @@ checksum = "51ecbcb821e1bd256d456fe858aaa7f380b63863eab2eb86eee1bd9f33dd6682"
[[package]]
name = "openssl"
-version = "0.10.26"
+version = "0.10.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
+checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
dependencies = [
"bitflags",
"cfg-if",