vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated dependencies

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-22 18:33:38 +01:00
parent d23fe09f86
commit c35a5590b5
4 changed files with 83 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/system/bookmarks_client.rs
View File

@@ -33,7 +33,7 @@ use crate::filetransfer::FileTransferProtocol;
use crate::utils::crypto;
use crate::utils::fmt::fmt_time;
// Ext
use rand::{distributions::Alphanumeric, Rng};
use rand::{distributions::Alphanumeric, thread_rng, Rng};
use std::fs::{OpenOptions, Permissions};
use std::io::{Read, Write};
use std::path::{Path, PathBuf};
@@ -284,10 +284,12 @@ impl BookmarksClient {
/// Generate a new AES key and write it to key file
fn generate_key(key_file: &Path) -> Result<String, SerializerError> {
// Generate 256 bytes (2048 bits) key
let key: String = rand::thread_rng()
.sample_iter(Alphanumeric)
let mut rng = thread_rng();
let key: String = std::iter::repeat(())
.map(|()| rng.sample(Alphanumeric))
.map(char::from)
.take(256)
.collect::<String>();
.collect();
// Write file
match OpenOptions::new()
.create(true)
@@ -406,7 +408,7 @@ mod tests {
// Verify client
assert_eq!(client.hosts.bookmarks.len(), 0);
assert_eq!(client.hosts.recents.len(), 0);
assert!(client.key.len() > 0);
assert_eq!(client.key.len(), 256);
assert_eq!(client.bookmarks_file, cfg_path);
assert_eq!(client.recents_size, 16);
}