From 0b6e3eaf3cc52afae7b5e280a8819b6f9e2ef73b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Mar 2022 12:20:29 +0000
Subject: [PATCH] cargo: upgrade digest sha2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Cargo.lock     | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 Cargo.toml     |  4 ++--
 src/bundles.rs |  2 +-
 src/prelude.rs |  2 +-
 src/utils.rs   |  6 +++---
 5 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e19f0ce0..952bc733 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -211,6 +211,15 @@ dependencies = [
  "generic-array 0.14.5",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+dependencies = [
+ "generic-array 0.14.5",
+]
+
 [[package]]
 name = "block-padding"
 version = "0.1.5"
@@ -493,7 +502,7 @@ dependencies = [
  "hmac",
  "percent-encoding 2.1.0",
  "rand 0.8.5",
- "sha2",
+ "sha2 0.9.9",
  "time 0.1.43",
 ]
 
@@ -581,6 +590,16 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+dependencies = [
+ "generic-array 0.14.5",
+ "typenum",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.10.1"
@@ -810,6 +829,16 @@ dependencies = [
  "generic-array 0.14.5",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+dependencies = [
+ "block-buffer 0.10.2",
+ "crypto-common",
+]
+
 [[package]]
 name = "directories"
 version = "3.0.2"
@@ -2382,7 +2411,7 @@ dependencies = [
  "base64 0.13.0",
  "byteorder",
  "md-5",
- "sha2",
+ "sha2 0.9.9",
  "thiserror",
 ]
 
@@ -2445,7 +2474,7 @@ dependencies = [
  "crossbeam-utils",
  "delegate",
  "derive-into-owned",
- "digest 0.9.0",
+ "digest 0.10.3",
  "downcast-rs",
  "either",
  "enum-map",
@@ -2481,7 +2510,7 @@ dependencies = [
  "rmp-serde",
  "serde",
  "serde_with",
- "sha2",
+ "sha2 0.10.2",
  "slotmap-fork-otter",
  "structopt",
  "strum",
@@ -3601,6 +3630,17 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "simplecss"
 version = "0.2.1"
diff --git a/Cargo.toml b/Cargo.toml
index 4e580683..a7729138 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ console="0.15"
 crossbeam-utils="0.8"
 delegate="0.6"
 derive-into-owned="0.1"
-digest="0.9"
+digest="0.10"
 downcast-rs="1"
 either="1"
 enum_dispatch="0.3.5"
@@ -70,7 +70,7 @@ rmp="0.8"
 rmp-serde="0.15"
 serde_with="1"
 structopt="0.3"
-sha2="0.9"
+sha2="0.10"
 subtle="2.4"
 tempfile="3"
 toml="0.5"
diff --git a/src/bundles.rs b/src/bundles.rs
index 62c434e1..6c2c5ea5 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -6,7 +6,7 @@ use crate::prelude::*;
 
 //---------- public types ----------
 
-pub use crate::prelude::Sha512Trunc256 as Digester;
+pub use crate::prelude::Sha512_256 as Digester;
 pub type DigestWrite<W> = crate::utils::DigestWrite<Digester, W>;
 
 #[derive(Copy,Clone,Hash,Eq,PartialEq,Serialize,Deserialize)]
diff --git a/src/prelude.rs b/src/prelude.rs
index b73c0b4d..1db1ef26 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -93,7 +93,7 @@ pub use serde::{de::DeserializeOwned, Deserialize, Serialize};
 pub use serde::{Deserializer, Serializer};
 pub use serde_with::DeserializeFromStr;
 pub use serde_with::SerializeDisplay;
-pub use sha2::{Sha512, Sha512Trunc256};
+pub use sha2::{Sha512, Sha512_256};
 pub use slotmap::{dense::DenseSlotMap, SparseSecondaryMap, Key as _};
 pub use strum::{EnumCount, EnumDiscriminants};
 pub use strum::{EnumString, EnumIter, EnumMessage, EnumProperty};
diff --git a/src/utils.rs b/src/utils.rs
index 040e5891..182d52e2 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -517,9 +517,9 @@ impl<D: Digest, R: Read> Read for DigestRead<D, R> {
 #[test]
 fn test_digest_read() {
   let ibuffer = b"abc";
-  let exp = Sha512Trunc256::digest(&ibuffer[..]);
+  let exp = Sha512_256::digest(&ibuffer[..]);
   let inner = &ibuffer[..];
-  let mut dr = DigestRead::<Sha512Trunc256,_>::new(inner);
+  let mut dr = DigestRead::<Sha512_256,_>::new(inner);
   let mut obuffer = [0;4];
   assert_eq!( dr.read(&mut obuffer).unwrap(), 3 );
   assert_eq!( &obuffer, b"abc\0" );
@@ -565,7 +565,7 @@ impl<D: Digest, W: Write> Write for DigestWrite<D, W> {
 #[test]
 fn test_digest_write() {
   let ibuffer = b"xyz";
-  let exp = Sha512Trunc256::digest(&ibuffer[..]);
+  let exp = Sha512_256::digest(&ibuffer[..]);
   let mut obuffer = [0;4];
   let inner = &mut obuffer[..];
   let mut dw = bundles::DigestWrite::new(inner);
-- 
2.30.2