Argon2 implementation

Cargo.toml

@@ -44,3 +44,4 @@ rsa = "0.7.2"
 yew-hooks = "0.2.0"
 bcrypt = "0.14.0"
 flate2 = { version = "1.0.26", features = ["zlib"] }
+argon2 = "0.5.2"

README.md

@@ -8,23 +8,25 @@ Visit this tool at [crypto.qkation.com](https://crypto.qkation.com).
 
 Table of content:
 
-* [Features](#features)
-* [Development](#development)
-* [Meta](#meta)
-* [Contributing](#contributing)
+- [crypto-helper](#crypto-helper)
+ - [Features](#features)
+ - [Development](#development)
+ - [Meta](#meta)
+ - [Contributing](#contributing)
 
 ![](/public/img/example.png)
 ![](/public/img/sha.png)
 ![](/public/img/jwt.png)
 
-The crypto-helper is an online app that helps to work with the different crypto algorithms. This app can hash/hmac, encrypt/decrypt, and sign/verify the data.
+The crypto-helper is a web app that helps to work with the different crypto algorithms. This app can hash/hmac, encrypt/decrypt, and sign/verify the data.
 
 All computations are performed on the client side. This tool never sends the data to any server.
 
 ### Features
 
 * Written in [Rust](https://github.com/rust-lang/rust) :crab: using [yew](https://github.com/yewstack/yew) :sparkles:
 * `MD5`
+* `BCRYPT`
 * `SHA1`/`SHA256`/`SHA384`/`SHA512`
 * Kerberos ciphers: `AES128-CTS-HMAC-SHA1-96`/`AES256-CTS-HMAC-SHA1-96`
 * Kerberos HMAC: `HMAC-SHA1-96-AES128`/`HMAC-SHA1-96-AES256`
@@ -55,7 +57,7 @@ export APP_HOST=<url>
 # example:
 # export APP_HOST=https://crypto-helper.qkation.com
 ```
-This env variable is uses for the url generation when you click the *share by url* button.
+This env variable is used for the url generation when you click the *share by url* button.
 
 3. Run `trunk serve` in your terminal.
 4. Go to http://127.0.0.1:8080 in your browser.

src/crypto_helper.rs

@@ -17,7 +17,7 @@ use yew::{function_component, html, use_effect_with_deps, use_state, Callback, H
 use yew_hooks::{use_clipboard, use_location};
 use yew_notifications::{use_notification, Notification, NotificationType};
 
-use self::computations::{process_krb_cipher, process_krb_hmac, process_rsa, process_zlib};
+use self::computations::{process_krb_cipher, process_krb_hmac, process_rsa, process_zlib, process_argon2};
 use crate::crypto_helper::computations::process_bcrypt;
 use crate::url_query_params::generate_crypto_helper_link;
 
@@ -39,6 +39,7 @@ fn convert(algrithm: &Algorithm) -> Result<Vec<u8>, String> {
  Algorithm::Rsa(input) => process_rsa(input),
  Algorithm::Bcrypt(input) => process_bcrypt(input),
  Algorithm::Zlib(input) => process_zlib(input),
+ Algorithm::Argon2(input) => process_argon2(input),
  }
 }
 

src/crypto_helper/algorithm.rs

@@ -18,8 +18,9 @@ pub const RSA: &str = "RSA";
 pub const SHA384: &str = "SHA384";
 pub const BCRYPT: &str = "BCRYPT";
 pub const ZLIB: &str = "ZLIB";
+pub const ARGON2: &str = "ARGON2";
 
-pub const SUPPORTED_ALGORITHMS: [&str; 12] = [
+pub const SUPPORTED_ALGORITHMS: [&str; 13] = [
  MD5,
  SHA1,
  SHA256,
@@ -32,9 +33,10 @@ pub const SUPPORTED_ALGORITHMS: [&str; 12] = [
  SHA384,
  BCRYPT,
  ZLIB,
+ ARGON2,
 ];
 
-pub const HASHING_ALGOS: [&str; 6] = [MD5, SHA1, SHA256, SHA384, SHA512, BCRYPT];
+pub const HASHING_ALGOS: [&str; 7] = [MD5, SHA1, SHA256, SHA384, SHA512, BCRYPT, ARGON2];
 
 pub const ENCRYPTION_ALGOS: [&str; 3] = [AES128_CTS_HMAC_SHA1_96, AES256_CTS_HMAC_SHA1_96, RSA];
 
@@ -362,6 +364,61 @@ pub struct ZlibInput {
  pub data: Vec<u8>,
 }
 
+#[derive(Eq, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct Argon2HashAction {
+ memory: u32,
+ iters: u32,
+ paralelism: u32,
+ output_len: u32,
+}
+
+#[derive(Eq, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub enum Argon2Action {
+ Hash(Argon2HashAction),
+ Verify(Vec<u8>),
+}
+#[derive(Eq, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct Argon2Input {
+ pub action: Argon2Action,
+ #[serde(serialize_with = "serialize_bytes", deserialize_with = "deserialize_bytes")]
+ pub data: Vec<u8>,
+}
+
+impl From<argon2::Params> for Argon2HashAction {
+ fn from(value: argon2::Params) -> Self {
+ let params = argon2::Params::DEFAULT;
+ Self {
+ memory: params.m_cost(),
+ iters: params.t_cost(),
+ paralelism: params.p_cost(),
+ output_len: 32
+ }
+ }
+}
+
+impl Default for Argon2HashAction {
+ fn default() -> Self {
+ argon2::Params::DEFAULT.into()
+ } 
+}
+
+impl Default for Argon2Action {
+ fn default() -> Self {
+ Self::Hash(Argon2HashAction::default())
+ }
+}
+
+impl Default for Argon2Input {
+ fn default() -> Self {
+ Self {
+ action: Argon2Action::default(),
+ data: Vec::new()
+ }
+ }
+}
+
+
+
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub enum Algorithm {
@@ -382,6 +439,7 @@ pub enum Algorithm {
  Rsa(RsaInput),
  Bcrypt(BcryptInput),
  Zlib(ZlibInput),
+ Argon2(Argon2Input),
 }
 
 impl TryFrom<&str> for Algorithm {
@@ -412,6 +470,8 @@ impl TryFrom<&str> for Algorithm {
  return Ok(Algorithm::Bcrypt(Default::default()));
  } else if value == ZLIB {
  return Ok(Algorithm::Zlib(Default::default()));
+ } else if value == ARGON2 {
+ return Ok(Algorithm::Argon2(Default::default()));
  }
 
  Err(format!(
@@ -436,6 +496,7 @@ impl From<&Algorithm> for &str {
  Algorithm::Rsa(_) => RSA,
  Algorithm::Bcrypt(_) => BCRYPT,
  Algorithm::Zlib(_) => ZLIB,
+ Algorithm::Argon2(_) => ARGON2,
  }
  }
 }

src/crypto_helper/computations.rs

@@ -11,7 +11,7 @@ use rand_chacha::ChaCha8Rng;
 use rsa::{PaddingScheme, PublicKey as PublicKeyTrait};
 
 use super::algorithm::{
- BcryptAction, BcryptInput, KrbInput, KrbInputData, KrbMode, RsaAction, RsaInput, ZlibInput, ZlibMode,
+ BcryptAction, BcryptInput, KrbInput, KrbInputData, KrbMode, RsaAction, RsaInput, ZlibInput, ZlibMode, Argon2Input, Argon2Action,
 };
 
 pub fn process_rsa(input: &RsaInput) -> Result<Vec<u8>, String> {
@@ -92,3 +92,7 @@ pub fn process_zlib(input: &ZlibInput) -> Result<Vec<u8>, String> {
  }
  }
 }
+
+pub fn process_argon2(input: &Argon2Input) -> Result<Vec<u8>, String> {
+ todo!()
+}

src/crypto_helper/info.rs

@@ -73,6 +73,9 @@ fn get_algorithm_info(algorithm: &Algorithm) -> Html {
  <a href="https://www.rfc-editor.org/rfc/rfc1950">{"RFC"}</a>
  </span>
  },
+ Algorithm::Argon2(_) => html! {
+ <span>{"Use Argon2 to encrypt/verify your data."}</span>
+ },
  }
 }
 

src/crypto_helper/input.rs

@@ -1,3 +1,4 @@
+mod argon2;
 mod bcrypt;
 mod krb;
 mod rsa;
@@ -6,6 +7,7 @@ mod zlib;
 use picky_krb::crypto::CipherSuite;
 use yew::{function_component, html, Callback, Html, Properties, UseStateSetter};
 
+use self::argon2::build_argon2_input;
 use self::bcrypt::build_bcrypt_input;
 use self::krb::build_krb_input;
 use self::rsa::build_rsa_input;
@@ -93,6 +95,10 @@ fn get_input_components(algorithm: &Algorithm, setter: &UseStateSetter<Algorithm
  input.clone(),
  Callback::from(move |input| setter.set(Algorithm::Zlib(input))),
  ),
+ Algorithm::Argon2(input) => build_argon2_input(
+ input.clone(),
+ Callback::from(move |input| setter.set(Algorithm::Argon2(input))),
+ ),
  }
 }
 

src/crypto_helper/input/argon2.rs

@@ -0,0 +1,35 @@
+use web_sys::HtmlInputElement;
+use yew::{classes, function_component, html, Callback, Html, Properties, TargetCast};
+use yew_notifications::{use_notification, Notification, NotificationType};
+
+use crate::{crypto_helper::algorithm::Argon2Input as Argon2InputData, common::{build_byte_input, BytesFormat}};
+
+#[derive(PartialEq, Properties, Clone)]
+pub struct Argon2InputProps {
+ pub input: Argon2InputData,
+ pub argon2_input_setter: Callback<Argon2InputData>,
+}
+
+#[function_component(Argon2Input)]
+pub fn argon2_input(props: &Argon2InputProps) -> Html {
+ let data = props.input.data.clone();
+ let input_setter = props.argon2_input_setter.clone();
+ let action = props.input.action.clone();
+ let setter = Callback::from(move |data| {
+ input_setter.emit(Argon2InputData {
+ action: action.clone(),
+ data,
+ })
+ });
+ html! {
+ <div class={classes!("wide-input", "vertical")}>
+ {build_byte_input(data, setter, Some(BytesFormat::Ascii), Some("argon2".into()))}
+ </div>
+ }
+}
+
+pub fn build_argon2_input(input: Argon2InputData, setter: Callback<Argon2InputData>) -> Html {
+ html! {
+ <Argon2Input input={input} argon2_input_setter={setter}/>
+ }
+}

src/crypto_helper/output.rs

@@ -28,6 +28,7 @@ fn get_output_components(algorithm: &Algorithm, output: &[u8], add_notification:
  add_notification,
  ),
  Algorithm::Zlib(_) => build_simple_output(output.into(), BytesFormat::Hex, add_notification),
+ Algorithm::Argon2(_) => build_simple_output(output.into(), BytesFormat::Hex, add_notification),
  }
 }