Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Restrict Protected to some heap types. #6471

Merged
10 commits merged into from
Jul 1, 2020
Merged

Restrict Protected to some heap types. #6471

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
43f7295
Restrict `Protected` to some heap types.
cheme Jun 22, 2020
c7d7b07
Comment abut Protected usage.
cheme Jun 23, 2020
3f0b9b2
Remove Protected from crypto, use secrecy crate for existing uses.
cheme Jun 23, 2020
2438b4c
use a parse function
cheme Jun 24, 2020
91cb0f3
Merge branch 'master' into avoid_stack_protected
cheme Jun 25, 2020
56c965a
Merge branch 'master' into avoid_stack_protected
cheme Jun 30, 2020
cf77ff3
fix error convert
cheme Jun 30, 2020
005dfc4
Rename and move secretY string function.
cheme Jul 1, 2020
27cbd6a
std result
cheme Jul 1, 2020
0eeebc9
Merge branch 'master' into avoid_stack_protected
cheme Jul 1, 2020
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
Prev Previous commit
Next Next commit
fix error convert
  • Loading branch information
@cheme
cheme committed Jun 30, 2020
commit cf77ff392f76d79e420d0bd1c5b811948180a254
6 changes: 4 additions & 2 deletions client/cli/src/params/keystore_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ impl KeystoreParams {
#[cfg(not(target_os = "unknown"))]
{
let mut password = input_keystore_password()?;
let secret = std::str::FromStr::from_str(password.as_str())?;
let secret = std::str::FromStr::from_str(password.as_str())
.map_err(|()| "Error reading password")?;
use sp_core::crypto::Zeroize;
password.zeroize();
Some(secret)
Expand All @@ -75,7 +76,8 @@ impl KeystoreParams {
} else if let Some(ref file) = self.password_filename {
let mut password = fs::read_to_string(file)
.map_err(|e| format!("{}", e))?;
let secret = std::str::FromStr::from_str(password.as_str())?;
let secret = std::str::FromStr::from_str(password.as_str())
.map_err(|()| "Error reading password")?;
use sp_core::crypto::Zeroize;
password.zeroize();
Some(secret)
Expand Down