From 8acad84cd532258033e296f410968e846a04ce7e Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Thu, 29 Apr 2021 12:00:58 -0700
Subject: [PATCH] scrypt: bump `salsa20` crate dependency to v0.8

---
 Cargo.lock          | 17 +++++++++++++----
 scrypt/Cargo.toml   |  2 +-
 scrypt/src/romix.rs |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bef94c4d..218200ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,7 +62,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32fa6a061124e37baba002e496d203e23ba3d7b73750be82dbfbc92913048a5b"
 dependencies = [
  "byteorder",
- "cipher",
+ "cipher 0.2.5",
  "opaque-debug",
 ]
 
@@ -87,6 +87,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "cpuid-bool"
 version = "0.1.2"
@@ -354,11 +363,11 @@ dependencies = [
 
 [[package]]
 name = "salsa20"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15"
+checksum = "1c7c5f10864beba947e1a1b43f3ef46c8cc58d1c2ae549fa471713e8ff60787a"
 dependencies = [
- "cipher",
+ "cipher 0.3.0",
 ]
 
 [[package]]
diff --git a/scrypt/Cargo.toml b/scrypt/Cargo.toml
index fadf53b3..77c6a790 100644
--- a/scrypt/Cargo.toml
+++ b/scrypt/Cargo.toml
@@ -16,7 +16,7 @@ base64ct = { version = "1", default-features = false, features = ["alloc"], opti
 hmac = "0.11"
 password-hash = { version = "0.2", default-features = false, features = ["rand_core"], optional = true }
 pbkdf2 = { version = "0.7", default-features = false, path = "../pbkdf2" }
-salsa20 = { version = "0.7", default-features = false, features = ["expose-core"] }
+salsa20 = { version = "0.8", default-features = false, features = ["expose-core"] }
 sha2 = { version = "0.9", default-features = false }
 
 [dev-dependencies]
diff --git a/scrypt/src/romix.rs b/scrypt/src/romix.rs
index 13343a4f..91b44e54 100644
--- a/scrypt/src/romix.rs
+++ b/scrypt/src/romix.rs
@@ -1,7 +1,7 @@
 use core::convert::TryInto;
 
 /// The Salsa20/8 core function
-type Salsa20_8 = salsa20::Block<salsa20::R8>;
+type Salsa20_8 = salsa20::Core<salsa20::R8>;
 
 /// Execute the ROMix operation in-place.
 /// b - the data to operate on