From 5b624427793eb6bef1e3088566cd6aa66dd6a9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piyush=20=E0=A4=AE=E0=A4=BF=E0=A4=B6=E0=A5=8D=E0=A4=B0?= Date: Sun, 18 Jun 2023 12:22:56 +0530 Subject: [PATCH] Changed depricated function in base64 --- src/broker_messages/mod.rs | 2 -- src/main.rs | 2 +- src/ws_sansad/users.rs | 10 ++++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/broker_messages/mod.rs b/src/broker_messages/mod.rs index 6fb1f9f..dd24051 100644 --- a/src/broker_messages/mod.rs +++ b/src/broker_messages/mod.rs @@ -17,8 +17,6 @@ use crate::ws_sansad::WsSansad; use actix::prelude::*; -use dev::MessageResponse; -// use dev::ResponseChannel; pub mod pind; pub mod responses; diff --git a/src/main.rs b/src/main.rs index 5ef402c..af181c8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -105,7 +105,7 @@ fn gen_rustls_server_config(key: String, cert: String) -> ServerConfig { let private_key = PrivateKey(private_key.to_owned()); - let mut config = ServerConfig::builder() + let config = ServerConfig::builder() .with_safe_default_cipher_suites() .with_safe_default_kx_groups() .with_safe_default_protocol_versions() diff --git a/src/ws_sansad/users.rs b/src/ws_sansad/users.rs index 7d0f476..74c5b7f 100644 --- a/src/ws_sansad/users.rs +++ b/src/ws_sansad/users.rs @@ -17,7 +17,9 @@ use super::*; use crate::config::CONFIG; +use base64::Engine; use sha2::{Digest, Sha224}; + impl WsSansad { /// Request to join to kaksh pub async fn join_kaksh(&mut self, val: Value) { @@ -56,7 +58,9 @@ impl WsSansad { } let mut hasher = Sha224::new(); hasher.update(format!("{}{}", kunjika, CONFIG.salt).as_bytes()); - let kunjika = base64::encode(hasher.finalize())[..8].to_owned(); + let kunjika = base64::engine::general_purpose::STANDARD_NO_PAD.encode(hasher.finalize()) + [..8] + .to_owned(); // Name let name = match val.get("name") { @@ -161,7 +165,9 @@ impl WsSansad { } let mut hasher = Sha224::new(); hasher.update(format!("{}{}", kunjika, &CONFIG.salt).as_bytes()); - let kunjika = base64::encode(hasher.finalize())[..8].to_owned(); + let kunjika = base64::engine::general_purpose::STANDARD_NO_PAD.encode(hasher.finalize()) + [..8] + .to_owned(); // Name let name = match val.get("name") {