From 1ef652bb8ed3a9b5caa8c1e037e0fe6ef518bc17 Mon Sep 17 00:00:00 2001 From: Pavlo Myroniuk Date: Tue, 12 Aug 2025 23:45:15 +0300 Subject: [PATCH 1/2] chore: Rust 2024; --- Cargo.lock | 706 +++++++++++------- Cargo.toml | 2 +- crates/asn1-parser/Cargo.toml | 2 +- crates/asn1-parser/src/primitives/boolean.rs | 2 +- .../asn1-parser/src/primitives/enumerated.rs | 6 +- crates/asn1-parser/src/primitives/integer.rs | 6 +- .../asn1-parser/src/time/generalized_time.rs | 2 +- crates/asn1-parser/src/time/mod.rs | 2 +- crates/asn1-parser/src/time/utc_time.rs | 4 +- crates/asn1-parser/src/tlv.rs | 4 +- crates/prop-strategies/Cargo.toml | 2 +- rust-toolchain.toml | 2 +- src/about.rs | 2 +- src/asn1/asn1_viewer.rs | 4 +- src/asn1/hex_view.rs | 6 +- src/asn1/mod.rs | 26 +- src/asn1/node_options.rs | 4 +- src/asn1/scheme/mod.rs | 4 +- src/asn1/scheme/oid.rs | 327 ++++++-- src/asn1/scheme/primitive.rs | 2 +- src/asn1/scheme/sequence.rs | 4 +- src/asn1/scheme/set.rs | 4 +- src/asn1/scheme/strings.rs | 4 +- src/asn1/scheme/tag.rs | 4 +- src/asn1/scheme/time.rs | 2 +- src/bin/main.rs | 4 +- src/bin/worker.rs | 4 +- src/common/byte_input.rs | 4 +- src/common/bytes_viewer.rs | 4 +- src/common/checkbox.rs | 2 +- src/common/loader.rs | 2 +- src/common/mod.rs | 2 +- src/common/simple_output.rs | 4 +- src/common/switch.rs | 2 +- src/common/table.rs | 4 +- src/crypto_helper/algorithm.rs | 6 +- src/crypto_helper/computations.rs | 4 +- src/crypto_helper/info/algo_search.rs | 14 +- src/crypto_helper/info/mod.rs | 2 +- src/crypto_helper/input/argon2.rs | 4 +- src/crypto_helper/input/bcrypt.rs | 6 +- src/crypto_helper/input/hmac_sha.rs | 6 +- src/crypto_helper/input/krb.rs | 8 +- src/crypto_helper/input/mod.rs | 4 +- src/crypto_helper/input/rsa.rs | 6 +- src/crypto_helper/input/zlib.rs | 4 +- src/crypto_helper/mod.rs | 6 +- src/crypto_helper/output/krb.rs | 2 +- src/crypto_helper/output/mod.rs | 6 +- src/diff/diff_viewer.rs | 2 +- src/diff/mod.rs | 12 +- src/diff/task.rs | 4 +- src/footer.rs | 2 +- src/header.rs | 2 +- src/jwt/jwt/editor.rs | 14 +- src/jwt/jwt/viewer.rs | 4 +- src/jwt/jwt_utils.rs | 10 +- src/jwt/mod.rs | 4 +- src/lib.rs | 2 +- src/not_found.rs | 2 +- src/serde.rs | 2 +- src/utils.rs | 2 +- 62 files changed, 820 insertions(+), 485 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aef423dc..a445ac69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aes" @@ -39,9 +39,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" dependencies = [ "anstyle", "anstyle-parse", @@ -54,37 +54,37 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" dependencies = [ - "windows-sys", + "windows-sys 0.60.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" dependencies = [ "anstyle", - "once_cell", - "windows-sys", + "once_cell_polyfill", + "windows-sys 0.60.2", ] [[package]] @@ -122,15 +122,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -138,7 +138,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -161,9 +161,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bcrypt" @@ -173,7 +173,7 @@ checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" dependencies = [ "base64 0.22.1", "blowfish", - "getrandom", + "getrandom 0.2.16", "subtle", "zeroize", ] @@ -204,9 +204,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "blake2" @@ -228,9 +228,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.11.0-rc.3" +version = "0.11.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd016a0ddc7cb13661bf5576073ce07330a693f8608a1320b4e20561cc12cdc" +checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94" dependencies = [ "hybrid-array", ] @@ -262,9 +262,9 @@ checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -274,9 +274,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cbc" @@ -289,18 +289,18 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.10" +version = "1.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e" dependencies = [ "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "cipher" @@ -314,9 +314,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "console_error_panic_hook" @@ -336,24 +336,24 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-oid" -version = "0.10.0-rc.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ff6be19477a1bd5441f382916a89bc2a0b2c35db6d41e0f6e8538bf6d6463f" +checksum = "0dabb6555f92fb9ee4140454eb5dcd14c7960e1225c6d1a6cc361f032947713e" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -391,13 +391,11 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.1" +version = "0.2.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b8ce8218c97789f16356e7896b3714f26c2ee1079b79c0b7ae7064bb9089fa" +checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be" dependencies = [ - "getrandom", "hybrid-array", - "rand_core 0.6.4", ] [[package]] @@ -419,13 +417,13 @@ dependencies = [ "paste", "picky", "picky-krb", - "rand 0.9.0-beta.3", - "rand_chacha 0.9.0-beta.1", + "rand 0.9.2", + "rand_chacha 0.9.0", "rsa", "serde", "serde_json", "serde_qs", - "sha1 0.11.0-pre.4", + "sha1 0.11.0-rc.0", "sha2", "similar", "time", @@ -465,14 +463,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] name = "der" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid 0.9.6", "pem-rfc7468", @@ -481,9 +479,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] @@ -511,13 +509,13 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-pre.9" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379" +checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b" dependencies = [ - "block-buffer 0.11.0-rc.3", - "const-oid 0.10.0-rc.3", - "crypto-common 0.2.0-rc.1", + "block-buffer 0.11.0-rc.4", + "const-oid 0.10.1", + "crypto-common 0.2.0-rc.3", ] [[package]] @@ -546,9 +544,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek", "ed25519", @@ -592,31 +590,31 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.60.2", ] [[package]] @@ -627,9 +625,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "ff" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ "rand_core 0.6.4", "subtle", @@ -643,9 +641,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" dependencies = [ "crc32fast", "libz-sys", @@ -723,7 +721,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] @@ -769,17 +767,29 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.1+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + [[package]] name = "gimli" version = "0.31.1" @@ -956,7 +966,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "903f432be5ba34427eac5e16048ef65604a82061fe93789f2212afc73d8617d6" dependencies = [ - "getrandom", + "getrandom 0.2.16", "gloo-events 0.2.0", "gloo-utils 0.2.0", "serde", @@ -1192,7 +1202,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] @@ -1208,15 +1218,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -1253,17 +1263,11 @@ dependencies = [ "itoa", ] -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hybrid-array" -version = "0.2.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d35805454dc9f8662a98d6d61886ffe26bd465f5960e0e55345c70d5c0d2a9" +checksum = "891d15931895091dea5c47afa5b3c9a01ba634b311919fd4d41388fa0e3d76af" dependencies = [ "typenum", ] @@ -1280,19 +1284,19 @@ dependencies = [ [[package]] name = "implicit-clone-derive" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b" +checksum = "699c1b6d335e63d0ba5c1e1c7f647371ce989c3bcbe1f7ed2b85fa56e3bd1a21" dependencies = [ "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] name = "indexmap" -version = "2.7.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown", @@ -1300,14 +1304,25 @@ dependencies = [ [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ "block-padding", "generic-array", ] +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags", + "cfg-if", + "libc", +] + [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -1316,9 +1331,33 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] [[package]] name = "js-sys" @@ -1350,21 +1389,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libm" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libz-sys" -version = "1.1.21" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" dependencies = [ "cc", "pkg-config", @@ -1373,15 +1412,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "log" -version = "0.4.25" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" @@ -1410,19 +1449,30 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] +[[package]] +name = "mio" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1489,9 +1539,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ "hermit-abi", "libc", @@ -1526,9 +1576,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "overload" @@ -1550,9 +1606,9 @@ dependencies = [ [[package]] name = "p384" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" dependencies = [ "ecdsa", "elliptic-curve", @@ -1632,9 +1688,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "picky" -version = "7.0.0-rc.12" +version = "7.0.0-rc.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11f32016338b5bdb81179ec286a7d466041c27c5d45810da090c08ae451925" +checksum = "7ed0f61c4ac11274678ad0da95386c6216d6ff898ef98e54aac23d4a853c324c" dependencies = [ "base64 0.22.1", "digest 0.10.7", @@ -1647,7 +1703,7 @@ dependencies = [ "p521", "picky-asn1 0.10.1", "picky-asn1-der 0.5.2", - "picky-asn1-x509 0.14.3", + "picky-asn1-x509 0.14.5", "rand 0.8.5", "rand_core 0.6.4", "rsa", @@ -1717,9 +1773,9 @@ dependencies = [ [[package]] name = "picky-asn1-x509" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511c46b93e7f08571a375882879d3a468dfe8793d73249907b2e3332950cb33e" +checksum = "5444990fc9e53de47353c95e6521a5f669676da986a10482ff3708bdaa1a2a4b" dependencies = [ "base64 0.22.1", "num-bigint-dig", @@ -1756,22 +1812,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.8" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.8" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] @@ -1820,9 +1876,24 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] [[package]] name = "powerfmt" @@ -1832,21 +1903,21 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.7.35", + "zerocopy", ] [[package]] name = "prettyplease" -version = "0.2.29" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" +checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" dependencies = [ "proc-macro2", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] @@ -1894,9 +1965,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1" dependencies = [ "unicode-ident", ] @@ -1929,17 +2000,17 @@ dependencies = [ [[package]] name = "proptest" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" dependencies = [ "bit-set", "bit-vec", "bitflags", "lazy_static", "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand 0.9.2", + "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax 0.8.5", "rusty-fork", @@ -1955,13 +2026,19 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" version = "0.8.5" @@ -1975,12 +2052,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0-beta.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fccbfebb3972a41a31c605a59207d9fba5489b9a87d9d87024cb6df73a32ec7" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "rand_core 0.9.0-beta.1", - "zerocopy 0.8.14", + "rand_chacha 0.9.0", + "rand_core 0.9.3", ] [[package]] @@ -1995,12 +2072,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.9.0-beta.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16da77124f4ee9fabd55ce6540866e9101431863b4876de58b68797f331adf2" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.0-beta.1", + "rand_core 0.9.3", ] [[package]] @@ -2009,25 +2086,25 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.16", ] [[package]] name = "rand_core" -version = "0.9.0-beta.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98fa0b8309344136abe6244130311e76997e546f76fae8054422a7539b43df7" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "zerocopy 0.8.14", + "getrandom 0.3.3", ] [[package]] name = "rand_xorshift" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" dependencies = [ - "rand_core 0.6.4", + "rand_core 0.9.3", ] [[package]] @@ -2092,9 +2169,9 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" [[package]] name = "rsa" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" dependencies = [ "const-oid 0.9.6", "digest 0.10.7", @@ -2112,9 +2189,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustc_version" @@ -2127,22 +2204,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.43" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.60.2", ] [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rusty-fork" @@ -2158,9 +2235,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "sec1" @@ -2178,15 +2255,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -2215,29 +2292,29 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.15" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" dependencies = [ "itoa", "memchr", @@ -2292,20 +2369,20 @@ dependencies = [ [[package]] name = "sha1" -version = "0.11.0-pre.4" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9540978cef7a8498211c1b1c14e5ce920fe5bd524ea84f4a3d72d4602515ae93" +checksum = "6f9318facddf9ac32a33527066936837e189b3f23ced6edc1603720ead5e2b3d" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-pre.9", + "digest 0.11.0-rc.0", ] [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -2349,27 +2426,24 @@ dependencies = [ [[package]] name = "similar" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" dependencies = [ "serde", ] [[package]] name = "slab" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "spin" @@ -2405,9 +2479,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.96" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", @@ -2416,16 +2490,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.15.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ - "cfg-if", "fastrand", - "getrandom", + "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -2445,24 +2518,23 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] [[package]] name = "time" -version = "0.3.37" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "js-sys", @@ -2476,18 +2548,22 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "tokio" -version = "1.43.0" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", + "io-uring", + "libc", + "mio", "pin-project-lite", + "slab", ] [[package]] @@ -2503,9 +2579,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" [[package]] name = "toml_edit" @@ -2531,20 +2607,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] @@ -2580,9 +2656,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unarray" @@ -2592,9 +2668,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "urlencoding" @@ -2610,11 +2686,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.12.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" +checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be" dependencies = [ - "getrandom", + "getrandom 0.3.3", + "js-sys", "serde", "wasm-bindgen", ] @@ -2633,18 +2710,27 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wait-timeout" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" dependencies = [ "libc", ] [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "wasm-bindgen" @@ -2668,7 +2754,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", "wasm-bindgen-shared", ] @@ -2703,7 +2789,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2749,13 +2835,28 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + [[package]] name = "windows-sys" version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.3", ] [[package]] @@ -2764,14 +2865,31 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", ] [[package]] @@ -2780,48 +2898,96 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.5.40" @@ -2831,6 +2997,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + [[package]] name = "x25519-dalek" version = "2.0.1" @@ -2890,14 +3065,14 @@ checksum = "7ad00f6c9436d25c9225ed0fd8eea27e6d2886c1387bf934afdf91e9131b8b77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] name = "yew-hooks" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4a023bfdcec05c9a0f6fd84f0caff8869fed4b0b73ba06e9418c8e45ce7ca5" +checksum = "640157ac2d80cf6bf5e7fe4143b90cd6c9ef61c9cb6180f60a50c3074521a142" dependencies = [ "gloo 0.11.0", "js-sys", @@ -2921,7 +3096,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] @@ -2964,48 +3139,27 @@ checksum = "42bfd190a07ca8cfde7cd4c52b3ac463803dc07323db8c34daa697e86365978c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive 0.7.35", + "syn 2.0.104", ] [[package]] name = "zerocopy" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" -dependencies = [ - "zerocopy-derive 0.8.14", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.14" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] [[package]] @@ -3025,5 +3179,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.104", ] diff --git a/Cargo.toml b/Cargo.toml index 05a53d9a..08d88131 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "crypto-helper" version = "0.15.0" description = "The crypto-helper is an online app that helps to work with the diferent crypto algorithms." -edition = "2021" +edition = "2024" authors = ["Pavlo Myroniuk "] readme = "README.md" license-file = "LICENSE" diff --git a/crates/asn1-parser/Cargo.toml b/crates/asn1-parser/Cargo.toml index 72bd7999..60e4fcea 100644 --- a/crates/asn1-parser/Cargo.toml +++ b/crates/asn1-parser/Cargo.toml @@ -2,7 +2,7 @@ name = "asn1-parser" description = "This `asn1` parser is aimed to parse input bytes and return an AST as the result." version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Pavlo Myroniuk "] readme = "README.md" license-file = "../../LICENSE" diff --git a/crates/asn1-parser/src/primitives/boolean.rs b/crates/asn1-parser/src/primitives/boolean.rs index 86fb4830..fbaec110 100644 --- a/crates/asn1-parser/src/primitives/boolean.rs +++ b/crates/asn1-parser/src/primitives/boolean.rs @@ -44,7 +44,7 @@ impl<'data> Asn1ValueDecoder<'data> for Bool { } else if data.len() == 1 { Ok(Bool::from_byte(data[0])) } else { - return Err(Error::from("Bool data len should be equal to 1")); + Err(Error::from("Bool data len should be equal to 1")) } } diff --git a/crates/asn1-parser/src/primitives/enumerated.rs b/crates/asn1-parser/src/primitives/enumerated.rs index 88218eee..dfb558be 100644 --- a/crates/asn1-parser/src/primitives/enumerated.rs +++ b/crates/asn1-parser/src/primitives/enumerated.rs @@ -22,11 +22,7 @@ impl Enumerated<'_> { pub fn as_big_uint(&self) -> BigUint { BigUint::from_bytes_be(if self.0.len() > 1 { - if self.0[0] == 0x00 { - &self.0[1..] - } else { - &self.0 - } + if self.0[0] == 0x00 { &self.0[1..] } else { &self.0 } } else if self.0.is_empty() { &[0] } else { diff --git a/crates/asn1-parser/src/primitives/integer.rs b/crates/asn1-parser/src/primitives/integer.rs index 77ef6ff8..b56f0e2d 100644 --- a/crates/asn1-parser/src/primitives/integer.rs +++ b/crates/asn1-parser/src/primitives/integer.rs @@ -22,11 +22,7 @@ impl Integer<'_> { pub fn as_big_uint(&self) -> BigUint { BigUint::from_bytes_be(if self.0.len() > 1 { - if self.0[0] == 0x00 { - &self.0[1..] - } else { - &self.0 - } + if self.0[0] == 0x00 { &self.0[1..] } else { &self.0 } } else if self.0.is_empty() { &[0] } else { diff --git a/crates/asn1-parser/src/time/generalized_time.rs b/crates/asn1-parser/src/time/generalized_time.rs index 5f710f97..269bcba5 100644 --- a/crates/asn1-parser/src/time/generalized_time.rs +++ b/crates/asn1-parser/src/time/generalized_time.rs @@ -5,7 +5,7 @@ use core::str::from_utf8; #[cfg(not(feature = "std"))] use num_traits::float::FloatCore; -use super::{read_number, Day, Hour, Minute, Month}; +use super::{Day, Hour, Minute, Month, read_number}; use crate::length::{len_size, write_len}; use crate::reader::Reader; use crate::writer::Writer; diff --git a/crates/asn1-parser/src/time/mod.rs b/crates/asn1-parser/src/time/mod.rs index 321b2a22..c8bc2679 100644 --- a/crates/asn1-parser/src/time/mod.rs +++ b/crates/asn1-parser/src/time/mod.rs @@ -4,8 +4,8 @@ mod utc_time; pub use generalized_time::GeneralizedTime; pub use utc_time::UtcTime; -use crate::reader::Reader; use crate::Asn1Result; +use crate::reader::Reader; macro_rules! define_nt { ($name:ident) => { diff --git a/crates/asn1-parser/src/time/utc_time.rs b/crates/asn1-parser/src/time/utc_time.rs index 1908a6da..b1ed81d5 100644 --- a/crates/asn1-parser/src/time/utc_time.rs +++ b/crates/asn1-parser/src/time/utc_time.rs @@ -1,6 +1,6 @@ use alloc::format; -use super::{read_number, Day, Hour, Minute, Month, Second, Year}; +use super::{Day, Hour, Minute, Month, Second, Year, read_number}; use crate::length::{len_size, write_len}; use crate::reader::Reader; use crate::writer::Writer; @@ -31,7 +31,7 @@ impl UtcTime { } fn calc_data_len(&self) -> usize { - 2 /* year */ + 2 /* month */ + 2 /* day */ + 2 /* hour */ + 2 /* minute */ + self.second.is_some().then_some(2).unwrap_or_default() + 1 + 2 /* year */ + 2 /* month */ + 2 /* day */ + 2 /* hour */ + 2 /* minute */ + self.second.as_ref().map(|_| 2).unwrap_or_default() + 1 /* 'Z' */ } } diff --git a/crates/asn1-parser/src/tlv.rs b/crates/asn1-parser/src/tlv.rs index 297ccc83..e1604574 100644 --- a/crates/asn1-parser/src/tlv.rs +++ b/crates/asn1-parser/src/tlv.rs @@ -2,7 +2,7 @@ use alloc::borrow::Cow; use alloc::fmt::Debug; use crate::length::read_len; -use crate::reader::{read_data, Reader}; +use crate::reader::{Reader, read_data}; use crate::writer::Writer; use crate::{ Asn1Decoder, Asn1Encoder, Asn1Entity, Asn1Result, Asn1ValueDecoder, MetaInfo, RawAsn1EntityData, Tag, Taggable, @@ -22,7 +22,7 @@ impl Tlv<'_, A> { Tlv { id, meta: raw, asn1 } } - pub fn meta(&self) -> &RawAsn1EntityData { + pub fn meta(&self) -> &RawAsn1EntityData<'_> { &self.meta } diff --git a/crates/prop-strategies/Cargo.toml b/crates/prop-strategies/Cargo.toml index eb653983..4b33e649 100644 --- a/crates/prop-strategies/Cargo.toml +++ b/crates/prop-strategies/Cargo.toml @@ -2,7 +2,7 @@ name = "prop-strategies" description = "This crate contains prop strategies for the asn1-parser crate." version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Pavlo Myroniuk "] readme = "README.md" license-file = "../../LICENSE" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 942a8e85..f018685e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.83" +channel = "1.89" components = [ "rustfmt", "clippy" ] diff --git a/src/about.rs b/src/about.rs index 660470ec..55d91e57 100644 --- a/src/about.rs +++ b/src/about.rs @@ -1,4 +1,4 @@ -use yew::{classes, function_component, html, Html}; +use yew::{Html, classes, function_component, html}; #[function_component(About)] pub fn about() -> Html { diff --git a/src/asn1/asn1_viewer.rs b/src/asn1/asn1_viewer.rs index 474a5af4..ecd22101 100644 --- a/src/asn1/asn1_viewer.rs +++ b/src/asn1/asn1_viewer.rs @@ -1,8 +1,8 @@ use asn1_parser::OwnedAsn1; -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; -use crate::asn1::scheme::build_asn1_schema; use crate::asn1::HighlightAction; +use crate::asn1::scheme::build_asn1_schema; #[derive(PartialEq, Properties, Clone)] pub struct Asn1ViewerProps { diff --git a/src/asn1/hex_view.rs b/src/asn1/hex_view.rs index c38e7206..caa6312a 100644 --- a/src/asn1/hex_view.rs +++ b/src/asn1/hex_view.rs @@ -1,11 +1,11 @@ use asn1_parser::{Asn1, Asn1Entity, Asn1Type, OwnedAsn1, RawAsn1EntityData}; use web_sys::MouseEvent; use yew::virtual_dom::VNode; -use yew::{function_component, html, Callback, Classes, Html, Properties}; +use yew::{Callback, Classes, Html, Properties, function_component, html}; use crate::asn1::node_options::NodeOptions; -use crate::asn1::{compare_ids, HighlightAction}; -use crate::common::{hex_format_byte, RcSlice}; +use crate::asn1::{HighlightAction, compare_ids}; +use crate::common::{RcSlice, hex_format_byte}; #[derive(PartialEq, Properties, Clone)] pub struct HexViewerProps { diff --git a/src/asn1/mod.rs b/src/asn1/mod.rs index 01adbfec..ec6dde84 100644 --- a/src/asn1/mod.rs +++ b/src/asn1/mod.rs @@ -10,13 +10,13 @@ use std::rc::Rc; use asn1_parser::{Asn1, Asn1Decoder, Asn1Encoder}; use web_sys::KeyboardEvent; -use yew::{classes, function_component, html, use_effect_with, use_reducer, use_state, Callback, Html, Reducible}; +use yew::{Callback, Html, Reducible, classes, function_component, html, use_effect_with, use_reducer, use_state}; use yew_hooks::{use_clipboard, use_local_storage, use_location}; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; use crate::asn1::asn1_viewer::Asn1Viewer; use crate::asn1::hex_view::HexViewer; -use crate::common::{encode_bytes, ByteInput, BytesFormat}; +use crate::common::{ByteInput, BytesFormat, encode_bytes}; use crate::url_query_params; use crate::url_query_params::generate_asn1_link; @@ -113,18 +113,18 @@ pub fn asn1_parser_page() -> Html { if query.len() < 2 { // URL query params is empty. We try to load ASN1 from local storage. - if let Some(raw_asn1) = (*local_storage).as_ref() { - if let Ok(bytes) = hex::decode(raw_asn1) { - match Asn1::decode_buff(&bytes) { - Ok(asn1) => { - asn1_setter.set(asn1.to_owned_with_asn1(asn1.inner_asn1().to_owned())); - } - Err(err) => { - error!(?err, "Can not decode asn1."); - } + if let Some(raw_asn1) = (*local_storage).as_ref() + && let Ok(bytes) = hex::decode(raw_asn1) + { + match Asn1::decode_buff(&bytes) { + Ok(asn1) => { + asn1_setter.set(asn1.to_owned_with_asn1(asn1.inner_asn1().to_owned())); + } + Err(err) => { + error!(?err, "Can not decode asn1."); } - raw_asn1_setter.set(bytes); } + raw_asn1_setter.set(bytes); } return; } diff --git a/src/asn1/node_options.rs b/src/asn1/node_options.rs index 6c19b116..d4160735 100644 --- a/src/asn1/node_options.rs +++ b/src/asn1/node_options.rs @@ -1,6 +1,6 @@ -use yew::{function_component, html, use_state, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html, use_state}; use yew_hooks::use_clipboard; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; use crate::common::RcSlice; diff --git a/src/asn1/scheme/mod.rs b/src/asn1/scheme/mod.rs index 0fab7933..3a8fedf1 100644 --- a/src/asn1/scheme/mod.rs +++ b/src/asn1/scheme/mod.rs @@ -9,7 +9,7 @@ mod time; use asn1_parser::{Asn1, Asn1Entity, Asn1Type}; use web_sys::MouseEvent; use yew::virtual_dom::VNode; -use yew::{classes, function_component, html, Callback, Children, Classes, Html, Properties}; +use yew::{Callback, Children, Classes, Html, Properties, classes, function_component, html}; use self::oid::ObjectIdentifierNode; use self::primitive::{BoolNode, EnumeratedNode, IntegerNode, NullNode}; @@ -20,8 +20,8 @@ use self::strings::{ }; use self::tag::{ApplicationTagNode, ExplicitTagNode, ImplicitTagNode}; use self::time::{GeneralizedTimeNode, UtcTimeNode}; -use crate::asn1::scheme::set::SetNode; use crate::asn1::HighlightAction; +use crate::asn1::scheme::set::SetNode; #[derive(PartialEq, Properties, Clone)] pub struct Asn1NodeProps { diff --git a/src/asn1/scheme/oid.rs b/src/asn1/scheme/oid.rs index 8c7e0e89..9f020ed7 100644 --- a/src/asn1/scheme/oid.rs +++ b/src/asn1/scheme/oid.rs @@ -1,5 +1,5 @@ use asn1_parser::{ObjectIdentifier, OwnedRawAsn1EntityData}; -use yew::{function_component, html, Html, Properties}; +use yew::{Html, Properties, function_component, html}; use crate::asn1::node_options::NodeOptions; use crate::common::RcSlice; @@ -41,31 +41,79 @@ fn oid_name(oid: &'_ str) -> (&'static str, &'static str) { "1.2.840.10045.4.3.2" => ("ecdsa-with-SHA256", "http://www.oid-info.com/get/1.2.840.10045.4.3.2"), "1.2.840.10045.4.3.3" => ("ecdsa-with-SHA384", "http://www.oid-info.com/get/1.2.840.10045.4.3.3"), "1.2.840.10045.4.3.4" => ("ecdsa-with-SHA512", "http://www.oid-info.com/get/1.2.840.10045.4.3.4"), - "1.2.840.10045.3.1.1" => ("prime192v1 (secp192r1)", "http://www.oid-info.com/get/1.2.840.10045.3.1.1"), - "1.2.840.10045.3.1.7" => ("prime256v1 (secp256r1)", "http://www.oid-info.com/get/1.2.840.10045.3.1.7"), - "1.2.840.113549.1.1.4" => ("md5WithRSAEncryption", "http://www.oid-info.com/get/1.2.840.113549.1.1.4"), - "1.2.840.113549.1.1.5" => ("sha1-with-rsa-signature", "http://www.oid-info.com/get/1.2.840.113549.1.1.5"), - "1.2.840.113549.1.1.11" => ("sha256-with-rsa-signature", "http://www.oid-info.com/get/1.2.840.113549.1.1.11"), - "1.2.840.113549.1.1.12" => ("sha384-with-rsa-signature", "http://www.oid-info.com/get/1.2.840.113549.1.1.12"), - "1.2.840.113549.1.1.13" => ("sha512-with-rsa-signature", "http://www.oid-info.com/get/1.2.840.113549.1.1.13"), - "1.2.840.113549.1.1.14" => ("sha224-with-rsa-signature", "http://www.oid-info.com/get/1.2.840.113549.1.1.14"), + "1.2.840.10045.3.1.1" => ( + "prime192v1 (secp192r1)", + "http://www.oid-info.com/get/1.2.840.10045.3.1.1", + ), + "1.2.840.10045.3.1.7" => ( + "prime256v1 (secp256r1)", + "http://www.oid-info.com/get/1.2.840.10045.3.1.7", + ), + "1.2.840.113549.1.1.4" => ( + "md5WithRSAEncryption", + "http://www.oid-info.com/get/1.2.840.113549.1.1.4", + ), + "1.2.840.113549.1.1.5" => ( + "sha1-with-rsa-signature", + "http://www.oid-info.com/get/1.2.840.113549.1.1.5", + ), + "1.2.840.113549.1.1.11" => ( + "sha256-with-rsa-signature", + "http://www.oid-info.com/get/1.2.840.113549.1.1.11", + ), + "1.2.840.113549.1.1.12" => ( + "sha384-with-rsa-signature", + "http://www.oid-info.com/get/1.2.840.113549.1.1.12", + ), + "1.2.840.113549.1.1.13" => ( + "sha512-with-rsa-signature", + "http://www.oid-info.com/get/1.2.840.113549.1.1.13", + ), + "1.2.840.113549.1.1.14" => ( + "sha224-with-rsa-signature", + "http://www.oid-info.com/get/1.2.840.113549.1.1.14", + ), "1.2.840.113549.1.1.10" => ("rsassa-pss", "http://www.oid-info.com/get/1.2.840.113549.1.1.10"), - "1.2.840.113549.1.9.1" => ("pkcs-9-at-emailAddress", "http://www.oid-info.com/get/1.2.840.113549.1.9.1"), - "1.2.840.113549.1.9.14" => ("pkcs-9-at-extensionRequest", "http://www.oid-info.com/get/1.2.840.113549.1.9.14"), + "1.2.840.113549.1.9.1" => ( + "pkcs-9-at-emailAddress", + "http://www.oid-info.com/get/1.2.840.113549.1.9.1", + ), + "1.2.840.113549.1.9.14" => ( + "pkcs-9-at-extensionRequest", + "http://www.oid-info.com/get/1.2.840.113549.1.9.14", + ), "1.2.840.113549.1.7.1" => ("id-data", "http://www.oid-info.com/get/1.2.840.113549.1.7.1"), "1.2.840.113549.1.7.6" => ("id-encryptedData", "http://www.oid-info.com/get/1.2.840.113549.1.7.6"), "1.2.840.113549.1.7.2" => ("id-signedData", "http://www.oid-info.com/get/1.2.840.113549.1.7.2"), - "1.2.840.113549.1.9.3" => ("pkcs-9-at-contentType", "http://www.oid-info.com/get/1.2.840.113549.1.9.3"), + "1.2.840.113549.1.9.3" => ( + "pkcs-9-at-contentType", + "http://www.oid-info.com/get/1.2.840.113549.1.9.3", + ), "1.2.840.113549.1.9.4" => ("id-messageDigest", "http://www.oid-info.com/get/1.2.840.113549.1.9.4"), "2.16.840.1.101.3.4.3.1" => ("dsa-with-sha224", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.1"), "2.16.840.1.101.3.4.3.2" => ("dsa-with-sha256", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.2"), "2.16.840.1.101.3.4.3.3" => ("dsa-with-sha384", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.3"), "2.16.840.1.101.3.4.3.4" => ("dsa-with-sha256", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.4"), - "2.16.840.1.101.3.4.3.10" => ("id-ecdsa-with-sha3-256", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.10"), - "2.16.840.1.101.3.4.3.13" => ("id-rsassa-pkcs1-v1-5-with-sha3-224", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.13"), - "2.16.840.1.101.3.4.3.14" => ("id-rsassa-pkcs1-v1-5-with-sha3-256", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.14"), - "2.16.840.1.101.3.4.3.15" => ("id-rsassa-pkcs1-v1-5-with-sha3-384", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.15"), - "2.16.840.1.101.3.4.3.16" => ("id-rsassa-pkcs1-v1-5-with-sha3-512", "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.16"), + "2.16.840.1.101.3.4.3.10" => ( + "id-ecdsa-with-sha3-256", + "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.10", + ), + "2.16.840.1.101.3.4.3.13" => ( + "id-rsassa-pkcs1-v1-5-with-sha3-224", + "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.13", + ), + "2.16.840.1.101.3.4.3.14" => ( + "id-rsassa-pkcs1-v1-5-with-sha3-256", + "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.14", + ), + "2.16.840.1.101.3.4.3.15" => ( + "id-rsassa-pkcs1-v1-5-with-sha3-384", + "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.15", + ), + "2.16.840.1.101.3.4.3.16" => ( + "id-rsassa-pkcs1-v1-5-with-sha3-512", + "http://www.oid-info.com/get/2.16.840.1.101.3.4.3.16", + ), "1.3.132.0.34" => ("ansip384r1 (secp384r1)", "http://www.oid-info.com/get/1.3.132.0.34"), "1.3.132.0.1" => ("ansit163k1 (sect163k1)", "http://www.oid-info.com/get/1.3.132.0.1"), "1.3.132.0.15" => ("ansit163r2 (sect163r2)", "http://www.oid-info.com/get/1.3.132.0.15"), @@ -93,7 +141,10 @@ fn oid_name(oid: &'_ str) -> (&'static str, &'static str) { "1.3.6.1.5.5.7.3.8" => ("id-kp-timeStamping", "http://www.oid-info.com/get/1.3.6.1.5.5.7.3.8"), "1.3.6.1.5.5.7.3.9" => ("id-kp-OCSPSigning", "http://www.oid-info.com/get/1.3.6.1.5.5.7.3.9"), "2.5.29.37.0" => ("anyExtendedKeyUsage", "http://www.oid-info.com/get/2.5.29.37.0"), - "1.3.6.1.4.1.311.10.3.13" => ("szOID_KP_LIFETIME_SIGNING", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.3.13"), + "1.3.6.1.4.1.311.10.3.13" => ( + "szOID_KP_LIFETIME_SIGNING", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.3.13", + ), "2.5.4.3" => ("commonName", "http://www.oid-info.com/get/2.5.4.3"), "2.5.4.4" => ("surname", "http://www.oid-info.com/get/2.5.4.4"), "2.5.4.5" => ("serialNumber", "http://www.oid-info.com/get/2.5.4.5"), @@ -157,79 +208,223 @@ fn oid_name(oid: &'_ str) -> (&'static str, &'static str) { "2.16.840.1.101.3.4.2.10" => ("sha3-512", "http://www.oid-info.com/get/2.16.840.1.101.3.4.2.10"), "2.16.840.1.101.3.4.2.11" => ("id-shake128", "http://www.oid-info.com/get/2.16.840.1.101.3.4.2.11"), "2.16.840.1.101.3.4.2.12" => ("id-shake256", "http://www.oid-info.com/get/2.16.840.1.101.3.4.2.12"), - "1.2.840.113549.1.9.5" => ("pkcs-9-at-signingTime", "http://www.oid-info.com/get/1.2.840.113549.1.9.5"), - "1.2.840.113549.1.9.6" => ("pkcs-9-at-counterSignature", "http://www.oid-info.com/get/1.2.840.113549.1.9.6"), - "1.3.6.1.4.1.311.2.1.4" => ("SPC_INDIRECT_DATA_OBJID ", "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.4"), - "1.3.6.1.4.1.311.2.1.11" => ("SPC_STATEMENT_TYPE_OBJID ", "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.11"), - "1.3.6.1.4.1.311.2.1.12" => ("SPC_SP_OPUS_INFO_OBJID", "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.12"), - "1.3.6.1.4.1.311.2.1.15" => ("SPC_PE_IMAGE_DATA_OBJID ", "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.15"), - "1.3.6.1.4.1.311.2.1.30" => ("SPC_SIPINFO_OBJID ", "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.30"), - "1.3.6.1.4.1.311.3.2.1" => ("SPC_TIME_STAMP_REQUEST_OBJID ", "http://www.oid-info.com/get/1.3.6.1.4.1.311.3.2.1"), - "1.3.6.1.4.1.311.3.3.1" => ("Timestamping signature (Ms-CounterSign)", "http://www.oid-info.com/get/1.3.6.1.4.1.311.3.3.1"), + "1.2.840.113549.1.9.5" => ( + "pkcs-9-at-signingTime", + "http://www.oid-info.com/get/1.2.840.113549.1.9.5", + ), + "1.2.840.113549.1.9.6" => ( + "pkcs-9-at-counterSignature", + "http://www.oid-info.com/get/1.2.840.113549.1.9.6", + ), + "1.3.6.1.4.1.311.2.1.4" => ( + "SPC_INDIRECT_DATA_OBJID ", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.4", + ), + "1.3.6.1.4.1.311.2.1.11" => ( + "SPC_STATEMENT_TYPE_OBJID ", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.11", + ), + "1.3.6.1.4.1.311.2.1.12" => ( + "SPC_SP_OPUS_INFO_OBJID", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.12", + ), + "1.3.6.1.4.1.311.2.1.15" => ( + "SPC_PE_IMAGE_DATA_OBJID ", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.15", + ), + "1.3.6.1.4.1.311.2.1.30" => ( + "SPC_SIPINFO_OBJID ", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.1.30", + ), + "1.3.6.1.4.1.311.3.2.1" => ( + "SPC_TIME_STAMP_REQUEST_OBJID ", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.3.2.1", + ), + "1.3.6.1.4.1.311.3.3.1" => ( + "Timestamping signature (Ms-CounterSign)", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.3.3.1", + ), "1.3.6.1.4.1.311.10.1" => ("szOID_CTL", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.1"), - "1.3.6.1.4.1.311.10.3.9" => ("szOID_ROOT_LIST_SIGNER ", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.3.9"), - "1.3.6.1.4.1.311.10.11.9" => ("CERT_ENHKEY_USAGE_PROP_ID", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.9"), - "1.3.6.1.4.1.311.10.11.11" => ("CERT_FRIENDLY_NAME_PROP_ID", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.11"), - "1.3.6.1.4.1.311.10.11.20" => ("certKeyIdentifierPropId", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.20"), - "1.3.6.1.4.1.311.10.11.29" => ("certSubjectNameMd5HashPropId", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.29"), - "1.3.6.1.4.1.311.10.11.83" => ("CERT_ROOT_PROGRAM_CERT_POLICIES_PROP_ID", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.83"), - "1.3.6.1.4.1.311.10.11.98" => ("CERT_AUTH_ROOT_SHA256_HASH_PROP_ID", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.98"), - "1.3.6.1.4.1.311.10.11.104" => ("CERT_DISALLOWED_FILETIME_PROP_ID", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.104"), - "1.3.6.1.4.1.311.10.11.105" => ("CERT_ROOT_PROGRAM_CHAIN_POLICIES_PROP_ID", "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.105"), - "1.3.6.1.4.1.311.10.11.122" => ("DISALLOWED_ENHKEY_USAGE", "https://github.com/ralphje/signify/issues/12"), - "1.3.6.1.4.1.311.10.11.126" => ("CERT_NOT_BEFORE_FILETIME_PROP_ID", "https://www.frankysweb.de/kostenloses-s-mime-zertifikat-update-april-2020"), - "1.3.6.1.4.1.311.10.11.127" => ("http://127.0.0.1:8080CERT_NOT_BEFORE_ENHKEY_USAGE_PROP_ID", "https://www.frankysweb.de/kostenloses-s-mime-zertifikat-update-april-2020"), - "1.3.6.1.4.1.311.60.3.2" => ("Auto Update End Revocation", "https://www.powershellgallery.com/packages/AutomatedLab.Common/1.1.5/Content/PkiHelper%5CPublic%5CNew-CaTemplate.ps1"), + "1.3.6.1.4.1.311.10.3.9" => ( + "szOID_ROOT_LIST_SIGNER ", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.3.9", + ), + "1.3.6.1.4.1.311.10.11.9" => ( + "CERT_ENHKEY_USAGE_PROP_ID", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.9", + ), + "1.3.6.1.4.1.311.10.11.11" => ( + "CERT_FRIENDLY_NAME_PROP_ID", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.11", + ), + "1.3.6.1.4.1.311.10.11.20" => ( + "certKeyIdentifierPropId", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.20", + ), + "1.3.6.1.4.1.311.10.11.29" => ( + "certSubjectNameMd5HashPropId", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.29", + ), + "1.3.6.1.4.1.311.10.11.83" => ( + "CERT_ROOT_PROGRAM_CERT_POLICIES_PROP_ID", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.83", + ), + "1.3.6.1.4.1.311.10.11.98" => ( + "CERT_AUTH_ROOT_SHA256_HASH_PROP_ID", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.98", + ), + "1.3.6.1.4.1.311.10.11.104" => ( + "CERT_DISALLOWED_FILETIME_PROP_ID", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.104", + ), + "1.3.6.1.4.1.311.10.11.105" => ( + "CERT_ROOT_PROGRAM_CHAIN_POLICIES_PROP_ID", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.10.11.105", + ), + "1.3.6.1.4.1.311.10.11.122" => ( + "DISALLOWED_ENHKEY_USAGE", + "https://github.com/ralphje/signify/issues/12", + ), + "1.3.6.1.4.1.311.10.11.126" => ( + "CERT_NOT_BEFORE_FILETIME_PROP_ID", + "https://www.frankysweb.de/kostenloses-s-mime-zertifikat-update-april-2020", + ), + "1.3.6.1.4.1.311.10.11.127" => ( + "http://127.0.0.1:8080CERT_NOT_BEFORE_ENHKEY_USAGE_PROP_ID", + "https://www.frankysweb.de/kostenloses-s-mime-zertifikat-update-april-2020", + ), + "1.3.6.1.4.1.311.60.3.2" => ( + "Auto Update End Revocation", + "https://www.powershellgallery.com/packages/AutomatedLab.Common/1.1.5/Content/PkiHelper%5CPublic%5CNew-CaTemplate.ps1", + ), "1.2.840.113549.1.1.8" => ("id-mgf1", "http://www.oid-info.com/get/1.2.840.113549.1.1.8"), "1.2.840.113554.1.2.2" => ("krb5", "http://www.oid-info.com/get/1.2.840.113554.1.2.2"), - "1.2.840.48018.1.2.2" => ("MS-KILE", "https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-kile/829b9629-21ab-474f-8716-77cc0990aeb4"), - "1.2.840.113554.1.2.2.3" => ("user-to-user-mechanism", "http://www.oid-info.com/get/1.2.840.113554.1.2.2.3"), + "1.2.840.48018.1.2.2" => ( + "MS-KILE", + "https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-kile/829b9629-21ab-474f-8716-77cc0990aeb4", + ), + "1.2.840.113554.1.2.2.3" => ( + "user-to-user-mechanism", + "http://www.oid-info.com/get/1.2.840.113554.1.2.2.3", + ), "1.3.6.1.4.1.311.2.2.10" => ("NTLM", "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.2.10"), "1.3.6.1.4.1.311.2.2.30" => ("NEGOEX", "http://www.oid-info.com/get/1.3.6.1.4.1.311.2.2.30"), "1.3.6.1.5.5.2" => ("snego", "http://www.oid-info.com/get/1.3.6.1.5.5.2"), "1.3.6.1.5.2.7" => ("GSS PKU2U ", "https://oidref.com/1.3.6.1.5.2.7"), "1.3.6.1.5.2.3.1" => ("id-pkinit-authData", "http://www.oid-info.com/get/1.3.6.1.5.2.3.1"), "1.3.6.1.5.2.3.2" => ("id-pkinit-DHKeyData", "http://www.oid-info.com/get/1.3.6.1.5.2.3.2"), - "1.2.840.113549.1.12.1.3" => ("pbeWithSHAAnd3-KeyTripleDES-CBC", "http://www.oid-info.com/get/1.2.840.113549.1.12.1.3"), - "1.2.840.113549.1.12.1.6" => ("pbeWithSHAAnd40BitRC2-CBC", "http://www.oid-info.com/get/1.2.840.113549.1.12.1.6"), + "1.2.840.113549.1.12.1.3" => ( + "pbeWithSHAAnd3-KeyTripleDES-CBC", + "http://www.oid-info.com/get/1.2.840.113549.1.12.1.3", + ), + "1.2.840.113549.1.12.1.6" => ( + "pbeWithSHAAnd40BitRC2-CBC", + "http://www.oid-info.com/get/1.2.840.113549.1.12.1.6", + ), "1.2.840.113549.1.9.23.1" => ("x509Crl", "http://www.oid-info.com/get/1.2.840.113549.1.9.23.1"), "1.2.840.113549.1.9.22.1" => ("x509Certificate", "http://www.oid-info.com/get/1.2.840.113549.1.9.22.1"), "1.2.840.113549.1.12.10.1.1" => ("keyBag", "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.1"), - "1.2.840.113549.1.12.10.1.2" => ("pkcs-8ShroudedKeyBag", "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.2"), + "1.2.840.113549.1.12.10.1.2" => ( + "pkcs-8ShroudedKeyBag", + "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.2", + ), "1.2.840.113549.1.12.10.1.3" => ("certBag", "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.3"), "1.2.840.113549.1.12.10.1.4" => ("crlBag", "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.4"), "1.2.840.113549.1.12.10.1.5" => ("secretBag", "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.5"), - "1.2.840.113549.1.12.10.1.6" => ("safeContentsBag", "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.6"), + "1.2.840.113549.1.12.10.1.6" => ( + "safeContentsBag", + "http://www.oid-info.com/get/1.2.840.113549.1.12.10.1.6", + ), "1.2.840.113549.1.5.12" => ("id-PBKDF2", "http://www.oid-info.com/get/1.2.840.113549.1.5.12"), "1.2.840.113549.1.5.13" => ("pbes2", "http://www.oid-info.com/get/1.2.840.113549.1.5.13"), - "1.2.840.113549.1.9.20" => ("pkcs-9-at-friendlyName", "http://www.oid-info.com/get/1.2.840.113549.1.9.20"), - "1.2.840.113549.1.9.21" => ("pkcs-9-at-localKeyId", "http://www.oid-info.com/get/1.2.840.113549.1.9.21"), - "1.3.6.1.4.1.311.20.2.3" => ("User Principal Name", "http://www.oid-info.com/get/1.3.6.1.4.1.311.20.2.3"), - "1.2.840.113549.1.9.16.2.47" => ("Signing certificate V2", "http://oid-info.com/get/1.2.840.113549.1.9.16.2.47"), - "1.2.840.113549.1.9.52" => ("id-aa-CMSAlgorithmProtection", "https://oidref.com/1.2.840.113549.1.9.52"), - "2.5.29.31" => ("cRLDistributionPoints (X509 extension)", "http://www.oid-info.com/get/2.5.29.31"), - "1.3.6.1.5.5.7.2.1" => ("PKIX CPS pointer qualifier", "http://www.oid-info.com/get/1.3.6.1.5.5.7.2.1"), - "1.3.6.1.4.1.44947.1.1.1" => ("ISRG Domain Validated (by Let's Encrypt)", "https://www.alvestrand.no/objectid/submissions/1.3.6.1.4.1.44947.1.1.1.html"), + "1.2.840.113549.1.9.20" => ( + "pkcs-9-at-friendlyName", + "http://www.oid-info.com/get/1.2.840.113549.1.9.20", + ), + "1.2.840.113549.1.9.21" => ( + "pkcs-9-at-localKeyId", + "http://www.oid-info.com/get/1.2.840.113549.1.9.21", + ), + "1.3.6.1.4.1.311.20.2.3" => ( + "User Principal Name", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.20.2.3", + ), + "1.2.840.113549.1.9.16.2.47" => ( + "Signing certificate V2", + "http://oid-info.com/get/1.2.840.113549.1.9.16.2.47", + ), + "1.2.840.113549.1.9.52" => ( + "id-aa-CMSAlgorithmProtection", + "https://oidref.com/1.2.840.113549.1.9.52", + ), + "2.5.29.31" => ( + "cRLDistributionPoints (X509 extension)", + "http://www.oid-info.com/get/2.5.29.31", + ), + "1.3.6.1.5.5.7.2.1" => ( + "PKIX CPS pointer qualifier", + "http://www.oid-info.com/get/1.3.6.1.5.5.7.2.1", + ), + "1.3.6.1.4.1.44947.1.1.1" => ( + "ISRG Domain Validated (by Let's Encrypt)", + "https://www.alvestrand.no/objectid/submissions/1.3.6.1.4.1.44947.1.1.1.html", + ), "2.23.140.1.2.1" => ("domain-validated", "http://www.oid-info.com/get/2.23.140.1.2.1"), "2.5.29.32" => ("id-ce-certificatePolicies", "http://www.oid-info.com/get/2.5.29.32"), "1.3.6.1.5.5.7.48.2" => ("id-ad-caIssuers", "http://www.oid-info.com/get/1.3.6.1.5.5.7.48.2"), "1.3.6.1.5.5.7.48.1" => ("id-pkix-ocsp", "http://www.oid-info.com/get/1.3.6.1.5.5.7.48.1"), - "1.3.6.1.5.5.7.1.1" => ("id-pe-authorityInfoAccess", "http://www.oid-info.com/get/1.3.6.1.5.5.7.1.1"), + "1.3.6.1.5.5.7.1.1" => ( + "id-pe-authorityInfoAccess", + "http://www.oid-info.com/get/1.3.6.1.5.5.7.1.1", + ), "2.23.140.1.2.2" => ("organization-validated", "http://www.oid-info.com/get/2.23.140.1.2.2"), - "1.3.6.1.4.1.11129.2.4.2" => ("Rec. ITU-T X.509v3 certificate extension", "http://www.oid-info.com/get/1.3.6.1.4.1.11129.2.4.2"), + "1.3.6.1.4.1.11129.2.4.2" => ( + "Rec. ITU-T X.509v3 certificate extension", + "http://www.oid-info.com/get/1.3.6.1.4.1.11129.2.4.2", + ), "2.23.140.1.1" => ("ev-guidelines", "http://www.oid-info.com/get/2.23.140.1.1"), "2.23.140.1.2.3" => ("individual-validated", "http://www.oid-info.com/get/2.23.140.1.2.3"), - "0.9.2342.19200300.100.1.25" => ("domainComponent", "http://www.oid-info.com/get/0.9.2342.19200300.100.1.25"), - "1.3.6.1.4.1.311.21.7" => ("szOID_CERTIFICATE_TEMPLATE", "http://www.oid-info.com/get/1.3.6.1.4.1.311.21.7"), - "1.3.6.1.4.1.311.20.2.2" => ("Smartcard logon (Microsoft enhanced key usage)", "http://www.oid-info.com/get/1.3.6.1.4.1.311.20.2.2"), - "1.3.6.1.4.1.311.21.10" => ("szOID_APPLICATION_CERT_POLICIES", "http://www.oid-info.com/get/1.3.6.1.4.1.311.21.10"), + "0.9.2342.19200300.100.1.25" => ( + "domainComponent", + "http://www.oid-info.com/get/0.9.2342.19200300.100.1.25", + ), + "1.3.6.1.4.1.311.21.7" => ( + "szOID_CERTIFICATE_TEMPLATE", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.21.7", + ), + "1.3.6.1.4.1.311.20.2.2" => ( + "Smartcard logon (Microsoft enhanced key usage)", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.20.2.2", + ), + "1.3.6.1.4.1.311.21.10" => ( + "szOID_APPLICATION_CERT_POLICIES", + "http://www.oid-info.com/get/1.3.6.1.4.1.311.21.10", + ), "1.2.840.113549.1.7.3" => ("id-envelopedData", "http://oid-info.com/get/1.2.840.113549.1.7.3"), - "1.3.6.1.4.1.311.74.1" => ("ProtectionDescriptorType", "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L128"), - "1.3.6.1.4.1.311.74.1.1" => ("SID Protection Descriptor", "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L129"), - "1.3.6.1.4.1.311.74.1.2" => ("Key File Protection Descriptor", "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L130"), - "1.3.6.1.4.1.311.74.1.5" => ("SSDL Protection Descriptor", "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L131"), - "1.3.6.1.4.1.311.74.1.8" => ("LOCAL Protection Descriptor", "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L132"), - "1.3.6.1.4.1.311.21.1" => ("Certificate services CA version", "http://oid-info.com/get/1.3.6.1.4.1.311.21.1"), + "1.3.6.1.4.1.311.74.1" => ( + "ProtectionDescriptorType", + "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L128", + ), + "1.3.6.1.4.1.311.74.1.1" => ( + "SID Protection Descriptor", + "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L129", + ), + "1.3.6.1.4.1.311.74.1.2" => ( + "Key File Protection Descriptor", + "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L130", + ), + "1.3.6.1.4.1.311.74.1.5" => ( + "SSDL Protection Descriptor", + "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L131", + ), + "1.3.6.1.4.1.311.74.1.8" => ( + "LOCAL Protection Descriptor", + "https://github.com/jborean93/dpapi-ng/blob/57143c31897e647d97f5a8b505188dc447025997/src/dpapi_ng/_blob.py#L132", + ), + "1.3.6.1.4.1.311.21.1" => ( + "Certificate services CA version", + "http://oid-info.com/get/1.3.6.1.4.1.311.21.1", + ), _ => ("-", "https://github.com/TheBestTvarynka/crypto-helper/issues/new"), } } diff --git a/src/asn1/scheme/primitive.rs b/src/asn1/scheme/primitive.rs index 8a9dd32b..8c9ec84b 100644 --- a/src/asn1/scheme/primitive.rs +++ b/src/asn1/scheme/primitive.rs @@ -1,5 +1,5 @@ use asn1_parser::{Bool, OwnedEnumerated, OwnedInteger, OwnedRawAsn1EntityData}; -use yew::{function_component, html, Html, Properties}; +use yew::{Html, Properties, function_component, html}; use crate::asn1::node_options::NodeOptions; use crate::common::RcSlice; diff --git a/src/asn1/scheme/sequence.rs b/src/asn1/scheme/sequence.rs index 641ea6df..2b52efa8 100644 --- a/src/asn1/scheme/sequence.rs +++ b/src/asn1/scheme/sequence.rs @@ -1,9 +1,9 @@ use asn1_parser::{OwnedRawAsn1EntityData, OwnedSequence}; -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; +use crate::asn1::HighlightAction; use crate::asn1::node_options::NodeOptions; use crate::asn1::scheme::build_asn1_schema; -use crate::asn1::HighlightAction; use crate::common::RcSlice; #[derive(PartialEq, Properties, Clone)] diff --git a/src/asn1/scheme/set.rs b/src/asn1/scheme/set.rs index 584ed4d5..7e0b1041 100644 --- a/src/asn1/scheme/set.rs +++ b/src/asn1/scheme/set.rs @@ -1,9 +1,9 @@ use asn1_parser::{OwnedRawAsn1EntityData, OwnedSet}; -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; +use crate::asn1::HighlightAction; use crate::asn1::node_options::NodeOptions; use crate::asn1::scheme::build_asn1_schema; -use crate::asn1::HighlightAction; use crate::common::RcSlice; #[derive(PartialEq, Properties, Clone)] diff --git a/src/asn1/scheme/strings.rs b/src/asn1/scheme/strings.rs index 9a2e37df..da8cf908 100644 --- a/src/asn1/scheme/strings.rs +++ b/src/asn1/scheme/strings.rs @@ -4,11 +4,11 @@ use asn1_parser::{ OwnedBitString, OwnedBmpString, OwnedGeneralString, OwnedIA5String, OwnedNumericString, OwnedOctetString, OwnedPrintableString, OwnedRawAsn1EntityData, OwnedUtf8String, OwnedVisibleString, }; -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; +use crate::asn1::HighlightAction; use crate::asn1::node_options::NodeOptions; use crate::asn1::scheme::build_asn1_schema; -use crate::asn1::HighlightAction; use crate::common::RcSlice; #[derive(PartialEq, Properties, Clone)] diff --git a/src/asn1/scheme/tag.rs b/src/asn1/scheme/tag.rs index f4c4bdb5..20fc3c0f 100644 --- a/src/asn1/scheme/tag.rs +++ b/src/asn1/scheme/tag.rs @@ -1,11 +1,11 @@ use std::str::from_utf8; use asn1_parser::{OwnedApplicationTag, OwnedExplicitTag, OwnedImplicitTag, OwnedRawAsn1EntityData}; -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; +use crate::asn1::HighlightAction; use crate::asn1::node_options::NodeOptions; use crate::asn1::scheme::build_asn1_schema; -use crate::asn1::HighlightAction; use crate::common::RcSlice; #[derive(PartialEq, Properties, Clone)] diff --git a/src/asn1/scheme/time.rs b/src/asn1/scheme/time.rs index ede9690d..78405537 100644 --- a/src/asn1/scheme/time.rs +++ b/src/asn1/scheme/time.rs @@ -1,5 +1,5 @@ use asn1_parser::{GeneralizedTime, OwnedRawAsn1EntityData, UtcTime}; -use yew::{function_component, html, Html, Properties}; +use yew::{Html, Properties, function_component, html}; use crate::asn1::node_options::NodeOptions; use crate::common::RcSlice; diff --git a/src/bin/main.rs b/src/bin/main.rs index 121939a5..7a5a2a9b 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -1,8 +1,8 @@ use crypto_helper::App; +use tracing_subscriber::EnvFilter; use tracing_subscriber::fmt::format::Pretty; use tracing_subscriber::prelude::*; -use tracing_subscriber::EnvFilter; -use tracing_web::{performance_layer, MakeWebConsoleWriter}; +use tracing_web::{MakeWebConsoleWriter, performance_layer}; fn main() { let fmt_layer = tracing_subscriber::fmt::layer() diff --git a/src/bin/worker.rs b/src/bin/worker.rs index fbf47b94..f19a95b7 100644 --- a/src/bin/worker.rs +++ b/src/bin/worker.rs @@ -1,8 +1,8 @@ use crypto_helper::diff::{DiffTask, JsonCodec}; +use tracing_subscriber::EnvFilter; use tracing_subscriber::fmt::format::Pretty; use tracing_subscriber::prelude::*; -use tracing_subscriber::EnvFilter; -use tracing_web::{performance_layer, MakeWebConsoleWriter}; +use tracing_web::{MakeWebConsoleWriter, performance_layer}; use yew_agent::Registrable; fn main() { diff --git a/src/common/byte_input.rs b/src/common/byte_input.rs index 014dd5b3..eb10fb48 100644 --- a/src/common/byte_input.rs +++ b/src/common/byte_input.rs @@ -1,8 +1,8 @@ use web_sys::HtmlInputElement; -use yew::{classes, function_component, html, use_effect_with, use_state, Callback, Html, Properties, TargetCast}; +use yew::{Callback, Html, Properties, TargetCast, classes, function_component, html, use_effect_with, use_state}; use super::BytesFormat; -use crate::common::{encode_bytes, get_format_button_class, get_set_format_callback, parse_bytes, BYTES_FORMATS}; +use crate::common::{BYTES_FORMATS, encode_bytes, get_format_button_class, get_set_format_callback, parse_bytes}; #[derive(PartialEq, Properties, Clone)] pub struct ByteInputProps { diff --git a/src/common/bytes_viewer.rs b/src/common/bytes_viewer.rs index 645d4a14..a6dc7b36 100644 --- a/src/common/bytes_viewer.rs +++ b/src/common/bytes_viewer.rs @@ -1,4 +1,4 @@ -use yew::{classes, function_component, html, Html, Properties}; +use yew::{Html, Properties, classes, function_component, html}; use crate::common::hex_format_byte; @@ -7,6 +7,7 @@ pub struct BytesViewerProps { pub bytes: Vec, } +#[allow(dead_code)] fn byte_color_class(byte: u8) -> &'static str { if byte == 0 { "byte-null" @@ -21,6 +22,7 @@ fn byte_color_class(byte: u8) -> &'static str { } } +#[allow(dead_code)] fn byte_component(byte: u8) -> Html { html! { {hex_format_byte(byte)} diff --git a/src/common/checkbox.rs b/src/common/checkbox.rs index e20ea611..552b7c0e 100644 --- a/src/common/checkbox.rs +++ b/src/common/checkbox.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; #[derive(PartialEq, Properties, Clone)] pub struct CheckboxProps { diff --git a/src/common/loader.rs b/src/common/loader.rs index ff7258f9..d1ebb003 100644 --- a/src/common/loader.rs +++ b/src/common/loader.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Html}; +use yew::{Html, function_component, html}; #[function_component(Loader)] pub fn loader() -> Html { diff --git a/src/common/mod.rs b/src/common/mod.rs index faf59ec6..f104bc42 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -8,7 +8,7 @@ mod switch; mod table; use base64::Engine; -pub use byte_input::{build_byte_input, ByteInput}; +pub use byte_input::{ByteInput, build_byte_input}; pub use checkbox::Checkbox; pub use loader::Loader; pub use rc_slice::RcSlice; diff --git a/src/common/simple_output.rs b/src/common/simple_output.rs index 6076e71d..67709dd6 100644 --- a/src/common/simple_output.rs +++ b/src/common/simple_output.rs @@ -1,9 +1,9 @@ -use yew::{function_component, html, use_effect_with, use_state, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html, use_effect_with, use_state}; use yew_hooks::use_clipboard; use yew_notifications::{Notification, NotificationType}; use super::BytesFormat; -use crate::common::{encode_bytes, get_format_button_class, get_set_format_callback, BYTES_FORMATS}; +use crate::common::{BYTES_FORMATS, encode_bytes, get_format_button_class, get_set_format_callback}; #[derive(PartialEq, Properties, Clone)] pub struct SimpleOutputProps { diff --git a/src/common/switch.rs b/src/common/switch.rs index a6791d5d..7ae73736 100644 --- a/src/common/switch.rs +++ b/src/common/switch.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; #[derive(Properties, PartialEq, Debug, Clone)] pub struct SwitchProps { diff --git a/src/common/table.rs b/src/common/table.rs index af50afa5..874dfe43 100644 --- a/src/common/table.rs +++ b/src/common/table.rs @@ -1,8 +1,8 @@ use serde_json::Value; use yew::virtual_dom::VNode; -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; use yew_hooks::use_clipboard; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; #[derive(Properties, PartialEq, Debug, Clone)] pub struct TableViewProps { diff --git a/src/crypto_helper/algorithm.rs b/src/crypto_helper/algorithm.rs index 31c57055..07860a1f 100644 --- a/src/crypto_helper/algorithm.rs +++ b/src/crypto_helper/algorithm.rs @@ -542,11 +542,7 @@ pub enum HmacShaAction { impl From for HmacShaAction { fn from(value: bool) -> Self { - if value { - Self::Verify(Vec::new()) - } else { - Self::Sign - } + if value { Self::Verify(Vec::new()) } else { Self::Sign } } } diff --git a/src/crypto_helper/computations.rs b/src/crypto_helper/computations.rs index b21a397c..78212794 100644 --- a/src/crypto_helper/computations.rs +++ b/src/crypto_helper/computations.rs @@ -4,12 +4,12 @@ use std::io::Write; use argon2::{PasswordHasher, PasswordVerifier}; use base64::Engine; use bcrypt::Version; -use flate2::write::{ZlibDecoder, ZlibEncoder}; use flate2::Compression; +use flate2::write::{ZlibDecoder, ZlibEncoder}; use picky::signature::SignatureAlgorithm; use picky_krb::crypto::{Checksum, Cipher}; -use rsa::rand_core::OsRng; use rsa::Pkcs1v15Encrypt; +use rsa::rand_core::OsRng; use super::algorithm::{ Argon2Action, Argon2Input, BcryptAction, BcryptInput, HmacShaAction, HmacShaAlgorithm, HmacShaInput, KrbInput, diff --git a/src/crypto_helper/info/algo_search.rs b/src/crypto_helper/info/algo_search.rs index 6238945a..ce434cab 100644 --- a/src/crypto_helper/info/algo_search.rs +++ b/src/crypto_helper/info/algo_search.rs @@ -1,7 +1,7 @@ use web_sys::{Event, FocusEvent, HtmlInputElement, InputEvent, KeyboardEvent, MouseEvent}; use yew::{ - classes, function_component, html, use_effect_with, use_state, Callback, Html, Properties, TargetCast, - UseStateSetter, + Callback, Html, Properties, TargetCast, UseStateSetter, classes, function_component, html, use_effect_with, + use_state, }; use crate::crypto_helper::algorithm::{Algorithm, SUPPORTED_ALGORITHMS}; @@ -78,11 +78,11 @@ pub fn algo_search(props: &AlgoSearchProps) -> Html { let algo_setter = props.set_algorithm.clone(); let algos_setter = algos.setter(); let onkeydown = Callback::from(move |event: KeyboardEvent| { - if event.key() == "Enter" { - if let Some(algo) = algos_value.first() { - algo_setter.set((*algo).try_into().unwrap_or_default()); - algos_setter.set(Vec::new()); - } + if event.key() == "Enter" + && let Some(algo) = algos_value.first() + { + algo_setter.set((*algo).try_into().unwrap_or_default()); + algos_setter.set(Vec::new()); } }); diff --git a/src/crypto_helper/info/mod.rs b/src/crypto_helper/info/mod.rs index 389041d5..f40649a8 100644 --- a/src/crypto_helper/info/mod.rs +++ b/src/crypto_helper/info/mod.rs @@ -2,7 +2,7 @@ mod algo_search; use web_sys::HtmlInputElement; use yew::html::onchange::Event; -use yew::{function_component, html, use_state, Callback, Html, Properties, TargetCast, UseStateSetter}; +use yew::{Callback, Html, Properties, TargetCast, UseStateSetter, function_component, html, use_state}; use super::algorithm::Algorithm; use crate::crypto_helper::algorithm::{COMPRESSION_ALGOS, ENCRYPTION_ALGOS, HASHING_ALGOS, HMAC_ALGOS}; diff --git a/src/crypto_helper/input/argon2.rs b/src/crypto_helper/input/argon2.rs index 15171bfe..9a5d3d0f 100644 --- a/src/crypto_helper/input/argon2.rs +++ b/src/crypto_helper/input/argon2.rs @@ -1,8 +1,8 @@ use web_sys::HtmlInputElement; use yew::html::TargetCast; -use yew::{classes, function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, classes, function_component, html}; -use crate::common::{build_byte_input, BytesFormat, Switch}; +use crate::common::{BytesFormat, Switch, build_byte_input}; use crate::crypto_helper::algorithm::{Argon2Action, Argon2HashAction, Argon2Input as Argon2InputData}; #[derive(PartialEq, Properties, Clone)] diff --git a/src/crypto_helper/input/bcrypt.rs b/src/crypto_helper/input/bcrypt.rs index f1aeb1d2..6b658e0e 100644 --- a/src/crypto_helper/input/bcrypt.rs +++ b/src/crypto_helper/input/bcrypt.rs @@ -1,8 +1,8 @@ use web_sys::HtmlInputElement; -use yew::{classes, function_component, html, Callback, Html, Properties, TargetCast}; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew::{Callback, Html, Properties, TargetCast, classes, function_component, html}; +use yew_notifications::{Notification, NotificationType, use_notification}; -use crate::common::{build_byte_input, BytesFormat, Switch}; +use crate::common::{BytesFormat, Switch, build_byte_input}; use crate::crypto_helper::algorithm::{BcryptAction, BcryptHashAction, BcryptInput as BcryptInputData}; #[derive(PartialEq, Properties, Clone)] diff --git a/src/crypto_helper/input/hmac_sha.rs b/src/crypto_helper/input/hmac_sha.rs index d88299c4..ea1ba500 100644 --- a/src/crypto_helper/input/hmac_sha.rs +++ b/src/crypto_helper/input/hmac_sha.rs @@ -1,8 +1,8 @@ use web_sys::{Event, HtmlInputElement}; -use yew::{function_component, html, Callback, Html, Properties, TargetCast}; +use yew::{Callback, Html, Properties, TargetCast, function_component, html}; -use crate::common::{build_byte_input, Switch}; -use crate::crypto_helper::algorithm::{HmacShaAction, HmacShaInput as HmacShaInputData, HMAC_HASH_ALGOS}; +use crate::common::{Switch, build_byte_input}; +use crate::crypto_helper::algorithm::{HMAC_HASH_ALGOS, HmacShaAction, HmacShaInput as HmacShaInputData}; #[derive(PartialEq, Properties, Clone)] pub struct HmacShaInputProps { diff --git a/src/crypto_helper/input/krb.rs b/src/crypto_helper/input/krb.rs index 681841fa..9b153d10 100644 --- a/src/crypto_helper/input/krb.rs +++ b/src/crypto_helper/input/krb.rs @@ -1,12 +1,12 @@ use picky_krb::crypto::CipherSuite; use web_sys::{HtmlInputElement, InputEvent, MouseEvent}; use yew::{ - classes, function_component, html, use_effect_with, use_state, Callback, Html, Properties, TargetCast, - UseStateSetter, + Callback, Html, Properties, TargetCast, UseStateSetter, classes, function_component, html, use_effect_with, + use_state, }; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; -use crate::common::{build_byte_input, Switch}; +use crate::common::{Switch, build_byte_input}; use crate::crypto_helper::algorithm::{KrbInput as KerberosInput, KrbMode}; fn get_usage_number_name(usage_number: i32) -> &'static str { diff --git a/src/crypto_helper/input/mod.rs b/src/crypto_helper/input/mod.rs index b9450042..19415da7 100644 --- a/src/crypto_helper/input/mod.rs +++ b/src/crypto_helper/input/mod.rs @@ -6,7 +6,7 @@ mod rsa; mod zlib; use picky_krb::crypto::CipherSuite; -use yew::{function_component, html, Callback, Html, Properties, UseStateSetter}; +use yew::{Callback, Html, Properties, UseStateSetter, function_component, html}; use self::argon2::build_argon2_input; use self::bcrypt::build_bcrypt_input; @@ -14,8 +14,8 @@ use self::hmac_sha::build_hmac_sha_input; use self::krb::build_krb_input; use self::rsa::build_rsa_input; use self::zlib::build_zlib_input; -use super::algorithm::{KrbInput, KrbMode}; use super::Algorithm; +use super::algorithm::{KrbInput, KrbMode}; use crate::common::build_byte_input; fn get_input_components(algorithm: &Algorithm, setter: &UseStateSetter) -> Html { diff --git a/src/crypto_helper/input/rsa.rs b/src/crypto_helper/input/rsa.rs index 7fb30c4c..0d013bfd 100644 --- a/src/crypto_helper/input/rsa.rs +++ b/src/crypto_helper/input/rsa.rs @@ -2,12 +2,12 @@ use picky::key::{PrivateKey, PublicKey}; use rsa::pkcs1::{DecodeRsaPrivateKey, DecodeRsaPublicKey, EncodeRsaPrivateKey, EncodeRsaPublicKey}; use rsa::{RsaPrivateKey, RsaPublicKey}; use web_sys::{Event, HtmlInputElement}; -use yew::{classes, function_component, html, Callback, Classes, Html, Properties, TargetCast}; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew::{Callback, Classes, Html, Properties, TargetCast, classes, function_component, html}; +use yew_notifications::{Notification, NotificationType, use_notification}; use crate::common::build_byte_input; use crate::crypto_helper::algorithm::{ - RsaAction, RsaHashAlgorithm, RsaInput as RsaInputData, RsaSignInput, RsaVerifyInput, RSA_HASH_ALGOS, + RSA_HASH_ALGOS, RsaAction, RsaHashAlgorithm, RsaInput as RsaInputData, RsaSignInput, RsaVerifyInput, }; #[derive(Debug, PartialEq, Properties)] diff --git a/src/crypto_helper/input/zlib.rs b/src/crypto_helper/input/zlib.rs index e5f5a9c5..ba371576 100644 --- a/src/crypto_helper/input/zlib.rs +++ b/src/crypto_helper/input/zlib.rs @@ -1,6 +1,6 @@ -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; -use crate::common::{build_byte_input, Switch}; +use crate::common::{Switch, build_byte_input}; use crate::crypto_helper::algorithm::ZlibInput as ZlibInputData; #[derive(PartialEq, Properties, Clone)] diff --git a/src/crypto_helper/mod.rs b/src/crypto_helper/mod.rs index 7908debe..4d44b4c2 100644 --- a/src/crypto_helper/mod.rs +++ b/src/crypto_helper/mod.rs @@ -14,15 +14,15 @@ use output::Output; use picky_krb::crypto::{ChecksumSuite, CipherSuite}; use sha1::{Digest, Sha1}; use web_sys::KeyboardEvent; -use yew::{function_component, html, use_effect_with, use_state, Callback, Html}; +use yew::{Callback, Html, function_component, html, use_effect_with, use_state}; use yew_hooks::{use_clipboard, use_local_storage, use_location}; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; use self::computations::{ process_argon2, process_hmac_sha, 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, Asn1}; +use crate::url_query_params::{Asn1, generate_crypto_helper_link}; const CRYPTO_HELPER_LOCAL_STORAGE_KEY: &str = "CRYPTO_HELPER_DATA"; diff --git a/src/crypto_helper/output/krb.rs b/src/crypto_helper/output/krb.rs index ac2ecaea..d1db19de 100644 --- a/src/crypto_helper/output/krb.rs +++ b/src/crypto_helper/output/krb.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Callback, Html, Properties}; +use yew::{Callback, Html, Properties, function_component, html}; use yew_hooks::use_clipboard; use yew_notifications::{Notification, NotificationType}; diff --git a/src/crypto_helper/output/mod.rs b/src/crypto_helper/output/mod.rs index 07c72beb..b35273fb 100644 --- a/src/crypto_helper/output/mod.rs +++ b/src/crypto_helper/output/mod.rs @@ -1,11 +1,11 @@ mod krb; -use yew::{function_component, html, Callback, Html, Properties}; -use yew_notifications::{use_notification, Notification}; +use yew::{Callback, Html, Properties, function_component, html}; +use yew_notifications::{Notification, use_notification}; use self::krb::build_krb_output; use super::Algorithm; -use crate::common::{build_simple_output, BytesFormat}; +use crate::common::{BytesFormat, build_simple_output}; fn get_output_components(algorithm: &Algorithm, output: &[u8], add_notification: Callback) -> Html { match algorithm { diff --git a/src/diff/diff_viewer.rs b/src/diff/diff_viewer.rs index d8f9bc99..6a28f767 100644 --- a/src/diff/diff_viewer.rs +++ b/src/diff/diff_viewer.rs @@ -1,6 +1,6 @@ use similar::DiffOp; use yew::virtual_dom::VNode; -use yew::{function_component, html, Html, Properties}; +use yew::{Html, Properties, function_component, html}; use super::DiffData; diff --git a/src/diff/mod.rs b/src/diff/mod.rs index 2f9568da..9437af2e 100644 --- a/src/diff/mod.rs +++ b/src/diff/mod.rs @@ -8,7 +8,7 @@ use web_sys::{HtmlInputElement, KeyboardEvent}; use yew::html::onchange::Event; use yew::platform::spawn_local; use yew::virtual_dom::VNode; -use yew::{function_component, html, use_effect_with, use_state_eq, Callback, Html, TargetCast}; +use yew::{Callback, Html, TargetCast, function_component, html, use_effect_with, use_state_eq}; use yew_agent::oneshot::use_oneshot_runner; use yew_hooks::use_local_storage; @@ -131,11 +131,11 @@ pub fn diff_page() -> Html { changed_setter.set(changed.to_string()); flag = true; } - if let Some(raw_algorithm) = (*algorithm_local_storage).as_ref() { - if let Ok(algorithm) = raw_algorithm.as_str().try_into() { - algorithm_setter.set(algorithm); - flag = true; - } + if let Some(raw_algorithm) = (*algorithm_local_storage).as_ref() + && let Ok(algorithm) = raw_algorithm.as_str().try_into() + { + algorithm_setter.set(algorithm); + flag = true; } if flag { diff --git a/src/diff/task.rs b/src/diff/task.rs index 8ba2e6f6..eecdb349 100644 --- a/src/diff/task.rs +++ b/src/diff/task.rs @@ -2,11 +2,11 @@ use js_sys::Uint8Array; use serde::{Deserialize, Serialize}; use similar::capture_diff_slices; use wasm_bindgen::{JsCast, JsValue}; -use yew_agent::oneshot::oneshot; use yew_agent::Codec; +use yew_agent::oneshot::oneshot; -use crate::diff::diff_algo::DiffAlgo; use crate::diff::DiffData; +use crate::diff::diff_algo::DiffAlgo; /// Codes for messages encoding/decoding between main thread and worker. /// diff --git a/src/footer.rs b/src/footer.rs index 37a7dfee..1ca9eab8 100644 --- a/src/footer.rs +++ b/src/footer.rs @@ -1,4 +1,4 @@ -use yew::{html, Html}; +use yew::{Html, html}; pub fn footer() -> Html { html! { diff --git a/src/header.rs b/src/header.rs index 5bdfd4e6..0bbac9de 100644 --- a/src/header.rs +++ b/src/header.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Html}; +use yew::{Html, function_component, html}; use yew_router::prelude::Link; use crate::Route; diff --git a/src/jwt/jwt/editor.rs b/src/jwt/jwt/editor.rs index 77926be7..628784af 100644 --- a/src/jwt/jwt/editor.rs +++ b/src/jwt/jwt/editor.rs @@ -1,13 +1,13 @@ use std::fmt::Debug; -use serde_json::{to_string_pretty, Value}; +use serde_json::{Value, to_string_pretty}; use web_sys::{HtmlInputElement, MouseEvent}; -use yew::{function_component, html, use_state, Callback, Html, Properties, TargetCast}; +use yew::{Callback, Html, Properties, TargetCast, function_component, html, use_state}; use yew_hooks::use_clipboard; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; use super::Jwt; -use crate::common::{build_simple_output, BytesFormat, Switch, TableView}; +use crate::common::{BytesFormat, Switch, TableView, build_simple_output}; use crate::utils::copy_to_clipboard_with_notification; #[derive(PartialEq, Properties)] @@ -64,11 +64,7 @@ enum JsonView { impl From for JsonView { fn from(value: bool) -> Self { - if value { - JsonView::Table - } else { - JsonView::Raw - } + if value { JsonView::Table } else { JsonView::Raw } } } diff --git a/src/jwt/jwt/viewer.rs b/src/jwt/jwt/viewer.rs index 299ee23d..9386e5fd 100644 --- a/src/jwt/jwt/viewer.rs +++ b/src/jwt/jwt/viewer.rs @@ -1,6 +1,6 @@ -use yew::{function_component, html, Html, Properties}; +use yew::{Html, Properties, function_component, html}; use yew_hooks::use_clipboard; -use yew_notifications::{use_notification, Notification}; +use yew_notifications::{Notification, use_notification}; use super::Jwt; use crate::utils::copy_to_clipboard_with_notification; diff --git a/src/jwt/jwt_utils.rs b/src/jwt/jwt_utils.rs index 5a3f8e41..4be97165 100644 --- a/src/jwt/jwt_utils.rs +++ b/src/jwt/jwt_utils.rs @@ -1,17 +1,17 @@ -use base64::engine::general_purpose::STANDARD; -use base64::engine::GeneralPurpose; use base64::Engine; +use base64::engine::GeneralPurpose; +use base64::engine::general_purpose::STANDARD; use picky::hash::HashAlgorithm; use picky::key::{PrivateKey, PublicKey}; use picky::signature::SignatureAlgorithm; use web_sys::{HtmlInputElement, MouseEvent}; -use yew::{function_component, html, use_state, Callback, Html, Properties, TargetCast}; +use yew::{Callback, Html, Properties, TargetCast, function_component, html, use_state}; use yew_hooks::use_clipboard; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; use super::jwt::Jwt; use super::signature::JwtSignatureAlgorithm; -use crate::common::{build_byte_input, build_simple_output, BytesFormat}; +use crate::common::{BytesFormat, build_byte_input, build_simple_output}; use crate::url_query_params::generate_jwt_link; const DEFAULT_TEXT_FOR_RSA_PLACEHOLDER: &str = "RSA private/public key in PEM (-----BEGIN RSA PRIVATE/PUBLIC KEY-----)"; diff --git a/src/jwt/mod.rs b/src/jwt/mod.rs index fa83283a..5e499601 100644 --- a/src/jwt/mod.rs +++ b/src/jwt/mod.rs @@ -10,9 +10,9 @@ pub mod signature; use std::str::FromStr; use web_sys::{HtmlInputElement, KeyboardEvent}; -use yew::{function_component, html, use_effect_with, use_state, Callback, Html, TargetCast}; +use yew::{Callback, Html, TargetCast, function_component, html, use_effect_with, use_state}; use yew_hooks::{use_clipboard, use_local_storage, use_location}; -use yew_notifications::{use_notification, Notification, NotificationType}; +use yew_notifications::{Notification, NotificationType, use_notification}; use crate::common::Checkbox; use crate::jwt::jwt::editor::JwtEditor; diff --git a/src/lib.rs b/src/lib.rs index 91252dbd..7aff0fe9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,7 +25,7 @@ use footer::footer; use header::Header; use jwt::Jwt; use not_found::not_found; -use yew::{function_component, html, Html}; +use yew::{Html, function_component, html}; use yew_agent::oneshot::OneshotProvider; use yew_notifications::{Notification, NotificationFactory, NotificationsProvider}; use yew_router::{BrowserRouter, Routable, Switch}; diff --git a/src/not_found.rs b/src/not_found.rs index 05643b38..30992652 100644 --- a/src/not_found.rs +++ b/src/not_found.rs @@ -1,4 +1,4 @@ -use yew::{html, Html}; +use yew::{Html, html}; pub fn not_found() -> Html { html! { diff --git a/src/serde.rs b/src/serde.rs index 6a1cb240..74ac8af6 100644 --- a/src/serde.rs +++ b/src/serde.rs @@ -3,7 +3,7 @@ use std::fmt; use picky::key::{PrivateKey, PublicKey}; use rsa::pkcs1::{DecodeRsaPrivateKey, DecodeRsaPublicKey, EncodeRsaPrivateKey, EncodeRsaPublicKey}; use rsa::{RsaPrivateKey, RsaPublicKey}; -use serde::{de, Deserializer, Serializer}; +use serde::{Deserializer, Serializer, de}; pub fn serialize_bytes(bytes: &[u8], s: S) -> Result where diff --git a/src/utils.rs b/src/utils.rs index 9dea9078..233b43a0 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,5 +1,5 @@ -use base64::engine::GeneralPurpose; use base64::Engine; +use base64::engine::GeneralPurpose; use yew::Callback; use yew_hooks::UseClipboardHandle; use yew_notifications::{Notification, NotificationType, NotificationsManager}; From 539e888805379c225be4505783b10b41157d4f71 Mon Sep 17 00:00:00 2001 From: Pavlo Myroniuk Date: Wed, 13 Aug 2025 00:06:53 +0300 Subject: [PATCH 2/2] chore: update deps --- .cargo/config.toml | 2 + Cargo.lock | 121 ++++++++++++--------------------------------- Cargo.toml | 26 +++++----- 3 files changed, 49 insertions(+), 100 deletions(-) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..cb9ecf9e --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.wasm32-unknown-unknown] +rustflags = ['--cfg', 'getrandom_backend="wasm_js"'] \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index a445ac69..aee99c60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -102,7 +102,7 @@ dependencies = [ "base64ct", "blake2", "cpufeatures", - "password-hash 0.5.0", + "password-hash", ] [[package]] @@ -147,12 +147,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.22.1" @@ -167,13 +161,13 @@ checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bcrypt" -version = "0.15.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" +checksum = "92758ad6077e4c76a6cadbce5005f666df70d4f13b19976b1a8062eef880040f" dependencies = [ - "base64 0.22.1", + "base64", "blowfish", - "getrandom 0.2.16", + "getrandom 0.3.3", "subtle", "zeroize", ] @@ -360,9 +354,9 @@ dependencies = [ [[package]] name = "crypto" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d88231face754cdb045c1b65912a0f4ff78ca24bf371e30a4a8cfa993b3897" +checksum = "bf1e6e5492f8f0830c37f301f6349e0dac8b2466e4fe89eef90e9eef906cd046" dependencies = [ "crypto-common 0.1.6", ] @@ -404,16 +398,18 @@ version = "0.15.0" dependencies = [ "argon2", "asn1-parser", - "base64 0.22.1", + "base64", "bcrypt", "flate2", + "getrandom 0.2.16", + "getrandom 0.3.3", "gloo-timers 0.3.0", "hex", "hmac", "js-sys", "md5", "oid", - "password-hash 0.5.0", + "password-hash", "paste", "picky", "picky-krb", @@ -785,9 +781,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", ] [[package]] @@ -1443,9 +1441,9 @@ dependencies = [ [[package]] name = "md5" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" +checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" [[package]] name = "memchr" @@ -1630,17 +1628,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "password-hash" version = "0.5.0" @@ -1660,15 +1647,13 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", "hmac", - "password-hash 0.4.2", - "sha-1", - "sha2", + "sha1 0.10.6", ] [[package]] @@ -1692,7 +1677,7 @@ version = "7.0.0-rc.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ed0f61c4ac11274678ad0da95386c6216d6ff898ef98e54aac23d4a853c324c" dependencies = [ - "base64 0.22.1", + "base64", "digest 0.10.7", "ed25519-dalek", "hex", @@ -1701,9 +1686,9 @@ dependencies = [ "p256", "p384", "p521", - "picky-asn1 0.10.1", - "picky-asn1-der 0.5.2", - "picky-asn1-x509 0.14.5", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", "rand 0.8.5", "rand_core 0.6.4", "rsa", @@ -1716,16 +1701,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "picky-asn1" -version = "0.7.0" -source = "git+https://github.com/TheBestTravynka/picky-rs.git?rev=604a246#604a2461571ae5c3371a4b34691fa0c4fea091b4" -dependencies = [ - "oid", - "serde", - "serde_bytes", -] - [[package]] name = "picky-asn1" version = "0.10.1" @@ -1738,58 +1713,37 @@ dependencies = [ "zeroize", ] -[[package]] -name = "picky-asn1-der" -version = "0.4.0" -source = "git+https://github.com/TheBestTravynka/picky-rs.git?rev=604a246#604a2461571ae5c3371a4b34691fa0c4fea091b4" -dependencies = [ - "picky-asn1 0.7.0", - "serde", - "serde_bytes", -] - [[package]] name = "picky-asn1-der" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dccb53c26f70c082e008818f524bd45d057069517b047bd0c0ee062d6d7d7f2" dependencies = [ - "picky-asn1 0.10.1", + "picky-asn1", "serde", "serde_bytes", ] -[[package]] -name = "picky-asn1-x509" -version = "0.9.0" -source = "git+https://github.com/TheBestTravynka/picky-rs.git?rev=604a246#604a2461571ae5c3371a4b34691fa0c4fea091b4" -dependencies = [ - "base64 0.13.1", - "oid", - "picky-asn1 0.7.0", - "picky-asn1-der 0.4.0", - "serde", -] - [[package]] name = "picky-asn1-x509" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444990fc9e53de47353c95e6521a5f669676da986a10482ff3708bdaa1a2a4b" dependencies = [ - "base64 0.22.1", + "base64", "num-bigint-dig", "oid", - "picky-asn1 0.10.1", - "picky-asn1-der 0.5.2", + "picky-asn1", + "picky-asn1-der", "serde", "zeroize", ] [[package]] name = "picky-krb" -version = "0.5.0" -source = "git+https://github.com/TheBestTravynka/picky-rs.git?rev=604a246#604a2461571ae5c3371a4b34691fa0c4fea091b4" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45ffe5f2122cdda5e9059ab837a65ba1b77729db43fc1500f2fce6b27070eab" dependencies = [ "aes", "byteorder", @@ -1800,9 +1754,9 @@ dependencies = [ "num-bigint-dig", "oid", "pbkdf2", - "picky-asn1 0.7.0", - "picky-asn1-der 0.4.0", - "picky-asn1-x509 0.9.0", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", "rand 0.8.5", "serde", "sha1 0.10.6", @@ -2345,17 +2299,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha1" version = "0.10.6" diff --git a/Cargo.toml b/Cargo.toml index 08d88131..81eafe82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,17 +49,17 @@ base64 = "0.22" time = { version = "0.3", features = ["local-offset", "wasm-bindgen"] } # crypto -picky-krb = { git = "https://github.com/TheBestTravynka/picky-rs.git", rev = "604a246" } -picky = { version = "7.0.0-rc.8", default-features = false } -md5 = "0.7" -sha1 = "0.11.0-pre.3" -sha2 = "0.10.8" -hmac = "0.12.1" +picky-krb = "0.11" +picky = { version = "7.0.0-rc.16", default-features = false } +md5 = "0.8" +sha1 = "0.11.0-rc.0" +sha2 = "0.10" +hmac = "0.12" 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_chacha = { version = "0.9.0-alpha.0", default-features = false } +bcrypt = { version = "0.17" } +flate2 = { version = "1.1", features = ["zlib"] } +rand = { version = "0.9", default-features = false, features = ["small_rng"] } +rand_chacha = { version = "0.9", default-features = false } argon2 = "0.5" password-hash = "0.5" @@ -69,4 +69,8 @@ oid = { version = "0.2", default-features = false } paste = "1.0" # diff -similar = { version = "2.4", features = ["serde"] } +similar = { version = "2.7", features = ["serde"] } + +[target.'cfg(target_arch = "wasm32")'.dependencies] +getrandom_3 = { package = "getrandom", version = "0.3", features = ["wasm_js"]} +getrandom_2 = { package = "getrandom", version = "0.2", features = ["js"]} \ No newline at end of file