Merge #2293 #2294

2293: Bump cmac from 0.3.0 to 0.5.1 r=tomtau a=dependabot-preview[bot] Bumps [cmac](https://github.com/RustCrypto/MACs) from 0.3.0 to 0.5.1. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/RustCrypto/MACs/commit/f6e47f8f03052f5b32cd82946756f127acc1a9fc"><code>f6e47f8</code></a> Release new versions (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/65">#65</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/98f621a81663be37e5c04a68cd7ed311d8c70652"><code>98f621a</code></a> README.md(s): add Zulip badges (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/64">#64</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/4eb2d48368d54ad9407d5ca4ef4b154dde4918b5"><code>4eb2d48</code></a> Release new versions (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/63">#63</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/98fb2b153f25295a12d768d27d50bbbe154424bf"><code>98fb2b1</code></a> Bump <code>crypto-mac</code> dependency to v0.10 (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/62">#62</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/69af29340ddd1643191c2c6d9952d9c192f35aa6"><code>69af293</code></a> Add Dependabot</li> <li><a href="https://github.com/RustCrypto/MACs/commit/46a688fea64664c83dd26c68d783477f259ee111"><code>46a688f</code></a> Update changelogs (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/58">#58</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/d2e6f950d792c66535ea0a8e1b11411bfaa8a6f2"><code>d2e6f95</code></a> Update crypto-mac to v0.9 (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/57">#57</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/b34d711f17e35c443bd709d784fa84f19e63b34c"><code>b34d711</code></a> Use SVG logo (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/56">#56</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/e0eef7fdee8e31c01cb4ffc06497c48d9e739534"><code>e0eef7f</code></a> Add From<BlockCipher> impls (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/54">#54</a>)</li> <li><a href="https://github.com/RustCrypto/MACs/commit/06d31a7c67d6d9dd50976ad96769d042038e4fd2"><code>06d31a7</code></a> Add io::Write impls (<a href="https://github-redirect.dependabot.com/RustCrypto/MACs/issues/55">#55</a>)</li> <li>Additional commits viewable in <a href="https://github.com/RustCrypto/MACs/compare/cmac-v0.3.0...cmac-v0.5.1">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=cmac&package-manager=cargo&previous-version=0.3.0&new-version=0.5.1)](https://dependabot.com/compatibility-score/?dependency-name=cmac&package-manager=cargo&previous-version=0.3.0&new-version=0.5.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> 2294: Bump env_logger from 0.7.1 to 0.8.1 r=tomtau a=dependabot-preview[bot] Bumps [env_logger](https://github.com/env-logger-rs/env_logger) from 0.7.1 to 0.8.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/env-logger-rs/env_logger/releases">env_logger's releases</a>.</em></p> <blockquote> <h2>0.8.0</h2> <p>Breaking changes:</p> <ul> <li>Update public dependency humantime to 2.0</li> </ul> <p>Improvements:</p> <ul> <li>Update default colors for debug (white => blue) and trace (black => cyan)</li> </ul> <p>Deprecations:</p> <ul> <li><code>env_logger::from_env</code> has been deprecated in favor of <code>env_logger::Builder::from_env</code></li> </ul> <p>This release raises the minimum supported Rust version to 1.41.0.</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/env-logger-rs/env_logger/commits">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=env_logger&package-manager=cargo&previous-version=0.7.1&new-version=0.8.1)](https://dependabot.com/compatibility-score/?dependency-name=env_logger&package-manager=cargo&previous-version=0.7.1&new-version=0.8.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>
crypto-com · Oct 19, 2020 · 319d2f5 · 319d2f5
3 parents 237b008 + 6590184 + 02c82be
commit 319d2f5
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain-abci/Cargo.toml b/chain-abci/Cargo.toml
@@ -25,7 +25,7 @@ ra-sp-server = { path = "../chain-tx-enclave-next/enclave-ra/ra-sp-server" }
 blake3 = { version = "0.3.7", default-features = false }
 
 log = "0.4.11"
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 bit-vec = { version = "0.6.2", features = ["serde_no_std"] }
 byteorder = "1.3.4"
 serde = "1.0"

diff --git a/chain-tx-enclave-next/enclave-ra/ra-enclave/Cargo.toml b/chain-tx-enclave-next/enclave-ra/ra-enclave/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 [dependencies]
 aes = "0.4"
 chrono = "0.4"
-cmac = "0.3"
+cmac = "0.5"
 crypto-mac = { version = "0.8", features = ["std"] }
 log = "0.4"
 rcgen = "0.8"

diff --git a/chain-tx-enclave-next/enclave-ra/ra-sp-server/Cargo.toml b/chain-tx-enclave-next/enclave-ra/ra-sp-server/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 [dependencies]
 aesm-client = "0.5"
 base64 = "0.13"
-env_logger = "0.7"
+env_logger = "0.8"
 hex = "0.4"
 log = "0.4"
 percent-encoding = "2.1"

diff --git a/chain-tx-enclave-next/tdbe/enclave-app/Cargo.toml b/chain-tx-enclave-next/tdbe/enclave-app/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [target.'cfg(target_env = "sgx")'.dependencies]
 enclave-macro = { path = "../../../chain-tx-enclave/enclave-macro", default-features = false }
-env_logger = { version = "0.7", default-features = false }
+env_logger = { version = "0.8", default-features = false }
 log = "0.4"
 parity-scale-codec = "1.3"
 rs-libc = "0.2"

diff --git a/chain-tx-enclave-next/tx-query-next/enclave-app/Cargo.toml b/chain-tx-enclave-next/tx-query-next/enclave-app/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 
 [target.'cfg(target_env = "sgx")'.dependencies]
-env_logger = { version = "0.7", default-features = false }
+env_logger = { version = "0.8", default-features = false }
 log = "0.4"
 parity-scale-codec = "1.3"
 rand = "0.7"

diff --git a/chain-tx-enclave-next/tx-validation-next/Cargo.toml b/chain-tx-enclave-next/tx-validation-next/Cargo.toml
@@ -19,7 +19,7 @@ aes-gcm-siv = "0.9"
 aead = "0.3"
 chrono = "0.4"
 zeroize = { version = "1.1" }
-env_logger = { version = "0.7", default-features = false }
+env_logger = { version = "0.8", default-features = false }
 log = "0.4"
 rs-libc = "0.2"
 rand = "0.7"

diff --git a/client-cli/Cargo.toml b/client-cli/Cargo.toml
@@ -27,7 +27,7 @@ unicase = "2.6"
 chrono = "0.4"
 pbr = "1.0"
 log = "0.4.11"
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 cli-table = "0.3"
 zeroize = "1.1"
 base64 = "0.13"

diff --git a/client-rpc/Cargo.toml b/client-rpc/Cargo.toml
@@ -17,7 +17,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.59"
 hex = "0.4.2"
 secstr = { version = "0.4.0", features = ["serde"] }
-env_logger="0.7.1"
+env_logger="0.8.1"
 log ="0.4.11"
 zeroize = "1.1"
 parity-scale-codec = "1.3"

diff --git a/client-rpc/server/Cargo.toml b/client-rpc/server/Cargo.toml
@@ -18,5 +18,5 @@ jsonrpc-core = "14.2"
 jsonrpc-http-server = "14.2"
 structopt = "0.3"
 dirs = "3.0.1"
-env_logger="0.7.1"
+env_logger="0.8.1"
 log ="0.4.11"
diff --git a/cro-clib/Cargo.toml b/cro-clib/Cargo.toml
@@ -25,7 +25,7 @@ secstr = { version = "0.4.0", features = ["serde"] }
 secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", default-features = false, rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "endomorphism", "global-context"] }
 jsonrpc-core = "14.2"
 libc = "0.2.79"
-env_logger = "0.7"
+env_logger = "0.8"
 
 [build-dependencies]
 cbindgen = "0.15.0"