gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade sha2 to 0.9.3 (#14746) (#14799)

Browse Source 
(cherry picked from commit 191193289f)

Co-authored-by: sakridge <sakridge@gmail.com>
This commit is contained in:
mergify[bot]
2021-01-23 23:08:33 +00:00
committed by GitHub
parent 40f32fd37d
commit b48dd58fda
10 changed files with 136 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/program/Cargo.toml
View File

@@ -22,7 +22,7 @@ rustversion = "1.0.3"
serde = "1.0.112"
serde_bytes = "0.11"
serde_derive = "1.0.103"
sha2 = "0.8.2"
sha2 = "0.9.2"
solana-frozen-abi = { path = "../../frozen-abi", version = "1.5.5" }
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "1.5.5" }
solana-sdk-macro = { path = "../macro", version = "1.5.5" }

4
sdk/program/src/hash.rs
View File

@@ -19,7 +19,7 @@ pub struct Hasher {
impl Hasher {
pub fn hash(&mut self, val: &[u8]) {
self.hasher.input(val);
self.hasher.update(val);
}
pub fn hashv(&mut self, vals: &[&[u8]]) {
for val in vals {
@@ -29,7 +29,7 @@ impl Hasher {
pub fn result(self) -> Hash {
// At the time of this writing, the sha2 library is stuck on an old version
// of generic_array (0.9.0). Decouple ourselves with a clone to our version.
Hash(<[u8; HASH_BYTES]>::try_from(self.hasher.result().as_slice()).unwrap())
Hash(<[u8; HASH_BYTES]>::try_from(self.hasher.finalize().as_slice()).unwrap())
}
}