grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sweep some more panics (#2848)

Browse Source 
* purge unwraps from ethcrypto, ethstore

* sweep panics from util
This commit is contained in:
Robert Habermeier
2016-10-25 22:34:52 +02:00
committed by Gav Wood
parent d1d82e787b
commit 33748c2046
13 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ethcrypto/src/lib.rs
View File

@@ -166,7 +166,9 @@ pub mod ecies {
/// Encrypt a message with a public key
pub fn encrypt(public: &Public, shared_mac: &[u8], plain: &[u8]) -> Result<Vec<u8>, Error> {
let r = Random.generate().unwrap();
let r = Random.generate()
.expect("context known to have key-generation capabilities; qed");
let z = try!(ecdh::agree(r.secret(), public));
let mut key = [0u8; 32];
let mut mkey = [0u8; 32];
@@ -201,7 +203,9 @@ pub mod ecies {
/// Encrypt a message with a public key
pub fn encrypt_single_message(public: &Public, plain: &[u8]) -> Result<Vec<u8>, Error> {
let r = Random.generate().unwrap();
let r = Random.generate()
.expect("context known to have key-generation capabilities");
let z = try!(ecdh::agree(r.secret(), public));
let mut key = [0u8; 32];
let mut mkey = [0u8; 32];