Add --scrypt-rc and --argon2-rc to stability tests

Author: lbeder

README.md

@@ -586,6 +586,8 @@ Usage: slowkey stability-test [OPTIONS] --tasks <TASKS>
 Options:
   -t, --tasks <TASKS>            Number of tasks
   -i, --iterations <ITERATIONS>  Number of iterations to perform (must be greater than 0 and lesser than or equal 2000) [default: 2000]
+      --scrypt-rc                Use rust-crypto's Scrypt implementation instead of libsodium (default)
+      --argon2-rc                Use rust-crypto's Argon2id implementation instead of libsodium (default)
   -h, --help                     Print help
 ```
 
@@ -1262,6 +1264,10 @@ In order to run stability tests, you can run the `stability-test` command and sp
 
 > slowkey stability-test -t 8
 
+By default, stability tests use libsodium implementations for Scrypt and Argon2id. You can use the `--scrypt-rc` and `--argon2-rc` flags to test the rust-crypto implementations instead:
+
+> slowkey stability-test -t 8 --scrypt-rc --argon2-rc
+
 ```sh
 Setting up a stability test task pool with 8 tasks, each running 2000 iterations
 

src/main.rs

@@ -211,6 +211,20 @@ enum Commands {
             default_value = STABILITY_TEST_ITERATIONS.to_string(),
             help = format!("Number of iterations to perform (must be greater than {} and lesser than or equal {})", 0, STABILITY_TEST_ITERATIONS))]
         iterations: usize,
+
+        #[arg(
+            long,
+            action = clap::ArgAction::SetTrue,
+            help = "Use rust-crypto's Scrypt implementation instead of libsodium (default)"
+        )]
+        scrypt_rc: bool,
+
+        #[arg(
+            long,
+            action = clap::ArgAction::SetTrue,
+            help = "Use rust-crypto's Argon2id implementation instead of libsodium (default)"
+        )]
+        argon2_rc: bool,
     },
 
     #[command(about = "Daisy-chain derivation through multiple secrets files")]
@@ -753,8 +767,25 @@ fn main() {
             log!("Saved benchmark reports to: \"{}\"", output_path.display());
         },
 
-        Commands::StabilityTest { tasks, iterations } => {
-            stability_test(tasks, iterations);
+        Commands::StabilityTest {
+            tasks,
+            iterations,
+            scrypt_rc,
+            argon2_rc,
+        } => {
+            let scrypt_implementation = if scrypt_rc {
+                ScryptImplementation::RustCrypto
+            } else {
+                ScryptImplementation::Libsodium
+            };
+
+            let argon2_implementation = if argon2_rc {
+                Argon2idImplementation::RustCrypto
+            } else {
+                Argon2idImplementation::Libsodium
+            };
+
+            stability_test(tasks, iterations, scrypt_implementation, argon2_implementation);
         },
 
         Commands::DaisyDerive {

src/stability.rs

@@ -1,7 +1,11 @@
 use crate::{log, warning};
 use crate::{
     slowkey::{SlowKey, SlowKeyOptions},
-    utils::algorithms::{argon2id::Argon2idOptions, balloon_hash::BalloonHashOptions, scrypt::ScryptOptions},
+    utils::algorithms::{
+        argon2id::{Argon2idImplementation, Argon2idOptions},
+        balloon_hash::BalloonHashOptions,
+        scrypt::{ScryptImplementation, ScryptOptions},
+    },
 };
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
@@ -2019,7 +2023,10 @@ static EXPECTED: [&str; STABILITY_TEST_ITERATIONS] = [
     "cf47a21d7876e09751c534db476c71689ba52b7c85f0f84945e3fa5c27b736af",
 ];
 
-pub fn stability_test(tasks: usize, iterations: usize) {
+pub fn stability_test(
+    tasks: usize, iterations: usize, scrypt_implementation: ScryptImplementation,
+    argon2_implementation: Argon2idImplementation,
+) {
     if tasks == 0 {
         panic!("Invalid number of tasks");
     }
@@ -2057,8 +2064,17 @@ pub fn stability_test(tasks: usize, iterations: usize) {
         let slowkey = SlowKey::new(&SlowKeyOptions {
             iterations,
             length: SlowKeyOptions::DEFAULT_OUTPUT_SIZE,
-            scrypt: ScryptOptions::default(),
-            argon2id: Argon2idOptions::default(),
+            scrypt: ScryptOptions::new_with_implementation(
+                ScryptOptions::DEFAULT_LOG_N,
+                ScryptOptions::DEFAULT_R,
+                ScryptOptions::DEFAULT_P,
+                scrypt_implementation,
+            ),
+            argon2id: Argon2idOptions::new_with_implementation(
+                Argon2idOptions::DEFAULT_M_COST,
+                Argon2idOptions::DEFAULT_T_COST,
+                argon2_implementation,
+            ),
             balloon_hash: BalloonHashOptions::default(),
         });