rust: Update ed25519-dalek and associated dependencies

oasisprotocol · Feb 17, 2020 · 0b62984 · 0b62984
1 parent afc5248
commit 0b62984
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 60 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/keymanager-api-common/Cargo.toml b/keymanager-api-common/Cargo.toml
@@ -12,5 +12,5 @@ serde_bytes = "~0.10"
 rustc-hex = "2.0.1"
 failure = "0.1.5"
 lazy_static = "1.3.0"
-x25519-dalek = "0.5.1"
-rand = "0.6.5"
+x25519-dalek = "0.6.0"
+rand = "0.7.3"
diff --git a/keymanager-api-common/src/api.rs b/keymanager-api-common/src/api.rs
@@ -113,7 +113,7 @@ pub struct ContractKey {
 impl ContractKey {
     /// Generate a new random key (for testing).
     pub fn generate_mock() -> Self {
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = OsRng {};
         let sk = x25519_dalek::StaticSecret::new(&mut rng);
         let pk = x25519_dalek::PublicKey::from(&sk);
 

diff --git a/keymanager-lib/Cargo.toml b/keymanager-lib/Cargo.toml
@@ -12,9 +12,9 @@ failure = "0.1.5"
 lazy_static = "1.3.0"
 lru = "0.1.17"
 io-context = "0.2.0"
-rand = "0.6.5"
+rand = "0.7.3"
 sgx-isa = { version = "0.3.0", features = ["sgxstd"] }
 sp800-185 = "0.2.0"
 tiny-keccak = "1.4.2"
-x25519-dalek = "0.5.1"
+x25519-dalek = "0.6.0"
 zeroize = "0.6"
diff --git a/keymanager-lib/src/kdf.rs b/keymanager-lib/src/kdf.rs
@@ -408,7 +408,7 @@ impl Kdf {
     }
 
     fn save_master_secret(master_secret: &MasterSecret) {
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = OsRng {};
 
         // Encrypt the master secret.
         let mut nonce = [0u8; NONCE_SIZE];
@@ -425,7 +425,7 @@ impl Kdf {
     }
 
     fn generate_master_secret() -> MasterSecret {
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = OsRng {};
 
         // TODO: Support static keying for debugging.
         let mut master_secret = [0u8; 32];

diff --git a/keymanager-runtime/api/Cargo.toml b/keymanager-runtime/api/Cargo.toml
@@ -13,5 +13,5 @@ serde_bytes = "~0.10"
 rustc-hex = "2.0.1"
 failure = "0.1.5"
 lazy_static = "1.3.0"
-x25519-dalek = "0.5.1"
-rand = "0.6.5"
+x25519-dalek = "0.6.0"
+rand = "0.7.3"
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -32,13 +32,13 @@ pem-iterator = "0.2.0"
 chrono = "0.4.6"
 base64 = "0.10.1"
 rustc-hex = "2.0.1"
-rand = "0.6.5"
+rand = "0.7.3"
 futures = "0.1.25"
 tokio-current-thread = "0.1.5"
 tokio-executor = "0.1.6"
 io-context = "0.2.0"
-x25519-dalek = "0.5.1"
-ed25519-dalek = "1.0.0-pre.1"
+x25519-dalek = "0.6.0"
+ed25519-dalek = "1.0.0-pre.3"
 deoxysii = { git = "https://github.com/oasislabs/deoxysii-rust" }
 tiny-keccak = "1.4.2"
 sp800-185 = "0.2.0"

diff --git a/runtime/src/common/crypto/mrae/deoxysii.rs b/runtime/src/common/crypto/mrae/deoxysii.rs
@@ -30,7 +30,7 @@ fn derive_symmetric_key(public: &[u8; 32], private: &[u8; 32]) -> [u8; KEY_SIZE]
 /// Generates a public/private key pair suitable for use with
 /// `derive_symmetric_key`, `box_seal`, and `box_open`.
 pub fn generate_key_pair() -> ([u8; 32], [u8; 32]) {
-    let mut rng = OsRng::new().unwrap();
+    let mut rng = OsRng {};
 
     let sk = x25519_dalek::StaticSecret::new(&mut rng);
     let pk = x25519_dalek::PublicKey::from(&sk);
@@ -115,7 +115,7 @@ mod tests {
 
     #[bench]
     fn bench_mrae_box_seal_4096(b: &mut Bencher) {
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = OsRng {};
 
         // Set up the keys.
         let (_a_pub, a_priv) = generate_key_pair(); // Alice
@@ -143,7 +143,7 @@ mod tests {
 
     #[bench]
     fn bench_mrae_box_open_4096(b: &mut Bencher) {
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = OsRng {};
 
         // Set up the keys.
         let (a_pub, a_priv) = generate_key_pair(); // Alice

diff --git a/runtime/src/common/crypto/signature.rs b/runtime/src/common/crypto/signature.rs
@@ -36,7 +36,7 @@ pub struct PrivateKey(pub ed25519_dalek::Keypair);
 impl PrivateKey {
     /// Generates a new private key pair.
     pub fn generate() -> Self {
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = OsRng {};
 
         PrivateKey(ed25519_dalek::Keypair::generate(&mut rng))
     }

diff --git a/runtime/src/common/sgx/seal.rs b/runtime/src/common/sgx/seal.rs
@@ -12,7 +12,7 @@ use crate::common::{
 ///
 /// The `context` field is a domain separation tag.
 pub fn seal(key_policy: Keypolicy, context: &[u8], data: &[u8]) -> Vec<u8> {
-    let mut rng = OsRng::new().unwrap();
+    let mut rng = OsRng {};
 
     // Encrypt the raw policy.
     let mut nonce = [0u8; NONCE_SIZE];