Skip to content

Commit

Permalink
Use sha2 to calculate SHA256
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Hollmann committed Mar 2, 2023
1 parent 2dcdf1e commit 18c0c3f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion crates/cargo-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = "Miscellaneous support code used by Cargo."

[dependencies]
anyhow = "1.0.34"
crypto-hash = "0.3.1"
sha2 = "0.10.6"
filetime = "0.2.9"
hex = "0.4.2"
jobserver = "0.1.26"
Expand Down
12 changes: 6 additions & 6 deletions crates/cargo-util/src/sha256.rs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
use super::paths;
use anyhow::{Context, Result};
use crypto_hash::{Algorithm, Hasher};
use sha2::{Digest, Sha256 as Sha2_sha256};
use std::fs::File;
use std::io::{self, Read, Write};
use std::io::{self, Read};
use std::path::Path;

pub struct Sha256(Hasher);
pub struct Sha256(Sha2_sha256);

impl Sha256 {
pub fn new() -> Sha256 {
let hasher = Hasher::new(Algorithm::SHA256);
let hasher = Sha2_sha256::new();
Sha256(hasher)
}

pub fn update(&mut self, bytes: &[u8]) -> &mut Sha256 {
let _ = self.0.write_all(bytes);
let _ = self.0.update(bytes);
self
}

Expand All @@ -39,7 +39,7 @@ impl Sha256 {

pub fn finish(&mut self) -> [u8; 32] {
let mut ret = [0u8; 32];
let data = self.0.finish();
let data = self.0.finalize_reset();
ret.copy_from_slice(&data[..]);
ret
}
Expand Down

0 comments on commit 18c0c3f

Please sign in to comment.