Merge branch 'tim/update_deps' into 'master'

chore: Update deps, switch to using new blake2 API

See merge request TankerHQ/sdk-rust!94

Author: tux3

.gitlab-ci.yml

@@ -71,6 +71,8 @@ stages:
 
 .profiles/windows:
   before_script:
+    - poetry run python -m pip install --upgrade pip
+    - poetry install
     # Powershell doesn't split env variable when expanding it.
     # So, we are using the native syntax to create an array, which will be correctly expanded.
     - $TANKER_PROFILES = "--profile", "vs2019-release-shared"

Cargo.toml

@@ -22,7 +22,7 @@ double-checked-cell-async = "2.0.2"
 rand = "0.7.3"
 base64 = "0.13"
 variant_count = "1.0"
-blake2 = "0.9"
+blake2 = "0.10.2"
 ed25519-dalek = "1.0"
 x25519-dalek = "1.1"
 

tests/identity/admin/block.rs

@@ -1,5 +1,5 @@
 use blake2::digest::{Update, VariableOutput};
-use blake2::VarBlake2b;
+use blake2::Blake2bVar;
 use ed25519_dalek::Keypair;
 
 pub fn serialized_root_block(sign_keypair: &Keypair) -> Vec<u8> {
@@ -51,8 +51,8 @@ fn serialized_block(
 }
 
 fn block_hash(nature: u64, author: &[u8; 32], payload: &[u8]) -> Vec<u8> {
-    let mut hasher = VarBlake2b::new(crate::identity::BLOCK_HASH_SIZE).unwrap();
-    hasher.update(serialized_varint(nature).into_iter().collect::<Vec<_>>());
+    let mut hasher = Blake2bVar::new(crate::identity::BLOCK_HASH_SIZE).unwrap();
+    hasher.update(&serialized_varint(nature).into_iter().collect::<Vec<_>>());
     hasher.update(author);
     hasher.update(payload);
     hasher.finalize_boxed().to_vec()

tests/identity/mod.rs

@@ -8,8 +8,8 @@ pub use admin::Admin;
 mod test_app;
 pub use test_app::TestApp;
 
-use blake2::digest::{Update, VariableOutput};
-use blake2::VarBlake2b;
+use blake2::digest::{consts, VariableOutput};
+use blake2::{Blake2b, Blake2bVar};
 use ed25519_dalek::{Keypair, Signer};
 use rand::{rngs::OsRng, Rng};
 use serde_json::{json, Value};
@@ -24,25 +24,32 @@ const USER_SECRET_SIZE: usize = 32;
 const SIGNATURE_SIZE: usize = 64;
 
 pub fn hash_user_id(app_id: &[u8], user_id: &str) -> Vec<u8> {
-    let mut hasher = VarBlake2b::new(BLOCK_HASH_SIZE).unwrap();
+    use blake2::digest::Update;
+
+    let mut hasher = Blake2bVar::new(BLOCK_HASH_SIZE).unwrap();
     hasher.update(user_id.as_bytes());
     hasher.update(app_id);
     hasher.finalize_boxed().to_vec()
 }
 
 pub fn generate_user_secret(hashed_user_id: &[u8]) -> Vec<u8> {
+    use blake2::Digest;
+
     let random_bytes: [u8; USER_SECRET_SIZE - 1] = rand::thread_rng().gen();
-    let mut hasher = VarBlake2b::new(1).unwrap();
+    let mut hasher = Blake2b::<consts::U1>::new();
     hasher.update(&random_bytes);
     hasher.update(hashed_user_id);
 
     let mut user_secret = random_bytes.to_vec();
-    hasher.finalize_variable(|h| user_secret.push(h[0]));
+    let res = hasher.finalize();
+    user_secret.push(res[0]);
     user_secret
 }
 
 pub fn generate_app_id(app_secret: &[u8]) -> Vec<u8> {
-    let mut hasher = VarBlake2b::new(BLOCK_HASH_SIZE).unwrap();
+    use blake2::digest::Update;
+
+    let mut hasher = Blake2bVar::new(BLOCK_HASH_SIZE).unwrap();
     hasher.update(&[APP_CREATION_NATURE]);
     hasher.update(&[0u8; AUTHOR_SIZE]);
     hasher.update(&app_secret[app_secret.len() - APP_PUBLIC_KEY_SIZE..]);