From f57f9a7e19ac5044033b8cc3268cac662d63f251 Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 16:34:23 +0000 Subject: [PATCH 01/13] OSS-Fuzz: OSS-Fuzz fuzzing integration Signed-off-by: Arthur Chan --- Cargo.toml | 1 + scrypt/fuzz/.gitignore | 4 + scrypt/fuzz/Cargo.toml | 32 +++++ scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs | 138 ++++++++++++++++++++++ 4 files changed, 175 insertions(+) create mode 100644 scrypt/fuzz/.gitignore create mode 100644 scrypt/fuzz/Cargo.toml create mode 100644 scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs diff --git a/Cargo.toml b/Cargo.toml index a61f628e..ebce3ec6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ members = [ "password-auth", "pbkdf2", "scrypt", + "scrypt/fuzz", "sha-crypt", "yescrypt" ] diff --git a/scrypt/fuzz/.gitignore b/scrypt/fuzz/.gitignore new file mode 100644 index 00000000..1a45eee7 --- /dev/null +++ b/scrypt/fuzz/.gitignore @@ -0,0 +1,4 @@ +target +corpus +artifacts +coverage diff --git a/scrypt/fuzz/Cargo.toml b/scrypt/fuzz/Cargo.toml new file mode 100644 index 00000000..f7185140 --- /dev/null +++ b/scrypt/fuzz/Cargo.toml @@ -0,0 +1,32 @@ +[package] +name = "scrypt-fuzz" +version = "0.0.0" +publish = false +edition = "2018" + +[package.metadata] +cargo-fuzz = true + +[dependencies] +libfuzzer-sys = "0.4" +pbkdf2 = { version = "=0.13.0-pre.1", path = "../../pbkdf2" } +salsa20 = { version = "=0.11.0-pre.2", default-features = false } +sha2 = { version = "=0.11.0-pre.4", default-features = false } +password-hash = { version = "0.6.0-rc.0", default-features = false, features = ["rand_core"], optional = true } +hex = "0.4" +base64 = "0.22.1" + +[features] +default = ["simple", "std"] +simple = ["password-hash"] +std = ["password-hash/std"] + +[dependencies.scrypt] +path = ".." + +[[bin]] +name = "scrypt_fuzzer" +path = "fuzz_targets/scrypt_fuzzer.rs" +test = false +doc = false +bench = false diff --git a/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs b/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs new file mode 100644 index 00000000..882845cf --- /dev/null +++ b/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs @@ -0,0 +1,138 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#![no_main] + +use libfuzzer_sys::fuzz_target; +use scrypt::{scrypt, Params}; + +#[cfg(feature = "simple")] +use { + password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, + scrypt::Scrypt, + password_hash::Ident, +}; + +#[cfg(feature = "simple")] +const SAMPLE_HASH: &str = + "$scrypt$ln=16,r=8,p=1$aM15713r3Xsvxbi31lqr1Q$nFNh2CVHVjNldFVKDHDlm4CbdRSCdEBsjjJxD+iCs5E"; + +// Generate random params +fn fuzzed_params(data: &[u8]) -> Option { + if data.len() >= 4 { + let log_n = data[0] % 16; // Cap log_n to 16 + let r = u32::from_le_bytes([data[1], data[2], data[3], 0]) % 32; // Cap r to a reasonable value like 32 + let p = if data.len() > 4 { u32::from_le_bytes([data[4], data[5], data[6], 0]) % 16 } else { 1 }; + let len = if data.len() > 7 { data[7] as usize % 65 } else { 32 }; + + Params::new(log_n, r, p, len).ok() + } else { + None + } +} + +// Generate random salt value +#[cfg(feature = "simple")] +fn fuzzed_salt(data: &[u8]) -> Option { + let salt_data = if data.len() >= 16 { + &data[..16] + } else { + &data + }; + SaltString::encode_b64(salt_data).ok() +} + +// Validate the salt string +fn validate_salt(salt_str: &str) -> bool { + // Check length + let length = salt_str.len(); + if length < 4 || length > 64 { + return false; + } + + for char in salt_str.chars() { + if !matches!(char, 'a'..='z' | 'A'..='Z' | '0'..='9' | '/' | '+' | '.' | '-') { + return false; + } + } + + true +} + +// Prepare random data by splitting random data +fn split_fuzz_data<'a>(data: &'a [u8], splits: &[usize]) -> Vec<&'a [u8]> { + let mut result = Vec::new(); + let mut start = 0; + + for &split in splits { + if start + split <= data.len() { + result.push(&data[start..start + split]); + start += split; + } else { + result.push(&data[start..]); + break; + } + } + + result +} + +fuzz_target!(|data: &[u8]| { + let params = fuzzed_params(data).unwrap_or_else(|| Params::new(16, 8, 1, 64).unwrap()); + let splits = split_fuzz_data(data, &[32, 32, 32]); + let password = splits.get(0).unwrap_or(&data); + let salt = splits.get(1).unwrap_or(&data); + let mut result = vec![0u8; 256]; + + #[cfg(feature = "simple")] + if let Some(salt_string) = fuzzed_salt(salt) { + if !validate_salt(salt_string.as_str()) { + return; + } + + let salt_value = salt_string.as_salt(); // Safe to use now + + let formatted_hash = format!("$scrypt$ln=16,r=8,p=1${}$invalid$", hex::encode(password)); + + if let Ok(hash) = PasswordHash::new(SAMPLE_HASH).or_else(|_| PasswordHash::new(formatted_hash.as_str())) { + // Randomly choose the fuzz target function + let target_selector = if !data.is_empty() { data[0] % 5 } else { 0 }; + match target_selector { + 0 => { + let _ = scrypt(password, salt, ¶ms, &mut result); + }, + 1 => { + let _ = Scrypt.verify_password(password, &hash).is_err(); + }, + 2 => { + let _ = Scrypt.hash_password_customized(password, Some(Ident::new_unwrap("scrypt")), None, params, salt_value); + }, + 3 => { + if let Some(random_params) = fuzzed_params(password) { + let _ = scrypt(password, salt, &random_params, &mut result); + } + }, + 4 => { + let _ = PasswordHash::new(SAMPLE_HASH).is_ok(); + }, + _ => { + let _ = scrypt(password, salt, ¶ms, &mut result); + }, + } + } + } else { + // Skip this iteration if the salt is invalid + return; + } +}); From ddc693bbf1e4c94e1bc20d64d795923deaea84d1 Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 16:57:32 +0000 Subject: [PATCH 02/13] Fix formatting Signed-off-by: Arthur Chan --- scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs | 50 ++++++++++++++--------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs b/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs index 882845cf..96d76d5c 100644 --- a/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs +++ b/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs @@ -19,9 +19,9 @@ use scrypt::{scrypt, Params}; #[cfg(feature = "simple")] use { + password_hash::Ident, password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, scrypt::Scrypt, - password_hash::Ident, }; #[cfg(feature = "simple")] @@ -33,8 +33,16 @@ fn fuzzed_params(data: &[u8]) -> Option { if data.len() >= 4 { let log_n = data[0] % 16; // Cap log_n to 16 let r = u32::from_le_bytes([data[1], data[2], data[3], 0]) % 32; // Cap r to a reasonable value like 32 - let p = if data.len() > 4 { u32::from_le_bytes([data[4], data[5], data[6], 0]) % 16 } else { 1 }; - let len = if data.len() > 7 { data[7] as usize % 65 } else { 32 }; + let p = if data.len() > 4 { + u32::from_le_bytes([data[4], data[5], data[6], 0]) % 16 + } else { + 1 + }; + let len = if data.len() > 7 { + data[7] as usize % 65 + } else { + 32 + }; Params::new(log_n, r, p, len).ok() } else { @@ -45,11 +53,7 @@ fn fuzzed_params(data: &[u8]) -> Option { // Generate random salt value #[cfg(feature = "simple")] fn fuzzed_salt(data: &[u8]) -> Option { - let salt_data = if data.len() >= 16 { - &data[..16] - } else { - &data - }; + let salt_data = if data.len() >= 16 { &data[..16] } else { data }; SaltString::encode_b64(salt_data).ok() } @@ -57,7 +61,7 @@ fn fuzzed_salt(data: &[u8]) -> Option { fn validate_salt(salt_str: &str) -> bool { // Check length let length = salt_str.len(); - if length < 4 || length > 64 { + if !(4..=64).contains(&length) { return false; } @@ -81,7 +85,7 @@ fn split_fuzz_data<'a>(data: &'a [u8], splits: &[usize]) -> Vec<&'a [u8]> { start += split; } else { result.push(&data[start..]); - break; + break; } } @@ -91,7 +95,7 @@ fn split_fuzz_data<'a>(data: &'a [u8], splits: &[usize]) -> Vec<&'a [u8]> { fuzz_target!(|data: &[u8]| { let params = fuzzed_params(data).unwrap_or_else(|| Params::new(16, 8, 1, 64).unwrap()); let splits = split_fuzz_data(data, &[32, 32, 32]); - let password = splits.get(0).unwrap_or(&data); + let password = splits.first().unwrap_or(&data); let salt = splits.get(1).unwrap_or(&data); let mut result = vec![0u8; 256]; @@ -105,30 +109,38 @@ fuzz_target!(|data: &[u8]| { let formatted_hash = format!("$scrypt$ln=16,r=8,p=1${}$invalid$", hex::encode(password)); - if let Ok(hash) = PasswordHash::new(SAMPLE_HASH).or_else(|_| PasswordHash::new(formatted_hash.as_str())) { + if let Ok(hash) = + PasswordHash::new(SAMPLE_HASH).or_else(|_| PasswordHash::new(formatted_hash.as_str())) + { // Randomly choose the fuzz target function let target_selector = if !data.is_empty() { data[0] % 5 } else { 0 }; match target_selector { 0 => { let _ = scrypt(password, salt, ¶ms, &mut result); - }, + } 1 => { let _ = Scrypt.verify_password(password, &hash).is_err(); - }, + } 2 => { - let _ = Scrypt.hash_password_customized(password, Some(Ident::new_unwrap("scrypt")), None, params, salt_value); - }, + let _ = Scrypt.hash_password_customized( + password, + Some(Ident::new_unwrap("scrypt")), + None, + params, + salt_value, + ); + } 3 => { if let Some(random_params) = fuzzed_params(password) { let _ = scrypt(password, salt, &random_params, &mut result); } - }, + } 4 => { let _ = PasswordHash::new(SAMPLE_HASH).is_ok(); - }, + } _ => { let _ = scrypt(password, salt, ¶ms, &mut result); - }, + } } } } else { From bf4ff9405ef0809bf3ad2d6358e624768f1e43c5 Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 17:21:37 +0000 Subject: [PATCH 03/13] Move fuzz directory to root Signed-off-by: Arthur Chan --- Cargo.toml | 2 +- {scrypt/fuzz => fuzz}/.gitignore | 0 {scrypt/fuzz => fuzz}/Cargo.toml | 4 ++-- {scrypt/fuzz => fuzz}/fuzz_targets/scrypt_fuzzer.rs | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {scrypt/fuzz => fuzz}/.gitignore (100%) rename {scrypt/fuzz => fuzz}/Cargo.toml (89%) rename {scrypt/fuzz => fuzz}/fuzz_targets/scrypt_fuzzer.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index ebce3ec6..259aa9f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,10 +4,10 @@ members = [ "argon2", "balloon-hash", "bcrypt-pbkdf", + "fuzz", "password-auth", "pbkdf2", "scrypt", - "scrypt/fuzz", "sha-crypt", "yescrypt" ] diff --git a/scrypt/fuzz/.gitignore b/fuzz/.gitignore similarity index 100% rename from scrypt/fuzz/.gitignore rename to fuzz/.gitignore diff --git a/scrypt/fuzz/Cargo.toml b/fuzz/Cargo.toml similarity index 89% rename from scrypt/fuzz/Cargo.toml rename to fuzz/Cargo.toml index f7185140..511a56c2 100644 --- a/scrypt/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -9,7 +9,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" -pbkdf2 = { version = "=0.13.0-pre.1", path = "../../pbkdf2" } +pbkdf2 = { version = "=0.13.0-pre.1", path = "../pbkdf2" } salsa20 = { version = "=0.11.0-pre.2", default-features = false } sha2 = { version = "=0.11.0-pre.4", default-features = false } password-hash = { version = "0.6.0-rc.0", default-features = false, features = ["rand_core"], optional = true } @@ -22,7 +22,7 @@ simple = ["password-hash"] std = ["password-hash/std"] [dependencies.scrypt] -path = ".." +path = "../scrypt" [[bin]] name = "scrypt_fuzzer" diff --git a/scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs b/fuzz/fuzz_targets/scrypt_fuzzer.rs similarity index 100% rename from scrypt/fuzz/fuzz_targets/scrypt_fuzzer.rs rename to fuzz/fuzz_targets/scrypt_fuzzer.rs From 839da6f2ef4b6a48caf55756d3571efb2d03308a Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 17:32:40 +0000 Subject: [PATCH 04/13] Exclude fuzz in Cargo workspace Signed-off-by: Arthur Chan --- Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 259aa9f7..6c986962 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,14 +4,13 @@ members = [ "argon2", "balloon-hash", "bcrypt-pbkdf", - "fuzz", "password-auth", "pbkdf2", "scrypt", "sha-crypt", "yescrypt" ] -exclude = ["benches"] +exclude = ["benches", "fuzz"] [profile.dev] opt-level = 2 From 3249f84ae9b7d41473ddac20bfb15ed604cb579a Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 17:56:10 +0000 Subject: [PATCH 05/13] Remove unused dependencies Signed-off-by: Arthur Chan --- fuzz/Cargo.toml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 511a56c2..8c5e6622 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -9,9 +9,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" -pbkdf2 = { version = "=0.13.0-pre.1", path = "../pbkdf2" } -salsa20 = { version = "=0.11.0-pre.2", default-features = false } -sha2 = { version = "=0.11.0-pre.4", default-features = false } +scrypt = { path = "../scrypt" } password-hash = { version = "0.6.0-rc.0", default-features = false, features = ["rand_core"], optional = true } hex = "0.4" base64 = "0.22.1" @@ -21,9 +19,6 @@ default = ["simple", "std"] simple = ["password-hash"] std = ["password-hash/std"] -[dependencies.scrypt] -path = "../scrypt" - [[bin]] name = "scrypt_fuzzer" path = "fuzz_targets/scrypt_fuzzer.rs" From c2796855fc5ab14ab6ff23df8a157ba83a14ae96 Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 19:00:08 +0000 Subject: [PATCH 06/13] Fix dependencies and features setting Signed-off-by: Arthur Chan --- fuzz/Cargo.toml | 9 +-------- fuzz/fuzz_targets/scrypt_fuzzer.rs | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 8c5e6622..52e0999a 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -9,15 +9,8 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" -scrypt = { path = "../scrypt" } -password-hash = { version = "0.6.0-rc.0", default-features = false, features = ["rand_core"], optional = true } +scrypt = { path = "../scrypt", features = ["simple"]} hex = "0.4" -base64 = "0.22.1" - -[features] -default = ["simple", "std"] -simple = ["password-hash"] -std = ["password-hash/std"] [[bin]] name = "scrypt_fuzzer" diff --git a/fuzz/fuzz_targets/scrypt_fuzzer.rs b/fuzz/fuzz_targets/scrypt_fuzzer.rs index 96d76d5c..954a0f30 100644 --- a/fuzz/fuzz_targets/scrypt_fuzzer.rs +++ b/fuzz/fuzz_targets/scrypt_fuzzer.rs @@ -30,7 +30,7 @@ const SAMPLE_HASH: &str = // Generate random params fn fuzzed_params(data: &[u8]) -> Option { - if data.len() >= 4 { + if data.len() >= 8 { let log_n = data[0] % 16; // Cap log_n to 16 let r = u32::from_le_bytes([data[1], data[2], data[3], 0]) % 32; // Cap r to a reasonable value like 32 let p = if data.len() > 4 { From 3d4fb68a36a3be9f3f4542b4bcec43cf65cfa4da Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 20:08:19 +0000 Subject: [PATCH 07/13] Replace hex with base64ct::Base64 Signed-off-by: Arthur Chan --- fuzz/Cargo.toml | 1 - fuzz/fuzz_targets/scrypt_fuzzer.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 52e0999a..50089e7b 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -10,7 +10,6 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" scrypt = { path = "../scrypt", features = ["simple"]} -hex = "0.4" [[bin]] name = "scrypt_fuzzer" diff --git a/fuzz/fuzz_targets/scrypt_fuzzer.rs b/fuzz/fuzz_targets/scrypt_fuzzer.rs index 954a0f30..73d3e1b6 100644 --- a/fuzz/fuzz_targets/scrypt_fuzzer.rs +++ b/fuzz/fuzz_targets/scrypt_fuzzer.rs @@ -107,7 +107,7 @@ fuzz_target!(|data: &[u8]| { let salt_value = salt_string.as_salt(); // Safe to use now - let formatted_hash = format!("$scrypt$ln=16,r=8,p=1${}$invalid$", hex::encode(password)); + let formatted_hash = format!("$scrypt$ln=16,r=8,p=1${}$invalid$", base64ct::Base64::encode_string(password)); if let Ok(hash) = PasswordHash::new(SAMPLE_HASH).or_else(|_| PasswordHash::new(formatted_hash.as_str())) From d08e09349071027844065797a06c3429fc792581 Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 23:33:22 +0000 Subject: [PATCH 08/13] Fix license and logic Signed-off-by: Arthur Chan --- fuzz/Cargo.toml | 1 + fuzz/LICENSE-APACHE | 201 +++++++++++++++++++++++++++++ fuzz/LICENSE-MIT | 40 ++++++ fuzz/fuzz_targets/scrypt_fuzzer.rs | 15 +-- 4 files changed, 245 insertions(+), 12 deletions(-) create mode 100644 fuzz/LICENSE-APACHE create mode 100644 fuzz/LICENSE-MIT diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 50089e7b..d852794b 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -9,6 +9,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" +base16ct = { version = "0.2", features = ["alloc"] } scrypt = { path = "../scrypt", features = ["simple"]} [[bin]] diff --git a/fuzz/LICENSE-APACHE b/fuzz/LICENSE-APACHE new file mode 100644 index 00000000..78173fa2 --- /dev/null +++ b/fuzz/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/fuzz/LICENSE-MIT b/fuzz/LICENSE-MIT new file mode 100644 index 00000000..ca6363d7 --- /dev/null +++ b/fuzz/LICENSE-MIT @@ -0,0 +1,40 @@ +Copyright (c) 2021-2024 The RustCrypto Project Developers + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + + +Copyright (c) 2024 Google LLC + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/fuzz/fuzz_targets/scrypt_fuzzer.rs b/fuzz/fuzz_targets/scrypt_fuzzer.rs index 73d3e1b6..3be88800 100644 --- a/fuzz/fuzz_targets/scrypt_fuzzer.rs +++ b/fuzz/fuzz_targets/scrypt_fuzzer.rs @@ -15,16 +15,9 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use scrypt::{scrypt, Params}; +use scrypt::{scrypt, Params, Scrypt}; +use scrypt::password_hash::{Ident, PasswordHash, PasswordHasher, PasswordVerifier, SaltString}; -#[cfg(feature = "simple")] -use { - password_hash::Ident, - password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, - scrypt::Scrypt, -}; - -#[cfg(feature = "simple")] const SAMPLE_HASH: &str = "$scrypt$ln=16,r=8,p=1$aM15713r3Xsvxbi31lqr1Q$nFNh2CVHVjNldFVKDHDlm4CbdRSCdEBsjjJxD+iCs5E"; @@ -51,7 +44,6 @@ fn fuzzed_params(data: &[u8]) -> Option { } // Generate random salt value -#[cfg(feature = "simple")] fn fuzzed_salt(data: &[u8]) -> Option { let salt_data = if data.len() >= 16 { &data[..16] } else { data }; SaltString::encode_b64(salt_data).ok() @@ -99,7 +91,6 @@ fuzz_target!(|data: &[u8]| { let salt = splits.get(1).unwrap_or(&data); let mut result = vec![0u8; 256]; - #[cfg(feature = "simple")] if let Some(salt_string) = fuzzed_salt(salt) { if !validate_salt(salt_string.as_str()) { return; @@ -107,7 +98,7 @@ fuzz_target!(|data: &[u8]| { let salt_value = salt_string.as_salt(); // Safe to use now - let formatted_hash = format!("$scrypt$ln=16,r=8,p=1${}$invalid$", base64ct::Base64::encode_string(password)); + let formatted_hash = format!("$scrypt$ln=16,r=8,p=1${}$invalid$", base16ct::lower::encode_string(password)); if let Ok(hash) = PasswordHash::new(SAMPLE_HASH).or_else(|_| PasswordHash::new(formatted_hash.as_str())) From 71c278ac49451640ca066364ab59280a5fcabe17 Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 23:36:08 +0000 Subject: [PATCH 09/13] Add workflow for fuzz build Signed-off-by: Arthur Chan --- .github/workflows/fuzz_build.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/fuzz_build.yml diff --git a/.github/workflows/fuzz_build.yml b/.github/workflows/fuzz_build.yml new file mode 100644 index 00000000..90dbe926 --- /dev/null +++ b/.github/workflows/fuzz_build.yml @@ -0,0 +1,27 @@ +name: fuzz-build + +on: + pull_request: + paths: + - "fuzz/**" + push: + branches: master + +defaults: + run: + working-directory: fuzz + +env: + CARGO_INCREMENTAL: 0 + RUSTFLAGS: "-Dwarnings" + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: RustCrypto/actions/cargo-cache@master + - uses: dtolnay/rust-toolchain@master + with: + toolchain: stable + - run: cargo fuzz build -O From 18e05135b8f2a8dee6708056889a5c7024e48ee2 Mon Sep 17 00:00:00 2001 From: Arthur Chan Date: Mon, 21 Oct 2024 23:39:49 +0000 Subject: [PATCH 10/13] Fix fuzz build CI Signed-off-by: Arthur Chan --- .github/workflows/fuzz_build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fuzz_build.yml b/.github/workflows/fuzz_build.yml index 90dbe926..e34ab784 100644 --- a/.github/workflows/fuzz_build.yml +++ b/.github/workflows/fuzz_build.yml @@ -24,4 +24,9 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: stable - - run: cargo fuzz build -O + - name: Install cargo-fuzz + run: | + cargo install cargo-fuzz + - name: Build with cargo-fuzz + run: | + cargo fuzz build -s none From 6ff6fc4f7e261d78f53df19f44778368150b971f Mon Sep 17 00:00:00 2001 From: Artyom Pavlov Date: Wed, 23 Oct 2024 06:09:54 +0300 Subject: [PATCH 11/13] ci: use only `cargo build` --- .github/workflows/fuzz_build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/fuzz_build.yml b/.github/workflows/fuzz_build.yml index e34ab784..610e6edd 100644 --- a/.github/workflows/fuzz_build.yml +++ b/.github/workflows/fuzz_build.yml @@ -24,9 +24,4 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: stable - - name: Install cargo-fuzz - run: | - cargo install cargo-fuzz - - name: Build with cargo-fuzz - run: | - cargo fuzz build -s none + - run: cargo build From a65d634651a3369fb7f5f60c06c3af2666332db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Wed, 23 Oct 2024 07:49:25 +0300 Subject: [PATCH 12/13] Split fuzz targets --- fuzz/Cargo.toml | 21 +++- fuzz/LICENSE-MIT | 18 +--- fuzz/fuzz_targets/scrypt_fuzzer.rs | 141 ------------------------- fuzz/fuzz_targets/scrypt_hash.rs | 12 +++ fuzz/fuzz_targets/scrypt_phc_hash.rs | 22 ++++ fuzz/fuzz_targets/scrypt_phc_verify.rs | 13 +++ fuzz/src/lib.rs | 16 +++ 7 files changed, 82 insertions(+), 161 deletions(-) delete mode 100644 fuzz/fuzz_targets/scrypt_fuzzer.rs create mode 100644 fuzz/fuzz_targets/scrypt_hash.rs create mode 100644 fuzz/fuzz_targets/scrypt_phc_hash.rs create mode 100644 fuzz/fuzz_targets/scrypt_phc_verify.rs create mode 100644 fuzz/src/lib.rs diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index d852794b..c5b805db 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "scrypt-fuzz" +name = "fuzz" version = "0.0.0" publish = false edition = "2018" @@ -9,12 +9,25 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" -base16ct = { version = "0.2", features = ["alloc"] } scrypt = { path = "../scrypt", features = ["simple"]} [[bin]] -name = "scrypt_fuzzer" -path = "fuzz_targets/scrypt_fuzzer.rs" +name = "scrypt_hash" +path = "fuzz_targets/scrypt_hash.rs" +test = false +doc = false +bench = false + +[[bin]] +name = "scrypt_phc_verify" +path = "fuzz_targets/scrypt_phc_verify.rs" +test = false +doc = false +bench = false + +[[bin]] +name = "scrypt_phc_hash" +path = "fuzz_targets/scrypt_phc_hash.rs" test = false doc = false bench = false diff --git a/fuzz/LICENSE-MIT b/fuzz/LICENSE-MIT index ca6363d7..86fd6862 100644 --- a/fuzz/LICENSE-MIT +++ b/fuzz/LICENSE-MIT @@ -1,4 +1,5 @@ -Copyright (c) 2021-2024 The RustCrypto Project Developers +Copyright (c) 2024 The RustCrypto Project Developers +Copyright (c) 2024 Google LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated @@ -23,18 +24,3 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - -Copyright (c) 2024 Google LLC - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/fuzz/fuzz_targets/scrypt_fuzzer.rs b/fuzz/fuzz_targets/scrypt_fuzzer.rs deleted file mode 100644 index 3be88800..00000000 --- a/fuzz/fuzz_targets/scrypt_fuzzer.rs +++ /dev/null @@ -1,141 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#![no_main] - -use libfuzzer_sys::fuzz_target; -use scrypt::{scrypt, Params, Scrypt}; -use scrypt::password_hash::{Ident, PasswordHash, PasswordHasher, PasswordVerifier, SaltString}; - -const SAMPLE_HASH: &str = - "$scrypt$ln=16,r=8,p=1$aM15713r3Xsvxbi31lqr1Q$nFNh2CVHVjNldFVKDHDlm4CbdRSCdEBsjjJxD+iCs5E"; - -// Generate random params -fn fuzzed_params(data: &[u8]) -> Option { - if data.len() >= 8 { - let log_n = data[0] % 16; // Cap log_n to 16 - let r = u32::from_le_bytes([data[1], data[2], data[3], 0]) % 32; // Cap r to a reasonable value like 32 - let p = if data.len() > 4 { - u32::from_le_bytes([data[4], data[5], data[6], 0]) % 16 - } else { - 1 - }; - let len = if data.len() > 7 { - data[7] as usize % 65 - } else { - 32 - }; - - Params::new(log_n, r, p, len).ok() - } else { - None - } -} - -// Generate random salt value -fn fuzzed_salt(data: &[u8]) -> Option { - let salt_data = if data.len() >= 16 { &data[..16] } else { data }; - SaltString::encode_b64(salt_data).ok() -} - -// Validate the salt string -fn validate_salt(salt_str: &str) -> bool { - // Check length - let length = salt_str.len(); - if !(4..=64).contains(&length) { - return false; - } - - for char in salt_str.chars() { - if !matches!(char, 'a'..='z' | 'A'..='Z' | '0'..='9' | '/' | '+' | '.' | '-') { - return false; - } - } - - true -} - -// Prepare random data by splitting random data -fn split_fuzz_data<'a>(data: &'a [u8], splits: &[usize]) -> Vec<&'a [u8]> { - let mut result = Vec::new(); - let mut start = 0; - - for &split in splits { - if start + split <= data.len() { - result.push(&data[start..start + split]); - start += split; - } else { - result.push(&data[start..]); - break; - } - } - - result -} - -fuzz_target!(|data: &[u8]| { - let params = fuzzed_params(data).unwrap_or_else(|| Params::new(16, 8, 1, 64).unwrap()); - let splits = split_fuzz_data(data, &[32, 32, 32]); - let password = splits.first().unwrap_or(&data); - let salt = splits.get(1).unwrap_or(&data); - let mut result = vec![0u8; 256]; - - if let Some(salt_string) = fuzzed_salt(salt) { - if !validate_salt(salt_string.as_str()) { - return; - } - - let salt_value = salt_string.as_salt(); // Safe to use now - - let formatted_hash = format!("$scrypt$ln=16,r=8,p=1${}$invalid$", base16ct::lower::encode_string(password)); - - if let Ok(hash) = - PasswordHash::new(SAMPLE_HASH).or_else(|_| PasswordHash::new(formatted_hash.as_str())) - { - // Randomly choose the fuzz target function - let target_selector = if !data.is_empty() { data[0] % 5 } else { 0 }; - match target_selector { - 0 => { - let _ = scrypt(password, salt, ¶ms, &mut result); - } - 1 => { - let _ = Scrypt.verify_password(password, &hash).is_err(); - } - 2 => { - let _ = Scrypt.hash_password_customized( - password, - Some(Ident::new_unwrap("scrypt")), - None, - params, - salt_value, - ); - } - 3 => { - if let Some(random_params) = fuzzed_params(password) { - let _ = scrypt(password, salt, &random_params, &mut result); - } - } - 4 => { - let _ = PasswordHash::new(SAMPLE_HASH).is_ok(); - } - _ => { - let _ = scrypt(password, salt, ¶ms, &mut result); - } - } - } - } else { - // Skip this iteration if the salt is invalid - return; - } -}); diff --git a/fuzz/fuzz_targets/scrypt_hash.rs b/fuzz/fuzz_targets/scrypt_hash.rs new file mode 100644 index 00000000..03ec1cea --- /dev/null +++ b/fuzz/fuzz_targets/scrypt_hash.rs @@ -0,0 +1,12 @@ +#![no_main] +use libfuzzer_sys::fuzz_target; +use scrypt::scrypt; + +use fuzz::ScryptRandParams; + +fuzz_target!(|data: (&[u8], &[u8], ScryptRandParams)| { + let (password, salt, ScryptRandParams(params)) = data; + let mut result = [0u8; 64]; + let res = scrypt(password, salt, ¶ms, &mut result); + assert!(res.is_ok()); +}); diff --git a/fuzz/fuzz_targets/scrypt_phc_hash.rs b/fuzz/fuzz_targets/scrypt_phc_hash.rs new file mode 100644 index 00000000..39c30408 --- /dev/null +++ b/fuzz/fuzz_targets/scrypt_phc_hash.rs @@ -0,0 +1,22 @@ +#![no_main] +use libfuzzer_sys::fuzz_target; +use scrypt::password_hash::{Ident, PasswordHasher, Salt, SaltString}; +use scrypt::Scrypt; + +use fuzz::ScryptRandParams; + +fuzz_target!(|data: (&[u8], &[u8], ScryptRandParams)| { + let (password, salt, ScryptRandParams(params)) = data; + if salt.len() < Salt::MIN_LENGTH { + return; + } + let salt_string = SaltString::encode_b64(salt).unwrap(); + let res = Scrypt.hash_password_customized( + password, + Some(Ident::new_unwrap("scrypt")), + None, + params, + &salt_string, + ); + assert!(res.is_ok()); +}); diff --git a/fuzz/fuzz_targets/scrypt_phc_verify.rs b/fuzz/fuzz_targets/scrypt_phc_verify.rs new file mode 100644 index 00000000..4052d9f6 --- /dev/null +++ b/fuzz/fuzz_targets/scrypt_phc_verify.rs @@ -0,0 +1,13 @@ +#![no_main] +use libfuzzer_sys::fuzz_target; +use scrypt::password_hash::{PasswordHash, PasswordVerifier}; +use scrypt::Scrypt; + +const SAMPLE_HASH: &str = "$scrypt$ln=16,r=8,p=1$\ + aM15713r3Xsvxbi31lqr1Q$nFNh2CVHVjNldFVKDHDlm4CbdRSCdEBsjjJxD+iCs5E"; + +fuzz_target!(|password: &[u8]| { + let hash = PasswordHash::new(SAMPLE_HASH).expect("SAMPLE_HASH is valid"); + let res = Scrypt.verify_password(password, &hash); + assert!(res.is_err()); +}); diff --git a/fuzz/src/lib.rs b/fuzz/src/lib.rs new file mode 100644 index 00000000..1ba2c8a4 --- /dev/null +++ b/fuzz/src/lib.rs @@ -0,0 +1,16 @@ +use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; + +#[derive(Debug)] +pub struct ScryptRandParams(pub scrypt::Params); + +impl<'a> Arbitrary<'a> for ScryptRandParams { + fn arbitrary(u: &mut Unstructured<'a>) -> Result { + let log_n = u.int_in_range(0..=15)?; + let r = u.int_in_range(1..=32)?; + let p = u.int_in_range(1..=16)?; + let len = u.int_in_range(10..=64)?; + + let params = scrypt::Params::new(log_n, r, p, len).unwrap(); + Ok(Self(params)) + } +} From 93a83f1bb240e93004555c6d9092e9cda7bd15e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Wed, 23 Oct 2024 13:57:27 +0300 Subject: [PATCH 13/13] Merge all fuzz targets into one --- fuzz/Cargo.toml | 18 ++-------- fuzz/fuzz_targets/scrypt.rs | 50 ++++++++++++++++++++++++++ fuzz/fuzz_targets/scrypt_hash.rs | 12 ------- fuzz/fuzz_targets/scrypt_phc_hash.rs | 22 ------------ fuzz/fuzz_targets/scrypt_phc_verify.rs | 13 ------- fuzz/src/lib.rs | 16 --------- 6 files changed, 52 insertions(+), 79 deletions(-) create mode 100644 fuzz/fuzz_targets/scrypt.rs delete mode 100644 fuzz/fuzz_targets/scrypt_hash.rs delete mode 100644 fuzz/fuzz_targets/scrypt_phc_hash.rs delete mode 100644 fuzz/fuzz_targets/scrypt_phc_verify.rs delete mode 100644 fuzz/src/lib.rs diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index c5b805db..fe54effb 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -12,22 +12,8 @@ libfuzzer-sys = "0.4" scrypt = { path = "../scrypt", features = ["simple"]} [[bin]] -name = "scrypt_hash" -path = "fuzz_targets/scrypt_hash.rs" -test = false -doc = false -bench = false - -[[bin]] -name = "scrypt_phc_verify" -path = "fuzz_targets/scrypt_phc_verify.rs" -test = false -doc = false -bench = false - -[[bin]] -name = "scrypt_phc_hash" -path = "fuzz_targets/scrypt_phc_hash.rs" +name = "scrypt" +path = "fuzz_targets/scrypt.rs" test = false doc = false bench = false diff --git a/fuzz/fuzz_targets/scrypt.rs b/fuzz/fuzz_targets/scrypt.rs new file mode 100644 index 00000000..48916dab --- /dev/null +++ b/fuzz/fuzz_targets/scrypt.rs @@ -0,0 +1,50 @@ +#![no_main] +use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; +use libfuzzer_sys::fuzz_target; +use scrypt::password_hash::{ + Ident, PasswordHash, PasswordHasher, PasswordVerifier, Salt, SaltString, +}; +use scrypt::{scrypt, Scrypt}; + +#[derive(Debug)] +pub struct ScryptRandParams(pub scrypt::Params); + +impl<'a> Arbitrary<'a> for ScryptRandParams { + fn arbitrary(u: &mut Unstructured<'a>) -> Result { + let log_n = u.int_in_range(0..=15)?; + let r = u.int_in_range(1..=32)?; + let p = u.int_in_range(1..=16)?; + let len = u.int_in_range(10..=64)?; + + let params = scrypt::Params::new(log_n, r, p, len).unwrap(); + Ok(Self(params)) + } +} + +fuzz_target!(|data: (&[u8], &[u8], ScryptRandParams)| { + let (password, salt, ScryptRandParams(params)) = data; + + // Check direct hashing + let mut result = [0u8; 64]; + scrypt(password, salt, ¶ms, &mut result).unwrap(); + + // Check PHC hashing + if salt.len() < Salt::MIN_LENGTH { + return; + } + let salt_string = SaltString::encode_b64(salt).unwrap(); + let phc_hash = Scrypt + .hash_password_customized( + password, + Some(Ident::new_unwrap("scrypt")), + None, + params, + &salt_string, + ) + .unwrap() + .to_string(); + + // Check PHC verification + let hash = PasswordHash::new(&phc_hash).unwrap(); + Scrypt.verify_password(password, &hash).unwrap(); +}); diff --git a/fuzz/fuzz_targets/scrypt_hash.rs b/fuzz/fuzz_targets/scrypt_hash.rs deleted file mode 100644 index 03ec1cea..00000000 --- a/fuzz/fuzz_targets/scrypt_hash.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![no_main] -use libfuzzer_sys::fuzz_target; -use scrypt::scrypt; - -use fuzz::ScryptRandParams; - -fuzz_target!(|data: (&[u8], &[u8], ScryptRandParams)| { - let (password, salt, ScryptRandParams(params)) = data; - let mut result = [0u8; 64]; - let res = scrypt(password, salt, ¶ms, &mut result); - assert!(res.is_ok()); -}); diff --git a/fuzz/fuzz_targets/scrypt_phc_hash.rs b/fuzz/fuzz_targets/scrypt_phc_hash.rs deleted file mode 100644 index 39c30408..00000000 --- a/fuzz/fuzz_targets/scrypt_phc_hash.rs +++ /dev/null @@ -1,22 +0,0 @@ -#![no_main] -use libfuzzer_sys::fuzz_target; -use scrypt::password_hash::{Ident, PasswordHasher, Salt, SaltString}; -use scrypt::Scrypt; - -use fuzz::ScryptRandParams; - -fuzz_target!(|data: (&[u8], &[u8], ScryptRandParams)| { - let (password, salt, ScryptRandParams(params)) = data; - if salt.len() < Salt::MIN_LENGTH { - return; - } - let salt_string = SaltString::encode_b64(salt).unwrap(); - let res = Scrypt.hash_password_customized( - password, - Some(Ident::new_unwrap("scrypt")), - None, - params, - &salt_string, - ); - assert!(res.is_ok()); -}); diff --git a/fuzz/fuzz_targets/scrypt_phc_verify.rs b/fuzz/fuzz_targets/scrypt_phc_verify.rs deleted file mode 100644 index 4052d9f6..00000000 --- a/fuzz/fuzz_targets/scrypt_phc_verify.rs +++ /dev/null @@ -1,13 +0,0 @@ -#![no_main] -use libfuzzer_sys::fuzz_target; -use scrypt::password_hash::{PasswordHash, PasswordVerifier}; -use scrypt::Scrypt; - -const SAMPLE_HASH: &str = "$scrypt$ln=16,r=8,p=1$\ - aM15713r3Xsvxbi31lqr1Q$nFNh2CVHVjNldFVKDHDlm4CbdRSCdEBsjjJxD+iCs5E"; - -fuzz_target!(|password: &[u8]| { - let hash = PasswordHash::new(SAMPLE_HASH).expect("SAMPLE_HASH is valid"); - let res = Scrypt.verify_password(password, &hash); - assert!(res.is_err()); -}); diff --git a/fuzz/src/lib.rs b/fuzz/src/lib.rs deleted file mode 100644 index 1ba2c8a4..00000000 --- a/fuzz/src/lib.rs +++ /dev/null @@ -1,16 +0,0 @@ -use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; - -#[derive(Debug)] -pub struct ScryptRandParams(pub scrypt::Params); - -impl<'a> Arbitrary<'a> for ScryptRandParams { - fn arbitrary(u: &mut Unstructured<'a>) -> Result { - let log_n = u.int_in_range(0..=15)?; - let r = u.int_in_range(1..=32)?; - let p = u.int_in_range(1..=16)?; - let len = u.int_in_range(10..=64)?; - - let params = scrypt::Params::new(log_n, r, p, len).unwrap(); - Ok(Self(params)) - } -}