Merge pull request #199 from dalek-cryptography/update-deps

Update dependencies

Author: hdevalence

Cargo.toml

@@ -12,17 +12,17 @@ keywords = ["cryptography", "ristretto", "zero-knowledge", "bulletproofs"]
 description = "A pure-Rust implementation of Bulletproofs using Ristretto"
 
 [dependencies]
-curve25519-dalek = { version = "0.21", features = ["serde"] }
-subtle = "1"
-sha3 = "0.7"
-digest = "0.7"
+curve25519-dalek = { version = "1.0.0-pre.0", features = ["serde"] }
+subtle = "2.0.0-pre.0"
+sha3 = "0.8"
+digest = "0.8"
 rand = "0.5"
 byteorder = "1"
 serde = "1"
 serde_derive = "1"
 failure = "0.1"
-merlin = "0.4"
-clear_on_drop = "0.2.3"
+merlin = "1.0.0-pre.0"
+clear_on_drop = "0.2"
 
 [dev-dependencies]
 hex = "0.3"

src/generators.rs

@@ -51,8 +51,8 @@ impl GeneratorsChain {
     /// Creates a chain of generators, determined by the hash of `label`.
     fn new(label: &[u8]) -> Self {
         let mut shake = Shake256::default();
-        shake.process(b"GeneratorsChain");
-        shake.process(label);
+        shake.input(b"GeneratorsChain");
+        shake.input(label);
 
         GeneratorsChain {
             reader: shake.xof_result(),

src/lib.rs

@@ -14,7 +14,6 @@ extern crate clear_on_drop;
 extern crate curve25519_dalek;
 extern crate merlin;
 extern crate subtle;
-
 #[macro_use]
 extern crate serde_derive;
 extern crate serde;

src/range_proof/party.rs

@@ -85,7 +85,7 @@ impl<'a> PartyAwaitingPosition<'a> {
         // Compute A = <a_L, G> + <a_R, H> + a_blinding * B_blinding
         let mut A = self.pc_gens.B_blinding * a_blinding;
 
-        use subtle::{Choice, ConditionallyAssignable};
+        use subtle::{Choice, ConditionallySelectable};
         let mut i = 0;
         for (G_i, H_i) in bp_share.G(self.n).zip(bp_share.H(self.n)) {
             // If v_i = 0, we add a_L[i] * G[i] + a_R[i] * H[i] = - H[i]