Skip to content

fix: use rand_chacha for random string generation #777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flemingcaleb merged 4 commits into from
Jun 29, 2024
Merged

fix: use rand_chacha for random string generation #777

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cba79a4
fix: use rand_chacha for random string generation
flemingcaleb May 25, 2024
bf1299e
Merge branch 'main' into 774-bug-randomstring-function-does-not-use-r…
hulto Jun 21, 2024
9444c02
cargo fmt
hulto Jun 21, 2024
e66cb16
Ope test
hulto Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions implants/lib/eldritch/src/random/string_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
use anyhow::Result;
use rand::distributions::{Alphanumeric, DistString, Distribution, Uniform};
use rand_chacha::rand_core::SeedableRng;

pub fn string(length: u64, charset_opt: Option<String>) -> Result<String> {
let mut rng = rand_chacha::ChaCha20Rng::from_entropy();
let res = match charset_opt {
Some(charset) => {
let strlen = charset.chars().count();
let rand_dist = Uniform::from(0..strlen);
let mut rng = rand::thread_rng();
let mut s = "".to_string();
for _ in 0..length {
let index = rand_dist.sample(&mut rng);
s.push(charset.chars().nth(index).unwrap());
}
s
}
None => Alphanumeric.sample_string(&mut rand::thread_rng(), length as usize),
None => Alphanumeric.sample_string(&mut rng, length as usize),
};

Ok(res)
Expand Down