diff --git a/Cargo.lock b/Cargo.lock index 920a28e..f80ca3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -222,6 +222,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array", +] + [[package]] name = "block-modes" version = "0.8.1" @@ -342,7 +351,7 @@ dependencies = [ "base64 0.13.0", "chrono", "clap", - "digest", + "digest 0.10.3", "hex", "openpgp-card", "openpgp-card-pcsc", @@ -356,7 +365,7 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2", + "sha2 0.10.2", "simpledateformat", "u2f", "x509", @@ -506,6 +515,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.11.1" @@ -628,6 +647,16 @@ dependencies = [ "generic-array", ] +[[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 = "dirs" version = "2.0.2" @@ -988,7 +1017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ "crypto-mac", - "digest", + "digest 0.9.0", ] [[package]] @@ -1563,7 +1592,7 @@ checksum = "d053368e1bae4c8a672953397bd1bd7183dde1c72b0b7612a15719173148d186" dependencies = [ "ecdsa", "elliptic-curve", - "sha2", + "sha2 0.9.9", ] [[package]] @@ -1921,7 +1950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e05c2603e2823634ab331437001b411b9ed11660fbc4066f3908c84a9439260d" dependencies = [ "byteorder", - "digest", + "digest 0.9.0", "lazy_static", "num-bigint-dig", "num-integer", @@ -2115,10 +2144,10 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] @@ -2143,7 +2172,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f31bf4e9fe5cd8cea8e0887e2e4eb1b4d736ff11b776c8537bf0912a4b381285" dependencies = [ - "digest", + "digest 0.9.0", "generic-array", ] @@ -2153,13 +2182,24 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[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 = "shlex" version = "0.1.1" @@ -2181,7 +2221,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4" dependencies = [ - "digest", + "digest 0.9.0", "rand_core 0.6.3", ] @@ -2836,7 +2876,7 @@ dependencies = [ "rsa", "secrecy", "sha-1", - "sha2", + "sha2 0.9.9", "subtle", "subtle-encoding", "uuid", diff --git a/Cargo.toml b/Cargo.toml index 00b1dff..2a9b214 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,8 +8,9 @@ edition = "2018" authenticator = "0.3" clap = "2.33" rust_util = { version = "0.6", features = ["use_clap"] } -sha1 = "0.6.0" -sha2 = "0.9" +digest = "0.10" +sha1 = "0.6" +sha2 = "0.10" rand = "0.8" base64 = "0.13" serde = { version = "1.0", features = ["derive"] } @@ -25,7 +26,6 @@ simpledateformat = "0.1.2" ring = "0.16.20" openssl = "0.10.35" pem = "0.8.3" -digest = "0.9.0" yubikey = "0.5" yubico_manager = "0.9" x509 = "0.2" diff --git a/src/cmd_piv.rs b/src/cmd_piv.rs index e1e0507..2b9be36 100644 --- a/src/cmd_piv.rs +++ b/src/cmd_piv.rs @@ -77,7 +77,7 @@ fn print_cert_info(yubikey: &mut YubiKey, slot: SlotId, detail_output: bool) -> if !buf.is_empty() { information!("{}", "-".repeat(88)); - let fingerprint_sha256 = Sha256::digest(&buf); + let fingerprint_sha256 = Sha256::digest(&*buf); let slot_id: u8 = slot.into(); success!("Slot: {:?}, id: {:x}", slot, slot_id);