RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-02 14:07:46 +00:00
Code Issues Activity

upgrade to RustCrypto Hashes MD5 "MD-5" 0.10.1

Browse source
This commit is contained in:
Alex Tibbles 2022-02-21 16:51:00 -05:00
parent 38bcafb7c2
commit 41e9719d6b
No known key found for this signature in database
GPG key ID: B270E503D3300F73
4 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Cargo.lock generated
View file

@ -652,11 +652,12 @@ dependencies = [
[[package]] [[package]]
name = "crypto-common" name = "crypto-common"
version = "0.1.1" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
dependencies = [ dependencies = [
"generic-array", "generic-array",
"typenum",
] ]
[[package]] [[package]]
@ -719,13 +720,12 @@ checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
[[package]] [[package]]
name = "digest" name = "digest"
version = "0.10.1" version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
dependencies = [ dependencies = [
"block-buffer", "block-buffer",
"crypto-common", "crypto-common",
"generic-array",
"subtle", "subtle",
] ]
@ -1128,10 +1128,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
[[package]] [[package]]
name = "md5" name = "md-5"
version = "0.3.8" version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79c56d6a0b07f9e19282511c83fc5b086364cbae4ba8c7d5f190c3d9b0425a48" checksum = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582"
dependencies = [
"digest",
]
[[package]] [[package]]
name = "memchr" name = "memchr"
@ -2624,7 +2627,7 @@ dependencies = [
"digest", "digest",
"hex", "hex",
"libc", "libc",
"md5", "md-5",
"memchr 2.4.1", "memchr 2.4.1",
"regex", "regex",
"regex-syntax", "regex-syntax",

2
src/uu/hashsum/Cargo.toml
View file

@ -20,7 +20,7 @@ clap = { version = "3.0", features = ["wrap_help", "cargo"] }
hex = "0.4.3" hex = "0.4.3"
libc = "0.2.42" libc = "0.2.42"
memchr = "2" memchr = "2"
md5 = "0.3.5" md-5 = "0.10.1"
regex = "1.0.1" regex = "1.0.1"
regex-syntax = "0.6.7" regex-syntax = "0.6.7"
sha1 = "0.10.0" sha1 = "0.10.0"

8
src/uu/hashsum/src/digest.rs
View file

@ -36,17 +36,17 @@ pub trait Digest {
} }
} }
impl Digest for md5::Context { impl Digest for md5::Md5 {
fn new() -> Self { fn new() -> Self {
Self::new() Self::default()
} }
fn input(&mut self, input: &[u8]) { fn input(&mut self, input: &[u8]) {
self.consume(input); digest::Digest::update(self, input);
} }
fn result(&mut self, out: &mut [u8]) { fn result(&mut self, out: &mut [u8]) {
out.copy_from_slice(&*self.compute()); digest::Digest::finalize_into_reset(self, out.into());
} }
fn reset(&mut self) { fn reset(&mut self) {

2
src/uu/hashsum/src/hashsum.rs
View file

@ -22,7 +22,7 @@ use self::digest::DigestWriter;
use clap::{App, AppSettings, Arg, ArgMatches}; use clap::{App, AppSettings, Arg, ArgMatches};
use hex::encode; use hex::encode;
use md5::Context as Md5; use md5::Md5;
use regex::Regex; use regex::Regex;
use sha1::Sha1; use sha1::Sha1;
use sha2::{Sha224, Sha256, Sha384, Sha512}; use sha2::{Sha224, Sha256, Sha384, Sha512};