From 596877debb28db7d2c2ea7ffbbea5320d3da234e Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Wed, 26 Oct 2022 08:10:33 +0000
Subject: [PATCH] age: bcrypt-pbkdf 0.9 and scrypt 0.10

---
 Cargo.lock          | 23 +++++++----------------
 age/Cargo.toml      |  4 ++--
 fuzz-afl/Cargo.lock |  8 ++++----
 fuzz/Cargo.lock     |  8 ++++----
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f299d37..edd4392 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -210,12 +210,12 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
 
 [[package]]
 name = "bcrypt-pbkdf"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ef233ffa9cb9c7820b2b0e9efd0821ed180e866c9120ec9f45518659742074"
+checksum = "3806a8db60cf56efee531616a34a6aaa9a114d6da2add861b0fa4a188881b2c7"
 dependencies = [
  "blowfish",
- "pbkdf2 0.10.1",
+ "pbkdf2",
  "sha2",
 ]
 
@@ -1695,15 +1695,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "pbkdf2"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
-dependencies = [
- "digest 0.10.5",
-]
-
 [[package]]
 name = "pbkdf2"
 version = "0.11.0"
@@ -2240,12 +2231,12 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
 name = "scrypt"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba0aaf3911fff0d942c10a49779de7754699810fc7dbe3df515613b2ecc8195a"
+checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
 dependencies = [
  "hmac",
- "pbkdf2 0.10.1",
+ "pbkdf2",
  "salsa20",
  "sha2",
 ]
@@ -2974,7 +2965,7 @@ dependencies = [
  "crossbeam-utils",
  "flate2",
  "hmac",
- "pbkdf2 0.11.0",
+ "pbkdf2",
  "sha1",
  "time 0.3.15",
  "zstd",
diff --git a/age/Cargo.toml b/age/Cargo.toml
index 1ac4d1f..6586380 100644
--- a/age/Cargo.toml
+++ b/age/Cargo.toml
@@ -34,7 +34,7 @@ hmac = "0.12"
 sha2 = "0.10"
 
 # - scrypt from RFC 7914
-scrypt = { version = "0.9", default-features = false }
+scrypt = { version = "0.10", default-features = false }
 
 # - CSPRNG
 rand = "0.8"
@@ -53,7 +53,7 @@ curve25519-dalek = { version = "3", optional = true }
 
 # - Encrypted keys
 aes = { version = "0.8", optional = true }
-bcrypt-pbkdf = { version = "0.8", optional = true }
+bcrypt-pbkdf = { version = "0.9", optional = true }
 cbc = { version = "0.1", optional = true }
 cipher = { version = "0.4.3", features = ["alloc"]}
 ctr = { version = "0.9", optional = true }
diff --git a/fuzz-afl/Cargo.lock b/fuzz-afl/Cargo.lock
index c173df0..3469c70 100644
--- a/fuzz-afl/Cargo.lock
+++ b/fuzz-afl/Cargo.lock
@@ -597,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
  "digest 0.10.5",
 ]
@@ -849,9 +849,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scrypt"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba0aaf3911fff0d942c10a49779de7754699810fc7dbe3df515613b2ecc8195a"
+checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
 dependencies = [
  "hmac",
  "pbkdf2",
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index ebf60eb..d873e07 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -537,9 +537,9 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
  "digest 0.10.5",
 ]
@@ -769,9 +769,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scrypt"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba0aaf3911fff0d942c10a49779de7754699810fc7dbe3df515613b2ecc8195a"
+checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
 dependencies = [
  "hmac",
  "pbkdf2",