client: Drop once_cell dependency

Author: bilelmoussaoui

README.md

@@ -63,10 +63,10 @@ async fn run() -> oo7::Result<()> {
 If your application makes heavy usage of the keyring like a password manager. You could store an instance of the `Keyring` in a `OnceCell`
 
 ```rust,ignore
-use once_cell::sync::OnceCell;
+use std::sync::OnceLock;
 use std::collections::HashMap;
 
-static KEYRING: OnceCell<oo7::Keyring> = OnceCell::new();
+static KEYRING: OnceLock<oo7::Keyring> = OnceLock::new();
 
 fn main() {
     // SOME_RUNTIME could be a tokio/async-std/glib runtime

client/Cargo.toml

@@ -40,7 +40,6 @@ hmac = { version = "0.12", optional = true }
 pbkdf2 = { version = "0.12", optional = true }
 sha2 = { version = "0.10", optional = true }
 openssl = { version = "0.10", optional = true }
-once_cell = "1.9"
 async-fs = { version = "2.1.0", optional = true }
 async-lock = { version = "3.2.0", optional = true }
 async-io = { version = "2.2.2", optional = true }

client/examples/basic_2.rs

@@ -1,9 +1,8 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::OnceLock};
 
-use once_cell::sync::OnceCell;
 use oo7::Keyring;
 
-static KEYRING: OnceCell<Keyring> = OnceCell::new();
+static KEYRING: OnceLock<Keyring> = OnceLock::new();
 
 #[tokio::main]
 async fn main() -> oo7::Result<()> {

client/src/crypto/native.rs

@@ -1,4 +1,7 @@
-use std::ops::{Mul, Rem, Shr};
+use std::{
+    ops::{Mul, Rem, Shr},
+    sync::OnceLock,
+};
 
 use cipher::{
     block_padding::Pkcs7, BlockDecryptMut, BlockEncryptMut, BlockSizeUser, IvSizeUser, KeyIvInit,
@@ -7,7 +10,6 @@ use digest::{Mac, OutputSizeUser};
 use hkdf::Hkdf;
 use num::{FromPrimitive, Integer, One, Zero};
 use num_bigint_dig::BigUint;
-use once_cell::sync::Lazy;
 use sha2::Sha256;
 use zeroize::{Zeroize, Zeroizing};
 
@@ -59,7 +61,11 @@ pub(crate) fn generate_private_key() -> Zeroizing<Vec<u8>> {
 
 pub(crate) fn generate_public_key(private_key: impl AsRef<[u8]>) -> Vec<u8> {
     let private_key_uint = BigUint::from_bytes_be(private_key.as_ref());
-    let public_key_uint = powm(&DH_GENERATOR, private_key_uint, &DH_PRIME);
+    let dh_generator = {
+        static DH_GENERATOR: OnceLock<BigUint> = OnceLock::new();
+        DH_GENERATOR.get_or_init(|| BigUint::from_u64(0x2).unwrap())
+    };
+    let public_key_uint = powm(dh_generator, private_key_uint);
 
     public_key_uint.to_bytes_be()
 }
@@ -70,7 +76,7 @@ pub(crate) fn generate_aes_key(
 ) -> Zeroizing<Vec<u8>> {
     let server_public_key_uint = BigUint::from_bytes_be(server_public_key.as_ref());
     let private_key_uint = BigUint::from_bytes_be(private_key.as_ref());
-    let common_secret = powm(&server_public_key_uint, private_key_uint, &DH_PRIME);
+    let common_secret = powm(&server_public_key_uint, private_key_uint);
 
     let mut common_secret_bytes = common_secret.to_bytes_be();
     let mut common_secret_padded = vec![0; 128 - common_secret_bytes.len()];
@@ -132,24 +138,27 @@ pub(crate) fn derive_key(
     key
 }
 
-// for key exchange
-static DH_GENERATOR: Lazy<BigUint> = Lazy::new(|| BigUint::from_u64(0x2).unwrap());
-static DH_PRIME: Lazy<BigUint> = Lazy::new(|| {
-    BigUint::from_bytes_be(&[
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2,
-        0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1, 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67,
-        0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E,
-        0x34, 0x04, 0xDD, 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
-        0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45, 0xE4, 0x85, 0xB5,
-        0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF,
-        0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED, 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE,
-        0x9F, 0x24, 0x11, 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    ])
-});
-
 /// from https://github.com/plietar/librespot/blob/master/core/src/util/mod.rs#L53
-fn powm(base: &BigUint, mut exp: BigUint, modulus: &BigUint) -> BigUint {
+fn powm(base: &BigUint, mut exp: BigUint) -> BigUint {
+    let modulus = {
+        // for key exchange
+        static DH_PRIME: OnceLock<BigUint> = OnceLock::new();
+        DH_PRIME.get_or_init(|| {
+            BigUint::from_bytes_be(&[
+                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68,
+                0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1, 0x29, 0x02, 0x4E, 0x08,
+                0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A,
+                0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD, 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B,
+                0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51,
+                0xC2, 0x45, 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
+                0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED, 0xEE, 0x38,
+                0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11, 0x7C, 0x4B, 0x1F, 0xE6,
+                0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+                0xFF, 0xFF,
+            ])
+        })
+    };
+
     let mut base = base.clone();
     let mut result: BigUint = One::one();
 

client/src/portal/api/mod.rs

@@ -7,15 +7,17 @@
 
 #[cfg(feature = "async-std")]
 use std::io;
-use std::path::{Path, PathBuf};
+use std::{
+    path::{Path, PathBuf},
+    sync::OnceLock,
+};
 
 #[cfg(feature = "async-std")]
 use async_fs as fs;
 #[cfg(feature = "async-std")]
 use async_fs::unix::OpenOptionsExt;
 #[cfg(feature = "async-std")]
 use futures_lite::AsyncWriteExt;
-use once_cell::sync::Lazy;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "tokio")]
@@ -37,9 +39,6 @@ const FILE_HEADER_LEN: usize = FILE_HEADER.len();
 const MAJOR_VERSION: u8 = 1;
 const MINOR_VERSION: u8 = 0;
 
-pub(super) static GVARIANT_ENCODING: Lazy<zvariant::EncodingContext<byteorder::LE>> =
-    Lazy::new(|| zvariant::EncodingContext::<byteorder::LE>::new_gvariant(0));
-
 mod attribute_value;
 mod encrypted_item;
 
@@ -53,6 +52,11 @@ use crate::{
     AsAttributes, Key,
 };
 
+pub(super) fn gvariant_encoding() -> &'static zvariant::EncodingContext<byteorder::LE> {
+    static ENCODING: OnceLock<zvariant::EncodingContext<byteorder::LE>> = OnceLock::new();
+    ENCODING.get_or_init(|| zvariant::EncodingContext::<byteorder::LE>::new_gvariant(0))
+}
+
 /// Logical contents of a keyring file
 #[derive(Deserialize, Serialize, Type, Debug)]
 pub struct Keyring {
@@ -215,7 +219,7 @@ impl Keyring {
 
         blob.push(MAJOR_VERSION);
         blob.push(MINOR_VERSION);
-        blob.append(&mut zvariant::to_bytes(*GVARIANT_ENCODING, &self)?);
+        blob.append(&mut zvariant::to_bytes(*gvariant_encoding(), &self)?);
 
         Ok(blob)
     }
@@ -257,7 +261,7 @@ impl TryFrom<&[u8]> for Keyring {
         }
 
         if let Some(data) = value.get((FILE_HEADER_LEN + 2)..) {
-            let keyring: Self = zvariant::from_slice(data, *GVARIANT_ENCODING)?;
+            let keyring: Self = zvariant::from_slice(data, *gvariant_encoding())?;
 
             if keyring.salt.len() != keyring.salt_size as usize {
                 Err(Error::SaltSizeMismatch(

client/src/portal/item.rs

@@ -5,7 +5,7 @@ use zbus::zvariant::{self, Type};
 use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing};
 
 use super::{
-    api::{AttributeValue, EncryptedItem, GVARIANT_ENCODING},
+    api::{gvariant_encoding, AttributeValue, EncryptedItem},
     Error,
 };
 use crate::{crypto, AsAttributes, Key};
@@ -105,7 +105,7 @@ impl Item {
     pub(crate) fn encrypt(&self, key: &Key) -> Result<EncryptedItem, Error> {
         key.check_strength()?;
 
-        let decrypted = Zeroizing::new(zvariant::to_bytes(*GVARIANT_ENCODING, &self)?);
+        let decrypted = Zeroizing::new(zvariant::to_bytes(*gvariant_encoding(), &self)?);
 
         let iv = crypto::generate_iv();
 
@@ -131,6 +131,6 @@ impl TryFrom<&[u8]> for Item {
     type Error = Error;
 
     fn try_from(value: &[u8]) -> Result<Self, Error> {
-        Ok(zvariant::from_slice(value, *GVARIANT_ENCODING)?)
+        Ok(zvariant::from_slice(value, *gvariant_encoding())?)
     }
 }

client/src/portal/mod.rs

@@ -33,7 +33,7 @@ use std::io;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
-    sync::Arc,
+    sync::{Arc, OnceLock},
 };
 
 #[cfg(feature = "async-std")]
@@ -42,7 +42,6 @@ use async_fs as fs;
 use async_lock::{Mutex, RwLock};
 #[cfg(feature = "async-std")]
 use futures_lite::AsyncReadExt;
-use once_cell::sync::OnceCell;
 #[cfg(feature = "tokio")]
 use tokio::{
     fs, io,
@@ -82,7 +81,7 @@ pub struct Keyring {
     /// Times are stored before reading the file to detect
     /// file changes before writing
     mtime: Mutex<Option<std::time::SystemTime>>,
-    key: OnceCell<Key>,
+    key: OnceLock<Key>,
     secret: Arc<Secret>,
 }