lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-05-04 10:43:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: use trait & remove reassignment

Browse source
This commit is contained in:
Erica Marigold 2023-10-15 00:07:59 -07:00
parent d33d1d3087
commit bfd33e3db5
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
1 changed files with 8 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/lune/builtins/serde/crypto.rs
View file

@ -5,7 +5,7 @@ use crate::lune::builtins::{
}; };
use anyhow::Result; use anyhow::Result;
use base64::{engine::general_purpose as Base64, Engine as _}; use base64::{engine::general_purpose as Base64, Engine as _};
use sha1::Digest as _; use digest::Digest as _;
use std::sync::Mutex; use std::sync::Mutex;
// TODO: Proper error handling, remove unwraps // TODO: Proper error handling, remove unwraps
@ -74,53 +74,17 @@ impl CryptoAlgo {
pub fn update(&mut self, content: impl AsRef<[u8]>) { pub fn update(&mut self, content: impl AsRef<[u8]>) {
match self { match self {
CryptoAlgo::Sha1(hasher) => { CryptoAlgo::Sha1(hasher) => hasher.update(content),
let mut new_hasher = (**hasher).clone(); CryptoAlgo::Sha256(hasher) => hasher.update(content),
sha1::Digest::update(&mut new_hasher, content); CryptoAlgo::Sha512(hasher) => hasher.update(content),
*self = CryptoAlgo::Sha1(Box::new(new_hasher))
}
CryptoAlgo::Sha256(hasher) => {
let mut new_hasher = (**hasher).clone();
sha2::Digest::update(&mut new_hasher, content);
*self = CryptoAlgo::Sha256(Box::new(new_hasher))
}
CryptoAlgo::Sha512(hasher) => {
let mut new_hasher = (**hasher).clone();
sha2::Digest::update(&mut new_hasher, content);
*self = CryptoAlgo::Sha512(Box::new(new_hasher))
}
}; };
} }
pub fn digest(&mut self, encoding: EncodingKind) -> Result<String> { pub fn digest(&mut self, encoding: EncodingKind) -> Result<String> {
let computed: Vec<u8> = match self { let computed: Vec<u8> = match self {
CryptoAlgo::Sha1(hasher) => { CryptoAlgo::Sha1(hasher) => hasher.clone().finalize().to_vec(),
let mut new_hasher = (**hasher).clone(); CryptoAlgo::Sha256(hasher) => hasher.clone().finalize().to_vec(),
let hash = sha1::Digest::finalize_reset(&mut new_hasher); CryptoAlgo::Sha512(hasher) => hasher.clone().finalize().to_vec(),
*self = CryptoAlgo::Sha1(Box::new(new_hasher));
hash.to_vec()
}
CryptoAlgo::Sha256(hasher) => {
let mut new_hasher = (**hasher).clone();
let hash = sha2::Digest::finalize_reset(&mut new_hasher);
*self = CryptoAlgo::Sha256(Box::new(new_hasher));
hash.to_vec()
}
CryptoAlgo::Sha512(hasher) => {
let mut new_hasher = (**hasher).clone();
let hash = sha2::Digest::finalize_reset(&mut new_hasher);
*self = CryptoAlgo::Sha512(Box::new(new_hasher));
hash.to_vec()
}
}; };
match encoding { match encoding {
@ -170,7 +134,7 @@ impl Crypto {
} }
pub fn update(&self, content: impl AsRef<[u8]>) -> &Crypto { pub fn update(&self, content: impl AsRef<[u8]>) -> &Crypto {
(*self.algo.lock().unwrap()).update(content); (self.algo.lock().unwrap()).update(content);
self self
} }