Merge pull request #465 from tox-rs/upgrade_sha2

Update sha2 dependency

Author: kpp

tox_core/Cargo.toml

@@ -32,7 +32,7 @@ lru = "0.7"
 bitflags = "1.3"
 itertools = "0.10"
 rand = "0.8"
-sha2 = "0.9"
+sha2 = "0.10"
 xsalsa20poly1305 = "0.9"
 crypto_box = "0.8"
 

tox_core/src/onion/onion_announce.rs

@@ -4,7 +4,8 @@
 use std::net::{IpAddr, SocketAddr};
 use std::time::{Duration, Instant, SystemTime};
 use sha2::{Digest, Sha256};
-use sha2::digest::generic_array::typenum::marker_traits::Unsigned;
+use sha2::digest::typenum::Unsigned;
+use sha2::digest::OutputSizeUser;
 use rand::{CryptoRng, Rng};
 use thiserror::Error;
 
@@ -31,7 +32,7 @@ pub const PING_ID_TIMEOUT: Duration = Duration::from_secs(300);
 pub const ONION_ANNOUNCE_TIMEOUT: Duration = Duration::from_secs(300);
 
 /// Create onion ping id filled with zeros.
-pub const INITIAL_PING_ID: PingId = [0; <Sha256 as Digest>::OutputSize::USIZE];
+pub const INITIAL_PING_ID: PingId = [0; <Sha256 as OutputSizeUser>::OutputSize::USIZE];
 
 /// Error that can happen when handling data request.
 #[derive(Clone, Debug, Eq, PartialEq, Error)]

tox_packet/src/dht/cookie.rs

@@ -6,8 +6,8 @@ use nom::number::complete::be_u64;
 use nom::combinator::eof;
 use nom::bytes::complete::take;
 use sha2::{Digest, Sha512};
-use sha2::digest::generic_array::typenum::marker_traits::Unsigned;
-use sha2::digest::crypto_common::OutputSizeUser;
+use sha2::digest::typenum::Unsigned;
+use sha2::digest::OutputSizeUser;
 use xsalsa20poly1305::{XSalsa20Poly1305, aead::{Aead, Error as AeadError}};
 use rand::{CryptoRng, Rng};
 

tox_packet/src/dht/crypto_handshake.rs

@@ -5,8 +5,8 @@ use super::*;
 
 use crypto_box::{SalsaBox, aead::{Aead, AeadCore, Error as AeadError}};
 use sha2::Sha512;
-use sha2::digest::generic_array::typenum::marker_traits::Unsigned;
-use sha2::digest::crypto_common::OutputSizeUser;
+use sha2::digest::typenum::Unsigned;
+use sha2::digest::OutputSizeUser;
 use tox_binary_io::*;
 use tox_crypto::*;
 use crate::dht::cookie::EncryptedCookie;

tox_packet/src/onion/onion_announce_request.rs

@@ -13,8 +13,8 @@ use nom::{
     bytes::complete::{take, tag}
 };
 use sha2::Sha256;
-use sha2::digest::generic_array::typenum::marker_traits::Unsigned;
-use sha2::digest::crypto_common::OutputSizeUser;
+use sha2::digest::typenum::Unsigned;
+use sha2::digest::OutputSizeUser;
 
 /// The type of onion ping ID which is SHA256 hash.
 pub type PingId = [u8; <Sha256 as OutputSizeUser>::OutputSize::USIZE];