diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2021-11-17 12:50:46 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2021-11-18 14:10:55 +0100 |
commit | b56ea7ab07626ff37e14f0c15c6252b7627a6b72 (patch) | |
tree | 595c6a5d11b2db7e9141384a32762052440193ce /openpgp/src/crypto/backend | |
parent | 991c759dd710bab903baa32dff8dc1fc18e78e3b (diff) |
openpgp: Use a WASM-friendly SystemTime::now wrapper.
- Fixes #769.
Diffstat (limited to 'openpgp/src/crypto/backend')
-rw-r--r-- | openpgp/src/crypto/backend/cng/asymmetric.rs | 10 | ||||
-rw-r--r-- | openpgp/src/crypto/backend/nettle/asymmetric.rs | 10 | ||||
-rw-r--r-- | openpgp/src/crypto/backend/rust/asymmetric.rs | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/openpgp/src/crypto/backend/cng/asymmetric.rs b/openpgp/src/crypto/backend/cng/asymmetric.rs index c573acc4..fe987dbe 100644 --- a/openpgp/src/crypto/backend/cng/asymmetric.rs +++ b/openpgp/src/crypto/backend/cng/asymmetric.rs @@ -723,7 +723,7 @@ where private.reverse(); Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::ECDH, mpi::PublicKey::ECDH { curve: Curve::Cv25519, @@ -757,7 +757,7 @@ where public[1..].copy_from_slice(Into::<PublicKey>::into(&private).as_bytes()); Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::EdDSA, mpi::PublicKey::EdDSA { curve: Curve::Ed25519, @@ -797,7 +797,7 @@ where .ok_or_else(|| Error::MalformedMPI("RSA: `p` and `q` aren't coprime".into()))?; Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::RSAEncryptSign, mpi::PublicKey::RSA { e: mpi::MPI::new(&e.to_bytes_be()), @@ -846,7 +846,7 @@ where }; Self::with_secret( - SystemTime::now(), + crate::now(), PublicKeyAlgorithm::RSAEncryptSign, public, private.into() @@ -960,7 +960,7 @@ where } }; - Self::with_secret(SystemTime::now(), algo, public, private.into()) + Self::with_secret(crate::now(), algo, public, private.into()) } } diff --git a/openpgp/src/crypto/backend/nettle/asymmetric.rs b/openpgp/src/crypto/backend/nettle/asymmetric.rs index bf1126e6..0b4e1835 100644 --- a/openpgp/src/crypto/backend/nettle/asymmetric.rs +++ b/openpgp/src/crypto/backend/nettle/asymmetric.rs @@ -344,7 +344,7 @@ impl<R> Key4<SecretParts, R> private_key.reverse(); Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::ECDH, mpi::PublicKey::ECDH { curve: Curve::Cv25519, @@ -370,7 +370,7 @@ impl<R> Key4<SecretParts, R> ed25519::public_key(&mut public_key, private_key).unwrap(); Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::EdDSA, mpi::PublicKey::EdDSA { curve: Curve::Ed25519, @@ -395,7 +395,7 @@ impl<R> Key4<SecretParts, R> let (a, b, c) = sec.as_rfc4880(); Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::RSAEncryptSign, mpi::PublicKey::RSA { e: mpi::MPI::new(&key.e()[..]), @@ -427,7 +427,7 @@ impl<R> Key4<SecretParts, R> }; Self::with_secret( - SystemTime::now(), + crate::now(), PublicKeyAlgorithm::RSAEncryptSign, public_mpis, private_mpis.into()) @@ -565,7 +565,7 @@ impl<R> Key4<SecretParts, R> }; Self::with_secret( - SystemTime::now(), + crate::now(), pk_algo, mpis, secret) diff --git a/openpgp/src/crypto/backend/rust/asymmetric.rs b/openpgp/src/crypto/backend/rust/asymmetric.rs index 22c86cee..405b932b 100644 --- a/openpgp/src/crypto/backend/rust/asymmetric.rs +++ b/openpgp/src/crypto/backend/rust/asymmetric.rs @@ -361,7 +361,7 @@ impl<R> Key4<SecretParts, R> private_key.reverse(); Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::ECDH, mpi::PublicKey::ECDH { curve: Curve::Cv25519, @@ -396,7 +396,7 @@ impl<R> Key4<SecretParts, R> &mut public[1..].copy_from_slice(Into::<PublicKey>::into(&private).as_bytes()); Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::EdDSA, mpi::PublicKey::EdDSA { curve: Curve::Ed25519, @@ -435,7 +435,7 @@ impl<R> Key4<SecretParts, R> .ok_or_else(|| Error::MalformedMPI("RSA: `p` and `q` aren't coprime".into()))?; Self::with_secret( - ctime.into().unwrap_or_else(SystemTime::now), + ctime.into().unwrap_or_else(crate::now), PublicKeyAlgorithm::RSAEncryptSign, mpi::PublicKey::RSA { e: mpi::MPI::new(&e.to_bytes_be()), @@ -474,7 +474,7 @@ impl<R> Key4<SecretParts, R> }; Self::with_secret( - SystemTime::now(), + crate::now(), PublicKeyAlgorithm::RSAEncryptSign, public, private.into(), @@ -573,7 +573,7 @@ impl<R> Key4<SecretParts, R> return Err(Error::UnsupportedEllipticCurve(curve).into()); } }; - Self::with_secret(SystemTime::now(), algo, public, private.into()) + Self::with_secret(crate::now(), algo, public, private.into()) } } |