From 896142c4aa4c3571eded2dbadc6f55a6843424d0 Mon Sep 17 00:00:00 2001
From: Arthur Gautier <baloo@superbaloo.net>
Date: Mon, 7 Oct 2024 20:22:55 +0000
Subject: [PATCH] pkcs5: 0.8.0-rc.2 (#1552)

---
 Cargo.lock       | 16 +++++++++-------
 Cargo.toml       |  5 -----
 pkcs5/Cargo.toml |  6 +++---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a29ce0bf..2150d6045 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,8 +39,9 @@ dependencies = [
 
 [[package]]
 name = "aes-gcm"
-version = "0.11.0-pre.1"
-source = "git+https://github.com/RustCrypto/AEADs.git#ad456ad32930ee2cc58e466478fe757822c22f7f"
+version = "0.11.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cce27af05d45b901bb28da33ff8b2b2b2044f595b24fc0f36d4882dae91d484"
 dependencies = [
  "aead",
  "aes",
@@ -1094,7 +1095,7 @@ dependencies = [
 
 [[package]]
 name = "pkcs5"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.2"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -1416,8 +1417,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "salsa20"
-version = "0.11.0-pre.1"
-source = "git+https://github.com/RustCrypto/stream-ciphers.git#9fcbf802c3ec29672f6fa2f22fc6ac1abce24996"
+version = "0.11.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1affa54a576c40080654b494bb3f3198fa2fe46e0954b85196d122e3561c2fd0"
 dependencies = [
  "cfg-if",
  "cipher",
@@ -1434,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "scrypt"
-version = "0.12.0-pre.1"
+version = "0.12.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3b72607db59bcdf41734bf35ca0d1589a2187fa5ec2f75ff4c61c55ca4dc2c"
+checksum = "8a91394d9fa36fde88b8b976973db9fe6a0e4b32eea79f0ca13ba1b818daa3b2"
 dependencies = [
  "pbkdf2",
  "salsa20",
diff --git a/Cargo.toml b/Cargo.toml
index eb48d19da..45c428699 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,8 +61,3 @@ x509-ocsp = { path = "./x509-ocsp" }
 
 # Temp patches to external crates
 rsa = { git = "https://github.com/RustCrypto/RSA" }
-
-# https://github.com/RustCrypto/AEADs/pull/632
-aes-gcm = { git = "https://github.com/RustCrypto/AEADs.git" }
-# https://github.com/RustCrypto/stream-ciphers/pull/368
-salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
diff --git a/pkcs5/Cargo.toml b/pkcs5/Cargo.toml
index f20d6d24e..c84622e78 100644
--- a/pkcs5/Cargo.toml
+++ b/pkcs5/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pkcs5"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.2"
 description = """
 Pure Rust implementation of Public-Key Cryptography Standards (PKCS) #5:
 Password-Based Cryptography Specification Version 2.1 (RFC 8018)
@@ -22,11 +22,11 @@ spki = { version = "0.8.0-rc.0" }
 # optional dependencies
 cbc = { version = "=0.2.0-pre.2", optional = true }
 aes = { version = "=0.9.0-pre.2", optional = true, default-features = false }
-aes-gcm = { version = "=0.11.0-pre.1", optional = true, default-features = false, features = ["aes"] }
+aes-gcm = { version = "=0.11.0-pre.2", optional = true, default-features = false, features = ["aes"] }
 des = { version = "=0.9.0-pre.2", optional = true, default-features = false }
 pbkdf2 = { version = "=0.13.0-pre.1", optional = true, default-features = false, features = ["hmac"] }
 rand_core = { version = "0.6.4", optional = true, default-features = false }
-scrypt = { version = "=0.12.0-pre.1", optional = true, default-features = false }
+scrypt = { version = "=0.12.0-pre.2", optional = true, default-features = false }
 sha1 = { version = "=0.11.0-pre.4", optional = true, default-features = false }
 sha2 = { version = "=0.11.0-pre.4", optional = true, default-features = false }