diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-01-03 00:23:13 +0000 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-01-03 01:24:00 +0100 |
commit | 248f8b209b0150e70e82ab15b73bf32b0f47341d (patch) | |
tree | 2c18d6e200bd258883cb5bf08962db8690bac66c /src/util.rs | |
parent | 52afed9c6a17ec9c120a5a91b445afa74be87f0e (diff) | |
download | nitrokey-rs-248f8b209b0150e70e82ab15b73bf32b0f47341d.tar.gz nitrokey-rs-248f8b209b0150e70e82ab15b73bf32b0f47341d.tar.bz2 |
Remove CommandError::RngError
We switched to rand::thread_rng() which cannot fail. Therefore the
CommandError::RngError is no longer needed and removed in this patch.
Diffstat (limited to 'src/util.rs')
-rw-r--r-- | src/util.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/util.rs b/src/util.rs index a2e957e..ccec5e6 100644 --- a/src/util.rs +++ b/src/util.rs @@ -35,8 +35,6 @@ pub enum CommandError { InvalidString, /// You passed an invalid slot. InvalidSlot, - /// An error occured during random number generation. - RngError, } /// Log level for libnitrokey. @@ -99,10 +97,10 @@ pub fn get_last_error() -> CommandError { }; } -pub fn generate_password(length: usize) -> std::io::Result<Vec<u8>> { +pub fn generate_password(length: usize) -> Vec<u8> { let mut data = vec![0u8; length]; rand::thread_rng().fill(&mut data[..]); - return Ok(data); + return data; } pub fn get_cstring<T: Into<Vec<u8>>>(s: T) -> Result<CString, CommandError> { @@ -127,7 +125,6 @@ impl fmt::Display for CommandError { CommandError::Unknown => "An unknown error occured", CommandError::InvalidString => "You passed a string containing a null byte", CommandError::InvalidSlot => "The given slot is invalid", - CommandError::RngError => "An error occured during random number generation", }; write!(f, "{}", msg) } |