pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-13 09:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump error-chain (#245)

Browse Source 
* Bump error-chain

* Fix compilation errors
This commit is contained in:
Tomasz Drwięga
2018-06-25 19:41:33 +02:00
committed by Gav Wood
parent b3e2a9e89c
commit e6995cc997
18 changed files with 108 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/substrate/keystore/Cargo.toml
+1 -1
View File
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ethcore-crypto = { git = "https://github.com/paritytech/parity.git", default_features = false }
ed25519 = { path = "../ed25519" }
error-chain = "0.11"
error-chain = "0.12"
hex = "0.3"
rand = "0.4"
serde_json = "1.0"
substrate/substrate/keystore/src/lib.rs
+2 -2
View File
@@ -84,7 +84,7 @@ impl EncryptedKey {
// two parts of derived key
// DK = [ DK[0..15] DK[16..31] ] = [derived_left_bits, derived_right_bits]
let (derived_left_bits, derived_right_bits) = crypto::derive_key_iterations(password, &salt, iterations);
let (derived_left_bits, derived_right_bits) = crypto::derive_key_iterations(password.as_bytes(), &salt, iterations);
// preallocated (on-stack in case of `Secret`) buffer to hold cipher
// length = length(plain) as we are using CTR-approach
@@ -108,7 +108,7 @@ impl EncryptedKey {
fn decrypt(&self, password: &str) -> Result<[u8; PKCS_LEN]> {
let (derived_left_bits, derived_right_bits) =
crypto::derive_key_iterations(password, &self.salt, self.iterations);
crypto::derive_key_iterations(password.as_bytes(), &self.salt, self.iterations);
let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();