diff options
Diffstat (limited to 'crates/tor-relay-crypto')
| -rw-r--r-- | crates/tor-relay-crypto/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/tor-relay-crypto/src/certs.rs | 7 | ||||
| -rw-r--r-- | crates/tor-relay-crypto/src/pk.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crates/tor-relay-crypto/Cargo.toml b/crates/tor-relay-crypto/Cargo.toml index 282fe0bdb..ad35fcfde 100644 --- a/crates/tor-relay-crypto/Cargo.toml +++ b/crates/tor-relay-crypto/Cargo.toml @@ -34,6 +34,7 @@ tor-key-forge = { path = "../tor-key-forge", version = "0.40.0" } tor-keymgr = { path = "../tor-keymgr", version = "0.40.0", features = ["experimental-api"] } tor-llcrypto = { path = "../tor-llcrypto", version = "0.40.0" } tor-persist = { path = "../tor-persist", version = "0.40.0" } +web-time-compat = { path = "../web-time-compat", version = "0.1.0" } [dev-dependencies] tor-keymgr = { version = "0.40.0", path = "../tor-keymgr", features = ["testing"] } diff --git a/crates/tor-relay-crypto/src/certs.rs b/crates/tor-relay-crypto/src/certs.rs index 7dc80e220..69f2d0299 100644 --- a/crates/tor-relay-crypto/src/certs.rs +++ b/crates/tor-relay-crypto/src/certs.rs @@ -1,11 +1,10 @@ //! Certificate related types and functions for an arti relay. -use std::time::SystemTime; - use tor_cert::{CertEncodeError, CertType, CertifiedKey, Ed25519Cert, EncodedEd25519Cert}; use tor_checkable::{SelfSigned, Timebound}; use tor_key_forge::{InvalidCertError, ParsedEd25519Cert, ToEncodableCert}; use tor_llcrypto::pk::ed25519::{self, Ed25519Identity}; +use web_time_compat::{SystemTime, SystemTimeExt}; use crate::pk::{RelayIdentityKeypair, RelayLinkSigningKeypair, RelaySigningKeypair}; @@ -113,7 +112,7 @@ impl ToEncodableCert<RelaySigningKeypair> for RelaySigningKeyCert { signed_with: &Self::SigningKey, ) -> Result<Self, InvalidCertError> { // TODO: take the time/time provider as an arg? - let now = SystemTime::now(); + let now = SystemTime::get(); validate_ed25519_cert( cert, &subject.public().into(), @@ -140,7 +139,7 @@ impl ToEncodableCert<RelayLinkSigningKeypair> for RelayLinkSigningKeyCert { signed_with: &Self::SigningKey, ) -> Result<Self, InvalidCertError> { // TODO: take the time/time provider as an arg? - let now = SystemTime::now(); + let now = SystemTime::get(); validate_ed25519_cert( cert, &subject.public().into(), diff --git a/crates/tor-relay-crypto/src/pk.rs b/crates/tor-relay-crypto/src/pk.rs index 5302b8813..d2980cd5f 100644 --- a/crates/tor-relay-crypto/src/pk.rs +++ b/crates/tor-relay-crypto/src/pk.rs @@ -2,7 +2,6 @@ //! KeyMgr so some of them can be stored on disk. use std::fmt; -use std::time::SystemTime; use derive_deftly::Deftly; use derive_more::Constructor; @@ -15,6 +14,7 @@ use tor_keymgr::{ derive_deftly_template_CertSpecifier, derive_deftly_template_KeySpecifier, }; use tor_persist::slug::{Slug, timestamp::Iso8601TimeSlug}; +use web_time_compat::SystemTime; define_ed25519_keypair!( /// [KP_relayid_ed] Long-term identity keypair. Never rotates. |
