Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

Commit

Permalink
Merge #2346 #2347
Browse files Browse the repository at this point in the history
2346: Bump rust-argon2 from 0.8.2 to 0.8.3 r=tomtau a=dependabot-preview[bot]

Bumps [rust-argon2](https://github.com/sru-systems/rust-argon2) from 0.8.2 to 0.8.3.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/sru-systems/rust-argon2/blob/master/CHANGELOG.md">rust-argon2's changelog</a>.</em></p>
<blockquote>
<h2>0.8.3</h2>
<ul>
<li>Replace transmute with to_le_bytes.</li>
<li>Update base64 to version 0.13.</li>
<li>Update crossbeam-utils to version 0.8.</li>
<li>Update hex to version 0.4.</li>
<li>Derive Clone for Error struct.</li>
<li>Add optional serde support for Error struct.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/79b3176d831e891507e64cfb5405d1179e80519c"><code>79b3176</code></a> Bump version to 0.8.3.</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/a075a8e6eba969db594353eea8be01a65c72990a"><code>a075a8e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/sru-systems/rust-argon2/issues/42">#42</a> from kazcw/master</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/7c9dba248febf00b0c1740be577577cab6023261"><code>7c9dba2</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/sru-systems/rust-argon2/issues/39">#39</a> from sdroege/base64-0.13</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/4da2ac05629dc7c554d7b0108564082c7a4d5d73"><code>4da2ac0</code></a> replace transmute with to_le_bytes</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/388d31fabad1bfb546befd7cf236fb8b5f8cee34"><code>388d31f</code></a> Update crossbeam-utils dependency to 0.8</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/0d5bfedc3e9adc34d25e7f2a2c230ad8a2740593"><code>0d5bfed</code></a> Update base64 dependency to 0.13</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/2a76b3063b2dc793d4672421635418771390e82e"><code>2a76b30</code></a> Update hex dependency to 0.4</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/acbb8f59b604012be673fca228d43479a42bd7f6"><code>acbb8f5</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/sru-systems/rust-argon2/issues/38">#38</a> from sbruton/derive-error</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/7a15286927b9e808480bd6e2ad7c64bc543ab849"><code>7a15286</code></a> Merge branch 'master' into derive-error</li>
<li><a href="https://github.com/sru-systems/rust-argon2/commit/ebe85afe4be149432e1e6e2d8900db441b3cdf2c"><code>ebe85af</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/sru-systems/rust-argon2/issues/37">#37</a> from sbruton/clone-error</li>
<li>Additional commits viewable in <a href="https://github.com/sru-systems/rust-argon2/compare/0.8.2...0.8.3">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=rust-argon2&package-manager=cargo&previous-version=0.8.2&new-version=0.8.3)](https://dependabot.com/compatibility-score/?dependency-name=rust-argon2&package-manager=cargo&previous-version=0.8.2&new-version=0.8.3)

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>

2347: Bump nom from 5.1.2 to 6.0.1 r=tomtau a=dependabot-preview[bot]

Bumps [nom](https://github.com/Geal/nom) from 5.1.2 to 6.0.1.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/Geal/nom/blob/master/CHANGELOG.md">nom's changelog</a>.</em></p>
<blockquote>
<h1>Change Log</h1>
<h2>[Unreleased][unreleased]</h2>
<h3>Thanks</h3>
<h3>Changed</h3>
<h2>6.0.0 - 2020-10-31</h2>
<h3>Thanks</h3>
<p>This release was done thanks to the hard work of (by order of appearance in the commit list):</p>
<ul>
<li><a href="https://github.com/chifflier">@chifflier</a></li>
<li><a href="https://github.com/shepmaster">@shepmaster</a></li>
<li><a href="https://github.com/amerelo">@amerelo</a></li>
<li><a href="https://github.com/razican">@razican</a></li>
<li><a href="https://github.com/Palladinium">@Palladinium</a></li>
<li><a href="https://github.com/0ndorio">@0ndorio</a></li>
<li>Sebastian Zivota</li>
<li><a href="https://github.com/keruspe">@keruspe</a></li>
<li><a href="https://github.com/devonhollowood">@devonhollowood</a></li>
<li><a href="https://github.com/parasyte">@parasyte</a></li>
<li><a href="https://github.com/nnt0">@nnt0</a></li>
<li><a href="https://github.com/AntoineCezar">@AntoineCezar</a></li>
<li><a href="https://github.com/GuillaumeGomez">@GuillaumeGomez</a></li>
<li><a href="https://github.com/eijebong">@eijebong</a></li>
<li><a href="https://github.com/stadelmanma">@stadelmanma</a></li>
<li><a href="https://github.com/sphynx">@sphynx</a></li>
<li><a href="https://github.com/snawaz">@snawaz</a></li>
<li><a href="https://github.com/fosskers">@fosskers</a></li>
<li><a href="https://github.com/JamesHarrison">@JamesHarrison</a></li>
<li><a href="https://github.com/calebsander">@calebsander</a></li>
<li><a href="https://github.com/jthornber">@jthornber</a></li>
<li><a href="https://github.com/ahmedcharles">@ahmedcharles</a></li>
<li><a href="https://github.com/rljacobson">@rljacobson</a></li>
<li><a href="https://github.com/benkay86">@benkay86</a></li>
<li><a href="https://github.com/georgeclaghorn">@georgeclaghorn</a></li>
<li><a href="https://github.com/TianyiShi2001">@TianyiShi2001</a></li>
<li><a href="https://github.com/shnewto">@shnewto</a></li>
<li><a href="https://github.com/alfriadox">@alfriadox</a></li>
<li><a href="https://github.com/resistor">@resistor</a></li>
<li><a href="https://github.com/myrrlyn">@myrrlyn</a></li>
<li><a href="https://github.com/chipsenkbeil">@chipsenkbeil</a></li>
<li><a href="https://github.com/ruza-net">@ruza-net</a></li>
<li><a href="https://github.com/fanf2">@fanf2</a></li>
<li><a href="https://github.com/jameysharp">@jameysharp</a></li>
<li><a href="https://github.com/FallenWarrior2k">@FallenWarrior2k</a></li>
<li><a href="https://github.com/jmg-duarte">@jmg-duarte</a></li>
<li><a href="https://github.com/ericseppanen">@ericseppanen</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/Geal/nom/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=nom&package-manager=cargo&previous-version=5.1.2&new-version=6.0.1)](https://dependabot.com/compatibility-score/?dependency-name=nom&package-manager=cargo&previous-version=5.1.2&new-version=6.0.1)

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>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot-preview[bot] authored Nov 25, 2020
3 parents d47eac2 + c8b5aeb + 8bcf82b commit 001920d
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 26 deletions.
116 changes: 91 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chain-tx-enclave-next/mls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ring = { version = "0.16.15", features = ["std"] }
thiserror = "1.0"
rustls = "0.18"
x509-parser = "0.8.2"
nom = "5.1"
nom = "6.0"
secrecy = "0.7.0"
sha2 = "0.9"
hkdf = { version = "0.10", features = ["std"] }
Expand Down

0 comments on commit 001920d

Please sign in to comment.