From b61b7189a5cde1215eb91522e43e1498d084e87d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Dec 2021 18:12:35 -0700
Subject: [PATCH] chore: bump hmac from 0.11.0 to 0.12.0 (#21681)

* chore: bump hmac from 0.11.0 to 0.12.0

Bumps [hmac](https://github.com/RustCrypto/MACs) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/RustCrypto/MACs/releases)
- [Commits](https://github.com/RustCrypto/MACs/compare/hmac-v0.11.0...hmac-v0.12.0)

---
updated-dependencies:
- dependency-name: hmac
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* [auto-commit] Update all Cargo lock files

* Update dependabot-pr.sh

* Bump sha2 and pbkdf2 as well

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot-buildkite <dependabot-buildkite@noreply.solana.com>
Co-authored-by: axleiro <83293196+axleiro@users.noreply.github.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
---
 Cargo.lock              | 84 +++++++++++++++++++++++++++++++--------
 ci/dependabot-pr.sh     |  1 -
 frozen-abi/Cargo.toml   |  2 +-
 ledger/Cargo.toml       |  2 +-
 programs/bpf/Cargo.lock | 88 ++++++++++++++++++++++++++++++-----------
 sdk/Cargo.toml          |  6 +--
 sdk/program/Cargo.toml  |  2 +-
 7 files changed, 137 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39e03d523..22ae3bdc9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -364,6 +364,15 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "block-padding"
 version = "0.1.5"
@@ -910,6 +919,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -1088,6 +1106,18 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d"
+dependencies = [
+ "block-buffer 0.10.0",
+ "crypto-common",
+ "generic-array 0.14.4",
+ "subtle",
+]
+
 [[package]]
 name = "dir-diff"
 version = "0.3.2"
@@ -1178,7 +1208,7 @@ dependencies = [
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2",
+ "sha2 0.9.8",
  "zeroize",
 ]
 
@@ -1192,7 +1222,7 @@ dependencies = [
  "ed25519-dalek",
  "failure",
  "hmac 0.9.0",
- "sha2",
+ "sha2 0.9.8",
 ]
 
 [[package]]
@@ -1848,6 +1878,15 @@ dependencies = [
  "digest 0.9.0",
 ]
 
+[[package]]
+name = "hmac"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddca131f3e7f2ce2df364b57949a9d47915cfbd35e46cfee355ccebbf794d6a2"
+dependencies = [
+ "digest 0.10.0",
+]
+
 [[package]]
 name = "hmac-drbg"
 version = "0.3.0"
@@ -2322,7 +2361,7 @@ dependencies = [
  "libsecp256k1-gen-genmult",
  "rand 0.7.3",
  "serde",
- "sha2",
+ "sha2 0.9.8",
  "typenum",
 ]
 
@@ -2341,7 +2380,7 @@ dependencies = [
  "libsecp256k1-gen-genmult",
  "rand 0.7.3",
  "serde",
- "sha2",
+ "sha2 0.9.8",
  "typenum",
 ]
 
@@ -2949,11 +2988,11 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
+checksum = "a4628cc3cf953b82edcd3c1388c5715401420ce5524fedbab426bd5aba017434"
 dependencies = [
- "crypto-mac 0.11.1",
+ "digest 0.10.0",
 ]
 
 [[package]]
@@ -3107,7 +3146,7 @@ dependencies = [
  "md-5",
  "memchr",
  "rand 0.8.4",
- "sha2",
+ "sha2 0.9.8",
  "stringprep",
 ]
 
@@ -4134,6 +4173,17 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900d964dd36bb15bcf2f2b35694c072feab74969a54f2bbeec7a2d725d2bdcb6"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.0",
+]
+
 [[package]]
 name = "sha3"
 version = "0.9.1"
@@ -4863,7 +4913,7 @@ dependencies = [
  "rustc_version 0.2.3",
  "serde",
  "serde_derive",
- "sha2",
+ "sha2 0.9.8",
  "solana-frozen-abi-macro 1.8.2",
  "solana-logger 1.8.2",
  "thiserror",
@@ -4881,7 +4931,7 @@ dependencies = [
  "rustc_version 0.4.0",
  "serde",
  "serde_derive",
- "sha2",
+ "sha2 0.10.0",
  "solana-frozen-abi-macro 1.10.0",
  "solana-logger 1.10.0",
  "thiserror",
@@ -5060,7 +5110,7 @@ dependencies = [
  "rustc_version 0.4.0",
  "serde",
  "serde_bytes",
- "sha2",
+ "sha2 0.10.0",
  "solana-account-decoder",
  "solana-bpf-loader-program",
  "solana-entry",
@@ -5356,7 +5406,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "sha2",
+ "sha2 0.9.8",
  "sha3",
  "solana-frozen-abi 1.8.2",
  "solana-frozen-abi-macro 1.8.2",
@@ -5395,7 +5445,7 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "serde_json",
- "sha2",
+ "sha2 0.10.0",
  "sha3",
  "solana-frozen-abi 1.10.0",
  "solana-frozen-abi-macro 1.10.0",
@@ -5665,7 +5715,7 @@ dependencies = [
  "ed25519-dalek",
  "ed25519-dalek-bip32",
  "generic-array 0.14.4",
- "hmac 0.11.0",
+ "hmac 0.12.0",
  "itertools 0.10.3",
  "lazy_static",
  "libsecp256k1 0.6.0",
@@ -5673,7 +5723,7 @@ dependencies = [
  "memmap2 0.5.0",
  "num-derive",
  "num-traits",
- "pbkdf2 0.9.0",
+ "pbkdf2 0.10.0",
  "qstring",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -5683,7 +5733,7 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "serde_json",
- "sha2",
+ "sha2 0.10.0",
  "sha3",
  "solana-frozen-abi 1.10.0",
  "solana-frozen-abi-macro 1.10.0",
@@ -6537,7 +6587,7 @@ dependencies = [
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2",
+ "sha2 0.9.8",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",
diff --git a/ci/dependabot-pr.sh b/ci/dependabot-pr.sh
index fe3b7469a..3ce48fe52 100755
--- a/ci/dependabot-pr.sh
+++ b/ci/dependabot-pr.sh
@@ -36,4 +36,3 @@ git push origin "HEAD:$branch"
 
 echo "Source branch is updated; failing this build for the next"
 exit 1
-
diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml
index 78a864198..5c81e8e2a 100644
--- a/frozen-abi/Cargo.toml
+++ b/frozen-abi/Cargo.toml
@@ -15,7 +15,7 @@ bv = { version = "0.11.1", features = ["serde"] }
 log = "0.4.14"
 serde = "1.0.130"
 serde_derive = "1.0.103"
-sha2 = "0.9.8"
+sha2 = "0.10.0"
 solana-frozen-abi-macro = { path = "macro", version = "=1.10.0" }
 thiserror = "1.0"
 
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index e8f2c35ef..21d6d0691 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -30,7 +30,7 @@ rand_chacha = "0.2.2"
 rayon = "1.5.1"
 serde = "1.0.130"
 serde_bytes = "0.11.5"
-sha2 = "0.9.8"
+sha2 = "0.10.0"
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.0" }
 solana-entry = { path = "../entry", version = "=1.10.0" }
 solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.0" }
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index 023ee5314..c63a059d0 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -207,6 +207,15 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "block-padding"
 version = "0.2.1"
@@ -532,6 +541,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -659,6 +677,18 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d"
+dependencies = [
+ "block-buffer 0.10.0",
+ "crypto-common",
+ "generic-array 0.14.4",
+ "subtle",
+]
+
 [[package]]
 name = "dir-diff"
 version = "0.3.2"
@@ -737,7 +767,7 @@ dependencies = [
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2",
+ "sha2 0.9.8",
  "zeroize",
 ]
 
@@ -751,7 +781,7 @@ dependencies = [
  "ed25519-dalek",
  "failure",
  "hmac 0.9.0",
- "sha2",
+ "sha2 0.9.8",
 ]
 
 [[package]]
@@ -1200,12 +1230,11 @@ dependencies = [
 
 [[package]]
 name = "hmac"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+checksum = "ddca131f3e7f2ce2df364b57949a9d47915cfbd35e46cfee355ccebbf794d6a2"
 dependencies = [
- "crypto-mac 0.11.0",
- "digest 0.9.0",
+ "digest 0.10.0",
 ]
 
 [[package]]
@@ -1455,7 +1484,7 @@ dependencies = [
  "libsecp256k1-gen-genmult",
  "rand 0.7.3",
  "serde",
- "sha2",
+ "sha2 0.9.8",
  "typenum",
 ]
 
@@ -1474,7 +1503,7 @@ dependencies = [
  "libsecp256k1-gen-genmult",
  "rand 0.7.3",
  "serde",
- "sha2",
+ "sha2 0.9.8",
  "typenum",
 ]
 
@@ -1814,11 +1843,11 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
+checksum = "a4628cc3cf953b82edcd3c1388c5715401420ce5524fedbab426bd5aba017434"
 dependencies = [
- "crypto-mac 0.11.0",
+ "digest 0.10.0",
 ]
 
 [[package]]
@@ -2402,7 +2431,7 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.9.0",
  "cfg-if 1.0.0",
  "cpufeatures 0.1.4",
  "digest 0.9.0",
@@ -2415,20 +2444,31 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.9.0",
  "cfg-if 1.0.0",
  "cpufeatures 0.2.1",
  "digest 0.9.0",
  "opaque-debug",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900d964dd36bb15bcf2f2b35694c072feab74969a54f2bbeec7a2d725d2bdcb6"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures 0.2.1",
+ "digest 0.10.0",
+]
+
 [[package]]
 name = "sha3"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.9.0",
  "digest 0.9.0",
  "keccak",
  "opaque-debug",
@@ -3044,7 +3084,7 @@ dependencies = [
  "rustc_version 0.2.3",
  "serde",
  "serde_derive",
- "sha2",
+ "sha2 0.9.8",
  "solana-frozen-abi-macro 1.7.6",
  "solana-logger 1.7.6",
  "thiserror",
@@ -3062,7 +3102,7 @@ dependencies = [
  "rustc_version 0.4.0",
  "serde",
  "serde_derive",
- "sha2",
+ "sha2 0.10.0",
  "solana-frozen-abi-macro 1.10.0",
  "solana-logger 1.10.0",
  "thiserror",
@@ -3198,7 +3238,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "sha2",
+ "sha2 0.9.8",
  "sha3",
  "solana-frozen-abi 1.7.6",
  "solana-frozen-abi-macro 1.7.6",
@@ -3234,7 +3274,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "sha2",
+ "sha2 0.10.0",
  "sha3",
  "solana-frozen-abi 1.10.0",
  "solana-frozen-abi-macro 1.10.0",
@@ -3375,7 +3415,7 @@ dependencies = [
  "ed25519-dalek",
  "ed25519-dalek-bip32",
  "generic-array 0.14.4",
- "hmac 0.11.0",
+ "hmac 0.12.0",
  "itertools 0.10.3",
  "lazy_static",
  "libsecp256k1 0.6.0",
@@ -3383,7 +3423,7 @@ dependencies = [
  "memmap2 0.5.0",
  "num-derive",
  "num-traits",
- "pbkdf2 0.9.0",
+ "pbkdf2 0.10.0",
  "qstring",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -3393,7 +3433,7 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "serde_json",
- "sha2",
+ "sha2 0.10.0",
  "sha3",
  "solana-frozen-abi 1.10.0",
  "solana-frozen-abi-macro 1.10.0",
@@ -3597,9 +3637,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "subtle"
-version = "2.2.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "symlink"
@@ -3780,7 +3820,7 @@ dependencies = [
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2",
+ "sha2 0.9.8",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index 08317d9ab..49f1c46de 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -51,7 +51,7 @@ digest = { version = "0.9.0", optional = true }
 ed25519-dalek = { version = "=1.0.1", optional = true }
 ed25519-dalek-bip32 = { version = "0.1.1", optional = true }
 generic-array = { version = "0.14.4", default-features = false, features = ["serde", "more_lengths"], optional = true }
-hmac = "0.11.0"
+hmac = "0.12.0"
 itertools =  "0.10.3"
 lazy_static = "1.4.0"
 libsecp256k1 = { version = "0.6.0", optional = true }
@@ -59,7 +59,7 @@ log = "0.4.14"
 memmap2 = { version = "0.5.0", optional = true }
 num-derive = "0.3"
 num-traits = "0.2"
-pbkdf2 = { version = "0.9.0", default-features = false }
+pbkdf2 = { version = "0.10.0", default-features = false }
 qstring = "0.7.2"
 rand = { version = "0.7.0", optional = true }
 rand_chacha = { version = "0.2.2", optional = true }
@@ -68,7 +68,7 @@ serde = "1.0.130"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
 serde_json = { version = "1.0.72", optional = true }
-sha2 = "0.9.8"
+sha2 = "0.10.0"
 sha3 = { version = "0.9.1", optional = true }
 solana-logger = { path = "../logger", version = "=1.10.0", optional = true }
 solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.0" }
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
index 4812a661b..23a888dc7 100644
--- a/sdk/program/Cargo.toml
+++ b/sdk/program/Cargo.toml
@@ -27,7 +27,7 @@ rustversion = "1.0.3"
 serde = "1.0.112"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
-sha2 = "0.9.2"
+sha2 = "0.10.0"
 sha3 = "0.9.1"
 solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.0" }
 solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.0" }