From dbbc38b9b83378061971f990039255b598837d94 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Mon, 7 Mar 2022 10:00:34 -0500 Subject: [PATCH] update to latest blake2-rfc --- group/Cargo.toml | 1 + librustzcash/Cargo.toml | 2 +- pairing/Cargo.toml | 1 + sapling-crypto/Cargo.toml | 2 +- sapling-crypto/src/group_hash.rs | 3 +++ zcash_primitives/Cargo.toml | 2 +- zcash_proofs/Cargo.toml | 2 +- zcash_wallet/Cargo.toml | 1 + zcash_wallet/README.md | 15 +-------------- zip32/Cargo.toml | 2 +- 10 files changed, 12 insertions(+), 19 deletions(-) diff --git a/group/Cargo.toml b/group/Cargo.toml index ad3f84d..0af8dd1 100644 --- a/group/Cargo.toml +++ b/group/Cargo.toml @@ -2,6 +2,7 @@ name = "group" version = "0.1.0" authors = [ + "The Hush Developers", "Sean Bowe ", "Jack Grigg ", ] diff --git a/librustzcash/Cargo.toml b/librustzcash/Cargo.toml index 19a9b4e..9b4c020 100644 --- a/librustzcash/Cargo.toml +++ b/librustzcash/Cargo.toml @@ -29,4 +29,4 @@ zip32 = { path = "../zip32" } [dependencies.blake2-rfc] git = "https://git.hush.is/hush/blake2-rfc" -rev = "04e586d640f87f35e7c07100508216ca7797195c" +rev = "a3adc1d6859b887457c6ae4821ddad1802dad784" diff --git a/pairing/Cargo.toml b/pairing/Cargo.toml index 3446f46..e8a353a 100644 --- a/pairing/Cargo.toml +++ b/pairing/Cargo.toml @@ -4,6 +4,7 @@ name = "pairing" # Remember to change version string in README.md. version = "0.14.2" authors = [ + "The Hush Developers", "Sean Bowe ", "Jack Grigg ", ] diff --git a/sapling-crypto/Cargo.toml b/sapling-crypto/Cargo.toml index fd1bff6..dd4d89d 100644 --- a/sapling-crypto/Cargo.toml +++ b/sapling-crypto/Cargo.toml @@ -21,7 +21,7 @@ byteorder = "1" [dependencies.blake2-rfc] git = "https://git.hush.is/hush/blake2-rfc" -rev = "04e586d640f87f35e7c07100508216ca7797195c" +rev = "a3adc1d6859b887457c6ae4821ddad1802dad784" [dev-dependencies] hex-literal = "0.1" diff --git a/sapling-crypto/src/group_hash.rs b/sapling-crypto/src/group_hash.rs index 43e87e8..f33277e 100644 --- a/sapling-crypto/src/group_hash.rs +++ b/sapling-crypto/src/group_hash.rs @@ -1,3 +1,6 @@ +// Copyright The Hush Developers +// Released under the GPLv3 + use jubjub::{ JubjubEngine, PrimeOrder, diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index fd20dc6..056a90b 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -19,4 +19,4 @@ sha2 = "0.8" [dependencies.blake2-rfc] git = "https://git.hush.is/hush/blake2-rfc" -rev = "ba06a506baa297d37959d5e13e90008bba12ec60" +rev = "a3adc1d6859b887457c6ae4821ddad1802dad784" diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml index ac27d65..dba7151 100644 --- a/zcash_proofs/Cargo.toml +++ b/zcash_proofs/Cargo.toml @@ -16,4 +16,4 @@ sapling-crypto = { path = "../sapling-crypto" } [dependencies.blake2-rfc] git = "https://git.hush.is/hush/blake2-rfc" -rev = "04e586d640f87f35e7c07100508216ca7797195c" +rev = "a3adc1d6859b887457c6ae4821ddad1802dad784" diff --git a/zcash_wallet/Cargo.toml b/zcash_wallet/Cargo.toml index a7b6c91..e86cec5 100644 --- a/zcash_wallet/Cargo.toml +++ b/zcash_wallet/Cargo.toml @@ -2,6 +2,7 @@ name = "zcash_wallet" version = "0.0.0" authors = [ + "The Hush Developers", "Jack Grigg ", ] diff --git a/zcash_wallet/README.md b/zcash_wallet/README.md index 14c1a38..051a042 100644 --- a/zcash_wallet/README.md +++ b/zcash_wallet/README.md @@ -4,17 +4,4 @@ This library contains Rust structs and traits for creating shielded Zcash wallet ## License -Licensed under either of - - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) - -at your option. - -### Contribution - -Unless you explicitly state otherwise, any contribution intentionally -submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or -conditions. - +GPLv3 diff --git a/zip32/Cargo.toml b/zip32/Cargo.toml index 9a63b86..53980a9 100644 --- a/zip32/Cargo.toml +++ b/zip32/Cargo.toml @@ -23,4 +23,4 @@ zcash_primitives = { path = "../zcash_primitives" } [dependencies.blake2-rfc] git = "https://git.hush.is/hush/blake2-rfc" -rev = "04e586d640f87f35e7c07100508216ca7797195c" +rev = "a3adc1d6859b887457c6ae4821ddad1802dad784"