diff --git a/Cargo.lock b/Cargo.lock
index 0ed3fabf..c1461df8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -30,9 +30,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -91,6 +91,18 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
 
+[[package]]
+name = "argon2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
+dependencies = [
+ "base64ct",
+ "blake2",
+ "cpufeatures",
+ "password-hash 0.5.0",
+]
+
 [[package]]
 name = "asn1-parser"
 version = "0.1.0"
@@ -107,15 +119,15 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -195,9 +207,18 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest 0.10.7",
+]
 
 [[package]]
 name = "block-buffer"
@@ -256,9 +277,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cbc"
@@ -383,6 +404,7 @@ dependencies = [
 name = "crypto-helper"
 version = "0.10.0"
 dependencies = [
+ "argon2",
  "asn1-parser",
  "base64 0.22.0",
  "bcrypt",
@@ -395,11 +417,12 @@ dependencies = [
  "log",
  "md5",
  "oid",
+ "password-hash 0.5.0",
  "paste",
  "picky",
  "picky-krb",
- "rand 0.9.0-alpha.0",
- "rand_chacha 0.9.0-alpha.0",
+ "rand 0.9.0-alpha.1",
+ "rand_chacha 0.9.0-alpha.1",
  "rsa",
  "serde",
  "serde_json",
@@ -442,7 +465,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -598,9 +621,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
 
 [[package]]
 name = "ff"
@@ -614,9 +637,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
+checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f"
 
 [[package]]
 name = "flate2"
@@ -700,7 +723,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1169,7 +1192,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1274,14 +1297,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b"
 dependencies = [
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1299,9 +1322,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
@@ -1344,9 +1367,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libz-sys"
-version = "1.1.15"
+version = "1.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
+checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
 dependencies = [
  "cc",
  "pkg-config",
@@ -1528,6 +1551,17 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.14"
@@ -1542,7 +1576,7 @@ checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
  "digest 0.10.7",
  "hmac",
- "password-hash",
+ "password-hash 0.4.2",
  "sha-1",
  "sha2",
 ]
@@ -1701,7 +1735,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1756,9 +1790,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "platforms"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
+checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
 
 [[package]]
 name = "powerfmt"
@@ -1774,12 +1808,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
+checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
 dependencies = [
  "proc-macro2",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1908,11 +1942,12 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.0-alpha.0"
+version = "0.9.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "807b7862b9cbece02dbbb9465356885df299fcc8b19d27a4570903eaf6a4062e"
+checksum = "8d31e63ea85be51c423e52ba8f2e68a3efd53eed30203ee029dd09947333693e"
 dependencies = [
- "rand_core 0.9.0-alpha.0",
+ "rand_chacha 0.9.0-alpha.1",
+ "rand_core 0.9.0-alpha.1",
  "zerocopy",
 ]
 
@@ -1928,12 +1963,12 @@ dependencies = [
 
 [[package]]
 name = "rand_chacha"
-version = "0.9.0-alpha.0"
+version = "0.9.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5c41723acb3ac225e48e77a0921e0c69b36b670d857e0914fc8d574efa7df8"
+checksum = "78674ef918c19451dbd250f8201f8619b494f64c9aa6f3adb28fd8a0f1f6da46"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.0-alpha.0",
+ "rand_core 0.9.0-alpha.1",
 ]
 
 [[package]]
@@ -1947,9 +1982,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.9.0-alpha.0"
+version = "0.9.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b962254c1392bbfc8571c17acb5d0e52116bbefd704e965e92e6c60fadc096e"
+checksum = "cc89dffba8377c5ec847d12bb41492bda235dba31a25e8b695cd0fe6589eb8c9"
 dependencies = [
  "getrandom",
  "zerocopy",
@@ -1966,9 +2001,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1989,9 +2024,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "rfc6979"
@@ -2046,9 +2081,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
  "bitflags",
  "errno",
@@ -2149,14 +2184,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
  "itoa",
  "ryu",
@@ -2270,9 +2305,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "spin"
@@ -2308,9 +2343,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2346,7 +2381,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2428,7 +2463,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2472,9 +2507,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom",
  "serde",
@@ -2529,7 +2564,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
  "wasm-bindgen-shared",
 ]
 
@@ -2563,7 +2598,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2729,7 +2764,7 @@ checksum = "7ad00f6c9436d25c9225ed0fd8eea27e6d2886c1387bf934afdf91e9131b8b77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2760,7 +2795,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2802,27 +2837,27 @@ checksum = "42bfd190a07ca8cfde7cd4c52b3ac463803dc07323db8c34daa697e86365978c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.0-alpha.5"
+version = "0.8.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd4a4b5a6b38e736bca19abe211abf0ba2552462555fc960d763fbbaff2b191"
+checksum = "db678a6ee512bd06adf35c35be471cae2f9c82a5aed2b5d15e03628c98bddd57"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.0-alpha.5"
+version = "0.8.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "157bd6b2f5a6f8e2b1b1e5b427aec8d2c085f9ab99c92eaa0ca79b9b84c11254"
+checksum = "201585ea96d37ee69f2ac769925ca57160cef31acb137c16f38b02b76f4c1e62"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2842,5 +2877,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.55",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index eff6de25..ff826fdb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,8 +57,10 @@ hmac-sha512 = { version = "1.1", features = ["sha384"] }
 rsa = "0.9"
 bcrypt = "0.15"
 flate2 = { version = "1.0", features = ["zlib"] }
-rand = { version = "0.9.0-alpha.0", default-features = false, features = ["small_rng"] }
+rand = { version = "0.9.0-alpha.0", features = ["small_rng"] }
 rand_chacha = "0.9.0-alpha.0"
+argon2 = "0.5"
+password-hash = "0.5"
 
 # asn1
 asn1-parser = { path = "./crates/asn1-parser", features = ["std"] }
@@ -66,4 +68,4 @@ oid = { version = "0.2", default-features = false }
 paste = "1.0"
 
 # diff
-similar = { version = "2.4", features = ["serde"] }
\ No newline at end of file
+similar = { version = "2.4", features = ["serde"] }
diff --git a/README.md b/README.md
index 09e30e9d..73327072 100644
--- a/README.md
+++ b/README.md
@@ -8,16 +8,17 @@ 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.
 
@@ -25,6 +26,8 @@ All computations are performed on the client side. This tool never sends the dat
 
 * Written in [Rust](https://github.com/rust-lang/rust) :crab: using [yew](https://github.com/yewstack/yew) :sparkles:
 * `MD5`
+* `Argon2`
+* `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 +58,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.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 8336e05b..e89a6138 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.76.0"
+channel = "1.77.0"
 components = [ "rustfmt", "clippy" ]
diff --git a/src/about.rs b/src/about.rs
index 8ac328ba..f6557100 100644
--- a/src/about.rs
+++ b/src/about.rs
@@ -7,6 +7,8 @@ pub fn about() -> Html {
             <span>{"Crypto-helper"}</span>
             <span>{"The crypto-helper is an online app that helps to work with the diferent crypto algorithms:"}</span>
             <ul>
+                <li>{"Argon2"}</li>
+                <li>{"BCrypt"}</li>
                 <li>{"MD5"}</li>
                 <li>{"SHA1/SHA256/SHA384/SHA512"}</li>
                 <li>{"Kerberos ciphers: AES128-CTS-HMAC-SHA1-96/AES256-CTS-HMAC-SHA1-96"}</li>
diff --git a/src/crypto_helper.rs b/src/crypto_helper.rs
index a2690399..d84e33fb 100644
--- a/src/crypto_helper.rs
+++ b/src/crypto_helper.rs
@@ -16,7 +16,7 @@ use yew::{function_component, html, use_effect_with, use_state, Callback, Html};
 use yew_hooks::{use_clipboard, use_local_storage, 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_argon2, process_krb_cipher, process_krb_hmac, process_rsa, process_zlib};
 use crate::crypto_helper::computations::process_bcrypt;
 use crate::url_query_params::generate_crypto_helper_link;
 
@@ -40,6 +40,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),
     }
 }
 
diff --git a/src/crypto_helper/algorithm.rs b/src/crypto_helper/algorithm.rs
index a3397240..f1b873fc 100644
--- a/src/crypto_helper/algorithm.rs
+++ b/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];
 
@@ -336,7 +338,6 @@ pub enum ZlibMode {
     Compress,
     Decompress,
 }
-
 impl From<ZlibMode> for bool {
     fn from(mode: ZlibMode) -> Self {
         match mode {
@@ -362,6 +363,174 @@ pub struct ZlibInput {
     pub data: Vec<u8>,
 }
 
+#[derive(Eq, Clone, Copy, PartialEq, Debug, Serialize, Deserialize, Default)]
+pub enum Argon2Variant {
+    Argon2i,
+    Argon2d,
+    #[default]
+    Argon2id,
+}
+
+#[derive(Eq, Clone, Copy, PartialEq, Debug, Serialize, Deserialize, Default)]
+pub enum Argon2Version {
+    Version10,
+    #[default]
+    Version13,
+}
+
+#[derive(Eq, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct Argon2HashAction {
+    pub memory: u32,
+    pub iters: u32,
+    pub paralelism: u32,
+    pub output_len: usize,
+    #[serde(serialize_with = "serialize_bytes", deserialize_with = "deserialize_bytes")]
+    pub salt: Vec<u8>,
+    #[serde(serialize_with = "serialize_bytes", deserialize_with = "deserialize_bytes")]
+    pub secret: Vec<u8>,
+    pub variant: Argon2Variant,
+    pub version: Argon2Version,
+}
+
+#[derive(Eq, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub enum Argon2Action {
+    Hash(Argon2HashAction),
+    Verify(#[serde(serialize_with = "serialize_bytes", deserialize_with = "deserialize_bytes")] Vec<u8>),
+}
+
+#[derive(Eq, Clone, PartialEq, Debug, Serialize, Deserialize, Default)]
+pub struct Argon2Input {
+    pub action: Argon2Action,
+    #[serde(serialize_with = "serialize_bytes", deserialize_with = "deserialize_bytes")]
+    pub data: Vec<u8>,
+}
+
+#[non_exhaustive]
+#[derive(Eq, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub enum Argon2Error<'a> {
+    InvalidVersion(&'a str),
+    InvalidVariant(&'a str),
+}
+
+impl<'a> std::fmt::Display for Argon2Error<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::InvalidVersion(version) => write!(f, "InvalidVersion({version})"),
+            Self::InvalidVariant(variant) => write!(f, "InvalidVariant({variant})"),
+        }
+    }
+}
+impl<'a> std::error::Error for Argon2Error<'a> {}
+
+impl Argon2Input {
+    pub fn with_variant(&self, variant: Argon2Variant) -> Self {
+        let mut input = self.clone();
+        if let Argon2Action::Hash(ref mut action) = input.action {
+            action.variant = variant;
+        }
+        input
+    }
+
+    pub fn with_version(&self, version: Argon2Version) -> Self {
+        let mut input = self.clone();
+        if let Argon2Action::Hash(ref mut action) = input.action {
+            action.version = version;
+        }
+        input
+    }
+}
+impl<'a> TryFrom<&'a str> for Argon2Version {
+    type Error = Argon2Error<'a>;
+
+    fn try_from(value: &'a str) -> Result<Self, Self::Error> {
+        match value {
+            "Argon13" => Ok(Self::Version13),
+            "Argon10" => Ok(Self::Version10),
+            invalid => Err(Argon2Error::InvalidVersion(invalid)),
+        }
+    }
+}
+impl From<Argon2Variant> for argon2::Algorithm {
+    fn from(value: Argon2Variant) -> Self {
+        match value {
+            Argon2Variant::Argon2d => argon2::Algorithm::Argon2d,
+            Argon2Variant::Argon2i => argon2::Algorithm::Argon2i,
+            Argon2Variant::Argon2id => argon2::Algorithm::Argon2id,
+        }
+    }
+}
+impl<'a> TryFrom<&'a str> for Argon2Variant {
+    type Error = Argon2Error<'a>;
+    fn try_from(value: &'a str) -> Result<Self, Self::Error> {
+        match value {
+            "Argon2i" => Ok(Self::Argon2i),
+            "Argon2d" => Ok(Self::Argon2d),
+            "Argon2id" => Ok(Self::Argon2id),
+            invalid => Err(Argon2Error::InvalidVariant(invalid)),
+        }
+    }
+}
+
+impl From<Argon2Version> for argon2::Version {
+    fn from(value: Argon2Version) -> Self {
+        match value {
+            Argon2Version::Version10 => argon2::Version::V0x10,
+            Argon2Version::Version13 => argon2::Version::V0x13,
+        }
+    }
+}
+
+impl From<&Argon2HashAction> for argon2::Params {
+    fn from(value: &Argon2HashAction) -> Self {
+        argon2::ParamsBuilder::new()
+            .m_cost(value.memory)
+            .p_cost(value.paralelism)
+            .t_cost(value.iters)
+            .build()
+            .expect("argon2::ParamsBuilder should never fail")
+    }
+}
+
+impl Default for Argon2HashAction {
+    fn default() -> Self {
+        use argon2::Params;
+        Self {
+            memory: Params::DEFAULT_M_COST,
+            iters: Params::DEFAULT_T_COST,
+            paralelism: Params::DEFAULT_P_COST,
+            output_len: Params::DEFAULT_OUTPUT_LEN,
+            salt: Default::default(),
+            secret: Default::default(),
+            variant: Default::default(),
+            version: Default::default(),
+        }
+    }
+}
+
+impl Default for Argon2Action {
+    fn default() -> Self {
+        Self::Hash(Argon2HashAction::default())
+    }
+}
+
+impl From<bool> for Argon2Action {
+    fn from(value: bool) -> Self {
+        match value {
+            true => Argon2Action::Verify(Default::default()),
+            false => Argon2Action::Hash(Default::default()),
+        }
+    }
+}
+
+impl From<&Argon2Action> for bool {
+    fn from(value: &Argon2Action) -> Self {
+        match value {
+            Argon2Action::Verify(_) => true,
+            Argon2Action::Hash(_) => false,
+        }
+    }
+}
+
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub enum Algorithm {
@@ -382,6 +551,7 @@ pub enum Algorithm {
     Rsa(RsaInput),
     Bcrypt(BcryptInput),
     Zlib(ZlibInput),
+    Argon2(Argon2Input),
 }
 
 impl TryFrom<&str> for Algorithm {
@@ -412,6 +582,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 +608,7 @@ impl From<&Algorithm> for &str {
             Algorithm::Rsa(_) => RSA,
             Algorithm::Bcrypt(_) => BCRYPT,
             Algorithm::Zlib(_) => ZLIB,
+            Algorithm::Argon2(_) => ARGON2,
         }
     }
 }
diff --git a/src/crypto_helper/computations.rs b/src/crypto_helper/computations.rs
index d591e445..bd4ec1df 100644
--- a/src/crypto_helper/computations.rs
+++ b/src/crypto_helper/computations.rs
@@ -1,6 +1,8 @@
 use std::convert::TryInto;
 use std::io::Write;
 
+use argon2::{PasswordHasher, PasswordVerifier};
+use base64::Engine;
 use bcrypt::Version;
 use flate2::write::{ZlibDecoder, ZlibEncoder};
 use flate2::Compression;
@@ -10,7 +12,8 @@ use rsa::rand_core::OsRng;
 use rsa::Pkcs1v15Encrypt;
 
 use super::algorithm::{
-    BcryptAction, BcryptInput, KrbInput, KrbInputData, KrbMode, RsaAction, RsaInput, ZlibInput, ZlibMode,
+    Argon2Action, Argon2Input, BcryptAction, BcryptInput, KrbInput, KrbInputData, KrbMode, RsaAction, RsaInput,
+    ZlibInput, ZlibMode,
 };
 
 pub fn process_rsa(input: &RsaInput) -> Result<Vec<u8>, String> {
@@ -91,3 +94,41 @@ pub fn process_zlib(input: &ZlibInput) -> Result<Vec<u8>, String> {
         }
     }
 }
+
+pub fn process_argon2(input: &Argon2Input) -> Result<Vec<u8>, String> {
+    match &input.action {
+        Argon2Action::Hash(hash_action) => {
+            let argon2ctx = argon2::Argon2::new(
+                hash_action.variant.into(),
+                hash_action.version.into(),
+                hash_action.into(),
+            );
+
+            let salt = if hash_action.salt.is_empty() {
+                password_hash::SaltString::generate(OsRng)
+            } else {
+                password_hash::SaltString::from_b64(
+                    &base64::engine::general_purpose::STANDARD_NO_PAD.encode(&hash_action.salt),
+                )
+                .map_err(|e| e.to_string())?
+            };
+
+            let hash = argon2ctx
+                .hash_password(&input.data, salt.as_salt())
+                .map_err(|err| err.to_string())?
+                .to_string();
+
+            Ok(hash.into_bytes())
+        }
+        Argon2Action::Verify(data) => {
+            let str = String::from_utf8(data.clone()).map_err(|e| e.to_string())?;
+            let hash = argon2::PasswordHash::new(&str).map_err(|e| e.to_string())?;
+
+            if argon2::Argon2::default().verify_password(&input.data, &hash).is_ok() {
+                Ok(vec![1])
+            } else {
+                Ok(vec![0])
+            }
+        }
+    }
+}
diff --git a/src/crypto_helper/info.rs b/src/crypto_helper/info.rs
index 22db9bb0..71231bc3 100644
--- a/src/crypto_helper/info.rs
+++ b/src/crypto_helper/info.rs
@@ -73,6 +73,11 @@ 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."}
+            <a href="https://www.rfc-editor.org/rfc/inline-errata/rfc9106.html">{"RFC"}</a>
+            </span>
+        },
     }
 }
 
diff --git a/src/crypto_helper/input.rs b/src/crypto_helper/input.rs
index 33d189d1..d9ebff9d 100644
--- a/src/crypto_helper/input.rs
+++ b/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))),
+        ),
     }
 }
 
diff --git a/src/crypto_helper/input/argon2.rs b/src/crypto_helper/input/argon2.rs
new file mode 100644
index 00000000..15171bfe
--- /dev/null
+++ b/src/crypto_helper/input/argon2.rs
@@ -0,0 +1,119 @@
+use web_sys::HtmlInputElement;
+use yew::html::TargetCast;
+use yew::{classes, function_component, html, Callback, Html, Properties};
+
+use crate::common::{build_byte_input, BytesFormat, Switch};
+use crate::crypto_helper::algorithm::{Argon2Action, Argon2HashAction, Argon2Input as Argon2InputData};
+
+#[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 input_setter = props.argon2_input_setter.clone();
+    let action: Argon2Action = props.input.action.clone();
+    let setter = Callback::from(move |data| {
+        input_setter.emit(Argon2InputData {
+            action: action.clone(),
+            data,
+        })
+    });
+
+    let data: Vec<u8> = props.input.data.clone();
+    let input_setter = props.argon2_input_setter.clone();
+    let action: Argon2Action = props.input.action.clone();
+
+    let salt_setter = Callback::from(move |salt| {
+        if let Argon2Action::Hash(hash_action) = action.clone() {
+            input_setter.emit(Argon2InputData {
+                action: Argon2Action::Hash(Argon2HashAction { salt, ..hash_action }),
+                data: data.clone(),
+            })
+        }
+    });
+
+    let data: Vec<u8> = props.input.data.clone();
+    let input_setter = props.argon2_input_setter.clone();
+    let action: Argon2Action = props.input.action.clone();
+
+    let hash_setter = Callback::from(move |hash: Vec<u8>| {
+        if let Argon2Action::Verify(_) = action.clone() {
+            input_setter.emit(Argon2InputData {
+                action: Argon2Action::Verify(hash),
+                data: data.clone(),
+            })
+        }
+    });
+
+    let input_setter = props.argon2_input_setter.clone();
+    let input = props.input.clone();
+    let on_hash_verify_switch = Callback::from(move |mode: bool| {
+        let Argon2InputData { data, .. } = input.clone();
+        input_setter.emit(Argon2InputData {
+            action: mode.into(),
+            data,
+        })
+    });
+    let hash_verify_switch_state = bool::from(&props.input.action);
+
+    let input_setter = props.argon2_input_setter.clone();
+    let input = props.input.clone();
+
+    let set_version = move |event: yew::html::onchange::Event| {
+        let html_element: HtmlInputElement = event.target_unchecked_into();
+        let input = input.with_version(html_element.value().as_str().try_into().unwrap());
+        input_setter.emit(input.clone());
+    };
+
+    let input_setter = props.argon2_input_setter.clone();
+    let input = props.input.clone();
+
+    let set_variant = move |event: yew::html::onchange::Event| {
+        let html_element: HtmlInputElement = event.target_unchecked_into();
+        let input = input.with_variant(html_element.value().as_str().try_into().unwrap());
+        input_setter.emit(input.clone());
+    };
+
+    let data: Vec<u8> = props.input.data.clone();
+    html! {
+        <div class={classes!("wide-input", "vertical")}>
+            <div class="horizontal">
+                <span class="total">{"hash"}</span>
+                <Switch id={"switch".to_string()} setter={on_hash_verify_switch} state={hash_verify_switch_state}/>
+                <span class="total">{"verify"}</span>
+            </div>
+            {build_byte_input(data, setter, Some(BytesFormat::Ascii), Some("password".into()))}
+            {match &props.input.action {
+                Argon2Action::Hash(hash_action) => html! {
+                    <div class="vertical">
+                        {build_byte_input(hash_action.salt.clone(), salt_setter, Some(BytesFormat::Ascii), Some("salt".into()))}
+                        <div class="horizontal">
+                            <select onchange={set_version} class="base-input">
+                                <option value="Argon10">{"Argon10"}</option>
+                                <option value="Argon13">{"Argon13"}</option>
+                            </select>
+                            <select onchange={set_variant} class="base-input">
+                                <option value="Argon2i">{"Argon2i"}</option>
+                                <option value="Argon2d">{"Argon2d"}</option>
+                                <option value="Argon2id">{"Argon2id"}</option>
+                            </select>
+                        </div>
+                    </div>
+                },
+                Argon2Action::Verify(hash) => html! {
+                    <>
+                        {build_byte_input(hash.clone(), hash_setter, Some(BytesFormat::Ascii), Some("hash".into()))}
+                    </>
+                }}}
+        </div>
+    }
+}
+
+pub fn build_argon2_input(input: Argon2InputData, setter: Callback<Argon2InputData>) -> Html {
+    html! {
+        <Argon2Input input={input} argon2_input_setter={setter}/>
+    }
+}
diff --git a/src/crypto_helper/output.rs b/src/crypto_helper/output.rs
index 095b2e38..9e2e57ce 100644
--- a/src/crypto_helper/output.rs
+++ b/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),
     }
 }