diff --git a/Cargo.lock b/Cargo.lock index d76975951f9f7..a3313b93f779c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -295,9 +295,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "const-oid" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "crc32fast" @@ -372,12 +372,12 @@ dependencies = [ [[package]] name = "der" -version = "0.6.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "05e58dffcdcc8ee7b22f0c1f71a69243d7c2d9ad87b5a14361f2424a1565c219" dependencies = [ - "const-oid 0.9.1", - "pem-rfc7468 0.6.0", + "const-oid 0.9.2", + "pem-rfc7468 0.7.0", "zeroize", ] @@ -421,7 +421,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "const-oid 0.9.1", + "const-oid 0.9.2", "crypto-common", ] @@ -1030,9 +1030,9 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ "base64ct", ] @@ -1050,14 +1050,13 @@ dependencies = [ [[package]] name = "pkcs1" -version = "0.4.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.6.1", - "pkcs8 0.9.0", - "spki 0.6.0", - "zeroize", + "der 0.7.5", + "pkcs8 0.10.2", + "spki 0.7.1", ] [[package]] @@ -1073,12 +1072,12 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.6.1", - "spki 0.6.0", + "der 0.7.5", + "spki 0.7.1", ] [[package]] @@ -1225,7 +1224,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rdp-rs", - "rsa 0.8.2", + "rsa 0.9.0", "tempfile", "utf16string", "uuid", @@ -1319,18 +1318,19 @@ dependencies = [ [[package]] name = "rsa" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a77d189da1fee555ad95b7e50e7457d91c0e089ec68ca69ad2989413bbdab4" +checksum = "3dd2017d3e6d67384f301f8b06fbf4567afc576430a61624d845eb04d2b30a72" dependencies = [ "byteorder", + "const-oid 0.9.2", "digest 0.10.6", "num-bigint-dig", "num-integer", "num-iter", "num-traits", - "pkcs1 0.4.1", - "pkcs8 0.9.0", + "pkcs1 0.7.5", + "pkcs8 0.10.2", "rand_core 0.6.4", "signature", "subtle 2.4.1", @@ -1515,12 +1515,12 @@ dependencies = [ [[package]] name = "spki" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e" dependencies = [ "base64ct", - "der 0.6.1", + "der 0.7.5", ] [[package]] diff --git a/lib/srv/desktop/rdp/rdpclient/Cargo.toml b/lib/srv/desktop/rdp/rdpclient/Cargo.toml index 0513f5b2a8da8..45e0b2e714dff 100644 --- a/lib/srv/desktop/rdp/rdpclient/Cargo.toml +++ b/lib/srv/desktop/rdp/rdpclient/Cargo.toml @@ -19,7 +19,7 @@ num-derive = "0.3.3" num-traits = "0.2.15" rand = { version = "0.8.5", features = ["getrandom"] } rand_chacha = "0.3.1" -rsa = "0.8.2" +rsa = "0.9.0" rdp-rs = { git = "https://github.com/gravitational/rdp-rs", rev = "75eb6a30b83e7152ee6213964b5ac6e783304840" } uuid = { version = "1.3.1", features = ["v4"] } utf16string = "0.2.0" diff --git a/lib/srv/desktop/rdp/rdpclient/src/piv.rs b/lib/srv/desktop/rdp/rdpclient/src/piv.rs index c128ba38bef19..0c6214a314e9a 100644 --- a/lib/srv/desktop/rdp/rdpclient/src/piv.rs +++ b/lib/srv/desktop/rdp/rdpclient/src/piv.rs @@ -20,7 +20,8 @@ use iso7816::response::Status; use iso7816_tlv::ber::{Tag, Tlv, Value}; use rdp::model::error::*; use rsa::pkcs1::DecodeRsaPrivateKey; -use rsa::{BigUint, PublicKeyParts, RsaPrivateKey}; +use rsa::traits::{PrivateKeyParts, PublicKeyParts}; +use rsa::{BigUint, RsaPrivateKey}; use std::convert::TryFrom; use std::fmt::Write as _; use std::io::{Cursor, Read};