Stop using deprecated functions

Author: poljar

src/cipher/key.rs

@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::ops::Deref;
+
 use aes::{
     Aes256,
     cipher::{Array, IvSizeUser, KeySizeUser},
@@ -98,14 +100,14 @@ impl CipherKeys {
     }
 
     pub fn aes_key(&self) -> &Aes256Key {
-        Aes256Key::from_slice(self.aes_key.as_slice())
+        self.aes_key.deref().into()
     }
 
     pub const fn mac_key(&self) -> &HmacSha256Key {
         &self.mac_key
     }
 
     pub fn iv(&self) -> &Aes256Iv {
-        Aes256Iv::from_slice(self.aes_iv.as_slice())
+        self.aes_iv.deref().into()
     }
 }

src/ecies/mod.rs

@@ -78,6 +78,8 @@
 //! # Ok::<(), anyhow::Error>(())
 //! ```
 
+use std::ops::Deref;
+
 use chacha20poly1305::{ChaCha20Poly1305, Key as Chacha20Key, KeyInit, Nonce, aead::Aead};
 use hkdf::Hkdf;
 use rand::rng;
@@ -489,11 +491,11 @@ impl EstablishedEcies {
     }
 
     fn encryption_key(&self) -> &Chacha20Key {
-        Chacha20Key::from_slice(self.encryption_key.as_slice())
+        self.encryption_key.deref().into()
     }
 
     fn decryption_key(&self) -> &Chacha20Key {
-        Chacha20Key::from_slice(self.decryption_key.as_slice())
+        self.decryption_key.deref().into()
     }
 
     /// Encrypt the given plaintext using this [`EstablishedEcies`] session.

src/megolm/ratchet.rs

@@ -14,7 +14,7 @@
 // limitations under the License.
 
 use hmac::{Hmac, KeyInit, Mac as _};
-use rand::{RngCore, thread_rng};
+use rand::{RngCore, rng};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use sha2::{Sha256, digest::CtOutput};
 use subtle::{Choice, ConstantTimeEq};
@@ -139,7 +139,7 @@ impl Ratchet {
     const LAST_RATCHET_INDEX: usize = Self::RATCHET_PART_COUNT - 1;
 
     pub fn new() -> Self {
-        let mut rng = thread_rng();
+        let mut rng = rng();
 
         let mut ratchet =
             Self { inner: RatchetBytes(Box::new([0u8; Self::RATCHET_LENGTH])), counter: 0 };

src/olm/account/mod.rs

@@ -21,7 +21,7 @@ use chacha20poly1305::{
     ChaCha20Poly1305, Nonce,
     aead::{Aead, AeadCore, KeyInit},
 };
-use rand::thread_rng;
+use rand::rng;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use x25519_dalek::ReusableSecret;

src/olm/shared_secret.rs

@@ -117,15 +117,15 @@ impl Shared3DHSecret {
 
 #[cfg(test)]
 mod test {
-    use rand::thread_rng;
+    use rand::rng;
     use x25519_dalek::ReusableSecret;
 
     use super::{RemoteShared3DHSecret, Shared3DHSecret};
     use crate::{Curve25519PublicKey as PublicKey, types::Curve25519SecretKey as StaticSecret};
 
     #[test]
     fn triple_diffie_hellman() {
-        let mut rng = thread_rng();
+        let mut rng = rng();
 
         let alice_identity = StaticSecret::new();
         let alice_one_time = ReusableSecret::random_from_rng(&mut rng);

src/sas.rs

@@ -53,7 +53,7 @@
 
 use hkdf::Hkdf;
 use hmac::{Hmac, KeyInit, Mac as _, digest::MacError};
-use rand::thread_rng;
+use rand::rng;
 use sha2::Sha256;
 use thiserror::Error;
 use x25519_dalek::{EphemeralSecret, SharedSecret};

src/types/ed25519.rs

@@ -22,7 +22,7 @@ use ed25519_dalek::Verifier;
 use ed25519_dalek::{
     PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH, Signature, Signer, SigningKey, VerifyingKey,
 };
-use rand::thread_rng;
+use rand::rng;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_bytes::{ByteBuf as SerdeByteBuf, Bytes as SerdeBytes};
 use sha2::Sha512;
@@ -129,7 +129,7 @@ impl<'d> Deserialize<'d> for ExpandedSecretKey {
 impl Ed25519Keypair {
     /// Create a new, random, `Ed25519Keypair`.
     pub fn new() -> Self {
-        let mut rng = thread_rng();
+        let mut rng = rng();
         let signing_key = SigningKey::generate(&mut rng);
 
         Self {
@@ -211,7 +211,7 @@ impl Ed25519SecretKey {
 
     /// Create a new random `Ed25519SecretKey`.
     pub fn new() -> Self {
-        let mut rng = thread_rng();
+        let mut rng = rng();
         let signing_key = SigningKey::generate(&mut rng);
         let key = Box::new(signing_key);