Merge pull request #1075 from Zokrates/rc/0.7.10

Release 0.7.10
Zokrates · Dec 16, 2021 · 5a22eb6 · 5a22eb6
2 parents 048221b + f15a5f2
commit 5a22eb6
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 68 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -169,7 +169,7 @@ jobs:
            - run: rustup target add << parameters.target >>
       - run:
           name: Build
-          no_output_timeout: "30m"
+          no_output_timeout: "1h"
           command: RUSTFLAGS="--remap-path-prefix=$PWD=" << parameters.build-with >> build --target << parameters.target >> --release
       - tar_artifacts:
           target: << parameters.target >>
@@ -274,25 +274,25 @@ workflows:
                 - macos
               target:
                 - x86_64-apple-darwin
-      # - cross_build:
-      #     <<: *tag-only
-      #     pre-steps:
-      #       - install_rust
-      #     build-with: SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo
-      #     add-target: true
-      #     matrix:
-      #       alias: cross-build-apple-silicon
-      #       parameters:
-      #         os:
-      #           - macos
-      #         target:
-      #           - aarch64-apple-darwin
+      - cross_build:
+         <<: *tag-only
+         pre-steps:
+           - install_rust
+         build-with: SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo
+         add-target: true
+         matrix:
+           alias: cross-build-apple-silicon
+           parameters:
+             os:
+               - macos
+             target:
+               - aarch64-apple-darwin
       - publish_artifacts:
           <<: *tag-only
           requires:
             - cross-build-linux
             - cross-build-macos
-            # - cross-build-apple-silicon
+            - cross-build-apple-silicon
       - deploy:
           filters:
             branches:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 https://github.com/Zokrates/ZoKrates/compare/latest...develop
 
+## [0.7.10] - 2021-12-16
+
+### Release
+- https://github.com/Zokrates/ZoKrates/releases/tag/0.7.10 <!-- markdown-link-check-disable-line -->
+
+### Changes
+- Fix building issue with `aarch64-apple-darwin` target (M1) (#1074, @dark64)
+
 ## [0.7.9] - 2021-12-14
 
 ### Release

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zokrates_cli/Cargo.toml b/zokrates_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zokrates_cli"
-version = "0.7.9"
+version = "0.7.10"
 authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>", "Thibaut Schaeffer <thibaut@schaeff.fr>"]
 repository = "https://github.com/Zokrates/ZoKrates.git"
 edition = "2018"
@@ -28,10 +28,10 @@ serde = { version = "1.0", features = ["derive"] }
 dirs = "3.0.1"
 lazy_static = "1.4.0"
 byteorder = "1"
-rust-crypto = "0.2.36"
 rand = "0.4"
 hex = "0.3.1"
 blake2 = "0.8.1"
+sha2 = "0.10.0"
 
 [dev-dependencies]
 glob = "0.2.11"

diff --git a/zokrates_cli/src/ops/mpc/beacon.rs b/zokrates_cli/src/ops/mpc/beacon.rs
@@ -87,10 +87,9 @@ fn cli_mpc_beacon<T: Field + BellmanFieldExtensions, S: MpcScheme<T>, B: MpcBack
     // Create an RNG based on the outcome of the random beacon
     let mut rng = {
         use byteorder::{BigEndian, ReadBytesExt};
-        use crypto::digest::Digest;
-        use crypto::sha2::Sha256;
         use rand::chacha::ChaChaRng;
         use rand::SeedableRng;
+        use sha2::{Digest, Sha256};
 
         // The hash used for the beacon
         let mut cur_hash = hex::decode(beacon_hash)
@@ -115,9 +114,7 @@ fn cli_mpc_beacon<T: Field + BellmanFieldExtensions, S: MpcScheme<T>, B: MpcBack
                 println!();
             }
 
-            let mut h = Sha256::new();
-            h.input(&cur_hash);
-            h.result(&mut cur_hash);
+            cur_hash = Sha256::digest(&cur_hash).to_vec();
         }
 
         print!("Final result of beacon: ");