summaryrefslogtreecommitdiff
path: root/crates/tor-keymgr
diff options
context:
space:
mode:
Diffstat (limited to 'crates/tor-keymgr')
-rw-r--r--crates/tor-keymgr/Cargo.toml1
-rw-r--r--crates/tor-keymgr/src/keystore/arti.rs2
-rw-r--r--crates/tor-keymgr/src/mgr.rs4
3 files changed, 4 insertions, 3 deletions
diff --git a/crates/tor-keymgr/Cargo.toml b/crates/tor-keymgr/Cargo.toml
index 3afa474ac..909dd51b5 100644
--- a/crates/tor-keymgr/Cargo.toml
+++ b/crates/tor-keymgr/Cargo.toml
@@ -83,6 +83,7 @@ tor-persist = { path = "../tor-persist", version = "0.40.0" }
tracing = "0.1.36"
visibility = { version = "0.1.0" }
walkdir = { version = "2" }
+web-time-compat = { path = "../web-time-compat", version = "0.1.0" }
zeroize = "1"
[dev-dependencies]
diff --git a/crates/tor-keymgr/src/keystore/arti.rs b/crates/tor-keymgr/src/keystore/arti.rs
index 354561545..8afbc739f 100644
--- a/crates/tor-keymgr/src/keystore/arti.rs
+++ b/crates/tor-keymgr/src/keystore/arti.rs
@@ -421,12 +421,12 @@ mod tests {
use std::cmp::Ordering;
use std::fs;
use std::path::PathBuf;
- use std::time::{Duration, SystemTime};
use tempfile::{TempDir, tempdir};
use tor_cert::{CertifiedKey, Ed25519Cert};
use tor_checkable::{SelfSigned, Timebound};
use tor_key_forge::{CertType, KeyType, ParsedEd25519Cert};
use tor_llcrypto::pk::ed25519::{self, Ed25519PublicKey as _};
+ use web_time_compat::{Duration, SystemTime};
#[cfg(unix)]
use std::os::unix::fs::PermissionsExt;
diff --git a/crates/tor-keymgr/src/mgr.rs b/crates/tor-keymgr/src/mgr.rs
index 66933e4bb..26473dc06 100644
--- a/crates/tor-keymgr/src/mgr.rs
+++ b/crates/tor-keymgr/src/mgr.rs
@@ -859,7 +859,6 @@ mod tests {
use std::result::Result as StdResult;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
- use std::time::{Duration, SystemTime};
use tor_basic_utils::test_rng::testing_rng;
use tor_cert::CertifiedKey;
use tor_cert::Ed25519Cert;
@@ -871,6 +870,7 @@ mod tests {
};
use tor_llcrypto::pk::ed25519::{self, Ed25519PublicKey as _};
use tor_llcrypto::rng::FakeEntropicRng;
+ use web_time_compat::{Duration, SystemTime, SystemTimeExt};
#[cfg(feature = "experimental-api")]
use {
@@ -2079,7 +2079,7 @@ mod tests {
let keypair = ed25519::Keypair::generate(&mut rng);
let encoded_cert = Ed25519Cert::constructor()
.cert_type(tor_cert::CertType::IDENTITY_V_SIGNING)
- .expiration(SystemTime::now() + Duration::from_secs(180))
+ .expiration(SystemTime::get() + Duration::from_secs(180))
.signing_key(keypair.public_key().into())
.cert_key(CertifiedKey::Ed25519(keypair.public_key().into()))
.encode_and_sign(&keypair)