diff --git a/Cargo.lock b/Cargo.lock index 5c2366d39..9b83d4545 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] @@ -124,7 +124,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_tuple", - "sha1 0.6.1", + "sha1", "slog", "slog-async", "slog-envlogger", @@ -140,8 +140,8 @@ dependencies = [ "utime", "which", "workspace-hack", - "zip 0.6.3", - "zstd", + "zip", + "zstd 0.12.0+zstd.1.5.2", ] [[package]] @@ -181,13 +181,13 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "apple-bundles" -version = "0.6.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48681b45ff6789616b243c0758d6d97639951f937ccc0ea635363505d72cdec3" +checksum = "0238f9d073644a0a9f37447376330bfc62a0e11686adbee14afbb4bcef186bc7" dependencies = [ "anyhow", "plist", - "tugger-file-manifest", + "simple-file-manifest", "walkdir", ] @@ -204,13 +204,13 @@ dependencies = [ "camino", "flate2", "reqwest", - "sha2 0.10.6", + "sha2", "tar", "tokio", "workspace-hack", "xz2", - "zip 0.6.3", - "zstd", + "zip", + "zstd 0.12.0+zstd.1.5.2", ] [[package]] @@ -297,16 +297,7 @@ dependencies = [ "cc", "cfg-if", "constant_time_eq 0.2.4", - "digest 0.10.6", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", + "digest", ] [[package]] @@ -318,21 +309,14 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-modes" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" -dependencies = [ - "block-padding", - "cipher", -] - [[package]] name = "block-padding" -version = "0.2.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" +dependencies = [ + "generic-array", +] [[package]] name = "bstr" @@ -397,6 +381,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher 0.4.3", +] + [[package]] name = "cc" version = "1.0.77" @@ -463,6 +456,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clap" version = "3.2.23" @@ -695,12 +698,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -713,16 +715,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "cssparser" version = "0.27.2" @@ -829,22 +821,11 @@ dependencies = [ [[package]] name = "des" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d" +checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" dependencies = [ - "byteorder", - "cipher", - "opaque-debug", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", + "cipher 0.4.3", ] [[package]] @@ -853,7 +834,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", "crypto-common", "subtle", ] @@ -952,12 +933,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -1384,23 +1365,13 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest", ] [[package]] @@ -1605,6 +1576,16 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -1863,7 +1844,7 @@ dependencies = [ "plist", "serde", "serde_json", - "tugger-file-manifest", + "simple-file-manifest", "walkdir", "workspace-hack", ] @@ -1876,8 +1857,6 @@ dependencies = [ "camino", "clap 4.0.29", "glob", - "slog", - "slog-term", "tugger-windows-codesign", "walkdir", "workspace-hack", @@ -2219,17 +2198,18 @@ checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "p12" -version = "0.3.3" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10105b08ad3c4cd872ddf396860544f9dbc1800fed7d552f10aa5b585ac79e1d" +checksum = "d4873306de53fe82e7e484df31e1e947d61514b6ea2ed6cd7b45d63006fd9224" dependencies = [ - "block-modes", + "cbc", + "cipher 0.4.3", "des", "getrandom 0.2.8", - "hmac 0.11.0", + "hmac", "lazy_static", "rc2", - "sha-1", + "sha1", "yasna", ] @@ -2273,10 +2253,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", - "hmac 0.12.1", + "digest", + "hmac", "password-hash", - "sha2 0.10.6", + "sha2", ] [[package]] @@ -2494,7 +2474,7 @@ dependencies = [ "indexmap", "line-wrap", "serde", - "time 0.3.15", + "time 0.3.17", "xml-rs", ] @@ -2852,23 +2832,22 @@ dependencies = [ [[package]] name = "rc2" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f197c283075d1345c20d5ad172526a7837882cdc998b1fcd2b2f3cfff1cb94" +checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" dependencies = [ - "cipher", - "opaque-debug", + "cipher 0.4.3", ] [[package]] name = "rcgen" -version = "0.8.14" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ - "chrono", "pem", "ring", + "time 0.3.17", "yasna", ] @@ -3285,28 +3264,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - [[package]] name = "sha1" version = "0.10.5" @@ -3315,26 +3272,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] @@ -3345,7 +3283,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest", ] [[package]] @@ -3367,6 +3305,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simple-file-manifest" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd19be0257552dd56d1bb6946f89f193c6e5b9f13cc9327c4bc84a357507c74" + [[package]] name = "siphasher" version = "0.3.10" @@ -3447,7 +3391,7 @@ dependencies = [ "slog", "term", "thread_local", - "time 0.3.15", + "time 0.3.17", ] [[package]] @@ -3700,21 +3644,32 @@ dependencies = [ [[package]] name = "time" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa 1.0.4", "libc", "num_threads", + "serde", + "time-core", "time-macros", ] [[package]] -name = "time-macros" -version = "0.2.4" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] [[package]] name = "tinystr" @@ -3880,34 +3835,28 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tugger-common" -version = "0.5.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a7438a6e6ed337853dfeb03e3eb463c25d60141186b65363a1dfa3ed8fa6bab" +checksum = "825d3a3de05922acfe17d28a8dd934288a73c725a6090412235947ddc5025fa2" dependencies = [ "anyhow", "fs2", "glob", "hex", + "log", "once_cell", "reqwest", - "sha2 0.9.9", - "slog", + "sha2", "tempfile", "url", - "zip 0.5.13", + "zip", ] -[[package]] -name = "tugger-file-manifest" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e91ac69050080a0a9fd50af05da5baa8562347ca7b8909f8ed3adbc6ef026f" - [[package]] name = "tugger-windows" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862f31d91b88b479a2671584a9772f81ec3d21b8314adc4fdf17619b12f8750c" +checksum = "1d6f0ea27028aded9a0c6bf5b53ff0bf628c58bf383b60bd19a86429d0538cfa" dependencies = [ "anyhow", "duct", @@ -3921,16 +3870,16 @@ dependencies = [ [[package]] name = "tugger-windows-codesign" -version = "0.6.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fe75b7e13b3ba9d95001be2f5a0b5bd1246d38492f5658fd5e90c1006eed00" +checksum = "2ea62dcbcbab8703910e0dd586c09175bae7560d2bf9691b543cb734e4f37ac7" dependencies = [ "anyhow", - "chrono", "duct", + "log", "p12", "rcgen", - "slog", + "time 0.3.17", "tugger-common", "tugger-windows", "yasna", @@ -4440,17 +4389,14 @@ dependencies = [ "bstr", "bytes", "cc", - "chrono", "crossbeam-utils", "either", "flate2", - "generic-array", "getrandom 0.2.8", "hashbrown", + "hmac", "indexmap", "log", - "nodrop", - "num-integer", "num-traits", "phf_shared 0.11.1", "prost", @@ -4460,16 +4406,16 @@ dependencies = [ "regex-syntax", "scopeguard", "serde", - "sha2 0.10.6", - "slog", + "sha2", "snafu", "syn", - "time 0.3.15", + "time 0.3.17", + "time-macros", "tokio", "url", - "zip 0.6.3", - "zstd", - "zstd-safe", + "zip", + "zstd 0.12.0+zstd.1.5.2", + "zstd-safe 6.0.2+zstd.1.5.2", "zstd-sys", ] @@ -4499,25 +4445,11 @@ dependencies = [ [[package]] name = "yasna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75" +checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" dependencies = [ - "chrono", -] - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "bzip2", - "crc32fast", - "flate2", - "thiserror", - "time 0.1.45", + "time 0.3.17", ] [[package]] @@ -4533,11 +4465,11 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "hmac 0.12.1", + "hmac", "pbkdf2", - "sha1 0.10.5", - "time 0.3.15", - "zstd", + "sha1", + "time 0.3.17", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -4546,7 +4478,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.0+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8148aa921e9d53217ab9322f8553bd130f7ae33489db68b381d76137d2e6374" +dependencies = [ + "zstd-safe 6.0.2+zstd.1.5.2", ] [[package]] @@ -4559,6 +4500,16 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.4+zstd.1.5.2" diff --git a/build/archives/Cargo.toml b/build/archives/Cargo.toml index d4c68eddf..a7fda4cb7 100644 --- a/build/archives/Cargo.toml +++ b/build/archives/Cargo.toml @@ -17,7 +17,7 @@ tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] } workspace-hack = { version = "0.1", path = "../../tools/workspace-hack" } xz2 = "0.1.7" zip = "0.6.3" -zstd = "0.11.2" +zstd = "0.12.0" [features] rustls = ["reqwest/rustls-tls", "reqwest/rustls-tls-native-roots"] diff --git a/qt/bundle/mac/Cargo.toml b/qt/bundle/mac/Cargo.toml index d9636e8ef..8d483c3d4 100644 --- a/qt/bundle/mac/Cargo.toml +++ b/qt/bundle/mac/Cargo.toml @@ -10,7 +10,7 @@ rust-version.workspace = true [dependencies] anyhow = "1.0.66" -apple-bundles = "0.6.0" +apple-bundles = "0.15.0" camino = "1.1.1" clap = { version = "4.0.29", features = ["derive"] } glob = "0.3.0" @@ -18,6 +18,6 @@ lazy_static = "1.4.0" plist = "1.3.1" serde = { version = "1.0.148", features = ["derive"] } serde_json = "1.0.89" -tugger-file-manifest = "0.6.0" +simple-file-manifest = "0.11.0" walkdir = "2.3.2" workspace-hack = { version = "0.1", path = "../../../tools/workspace-hack" } diff --git a/qt/bundle/mac/src/main.rs b/qt/bundle/mac/src/main.rs index cbd16d9c5..91cb49ab0 100644 --- a/qt/bundle/mac/src/main.rs +++ b/qt/bundle/mac/src/main.rs @@ -20,7 +20,7 @@ use codesign::{codesign_app, codesign_python_libs}; use dmg::{make_dmgs, BuildDmgsArgs}; use notarize::notarize_app; use plist::Value; -use tugger_file_manifest::FileEntry; +use simple_file_manifest::FileEntry; use walkdir::WalkDir; #[derive(Clone, ValueEnum)] diff --git a/qt/bundle/win/Cargo.toml b/qt/bundle/win/Cargo.toml index 68031759a..726ce195d 100644 --- a/qt/bundle/win/Cargo.toml +++ b/qt/bundle/win/Cargo.toml @@ -13,8 +13,6 @@ anyhow = "1.0.66" camino = "1.1.1" clap = { version = "4.0.29", features = ["derive"] } glob = "0.3.0" -slog = "2.7.0" -slog-term = "2.9.0" -tugger-windows-codesign = "0.6.0" +tugger-windows-codesign = "0.9.0" walkdir = "2.3.2" workspace-hack = { version = "0.1", path = "../../../tools/workspace-hack" } diff --git a/qt/bundle/win/src/main.rs b/qt/bundle/win/src/main.rs index 1d507cbdc..feb979d57 100644 --- a/qt/bundle/win/src/main.rs +++ b/qt/bundle/win/src/main.rs @@ -6,7 +6,6 @@ use std::{fs, io::prelude::*, path::Path, process::Command}; use anyhow::{bail, Context, Result}; use camino::{Utf8Path, Utf8PathBuf}; use clap::Parser; -use slog::*; use tugger_windows_codesign::{CodeSigningCertificate, SigntoolSign, SystemStore, TimestampServer}; use walkdir::WalkDir; @@ -19,9 +18,6 @@ struct Args { } fn main() -> anyhow::Result<()> { - let plain = slog_term::PlainSyncDecorator::new(std::io::stdout()); - let logger = Logger::root(slog_term::FullFormat::new(plain).build().fuse(), o!()); - let args = Args::parse(); let src_win_folder = Utf8Path::new("qt/bundle/win"); @@ -53,13 +49,10 @@ fn main() -> anyhow::Result<()> { // sign the anki.exe and uninstaller.exe in std, then copy into alt println!("--- Sign binaries"); - codesign( - &logger, - [ - &std_dist_folder.join("anki.exe"), - &std_dist_folder.join("uninstall.exe"), - ], - )?; + codesign([ + &std_dist_folder.join("anki.exe"), + &std_dist_folder.join("uninstall.exe"), + ])?; for fname in &["anki.exe", "uninstall.exe"] { fs::copy(std_dist_folder.join(fname), alt_dist_folder.join(fname)) .with_context(|| format!("copy {fname}"))?; @@ -76,7 +69,7 @@ fn main() -> anyhow::Result<()> { } println!("--- Sign installers"); - codesign(&logger, dists.iter().map(|tup| tup.1))?; + codesign(dists.iter().map(|tup| tup.1))?; Ok(()) } @@ -114,7 +107,7 @@ fn build_installer( Ok(()) } -fn codesign(logger: &Logger, paths: impl IntoIterator>) -> Result<()> { +fn codesign(paths: impl IntoIterator>) -> Result<()> { if option_env!("ANKI_CODESIGN").is_none() { return Ok(()); } @@ -132,7 +125,7 @@ fn codesign(logger: &Logger, paths: impl IntoIterator>) paths.into_iter().for_each(|path| { sign.sign_file(path); }); - sign.run(logger) + sign.run() } fn build_manifest(base_path: &Utf8Path) -> Result<()> { diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index f99871725..683cd3dca 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -31,7 +31,7 @@ prost-build = "0.11.3" which = "4.3.0" [dev-dependencies] -env_logger = "0.9.3" +env_logger = "0.10.0" tokio = { version = "1.22", features = ["macros"] } [dependencies.reqwest] @@ -88,7 +88,7 @@ serde_derive = "1.0.148" serde_json = "1.0.89" serde_repr = "0.1.9" serde_tuple = "0.5.0" -sha1 = "0.6.1" +sha1 = "0.10.5" slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_debug"] } slog-async = "2.7.0" slog-envlogger = "2.2.0" @@ -103,4 +103,4 @@ unicode-normalization = "0.1.22" utime = "0.3.1" workspace-hack = { version = "0.1", path = "../tools/workspace-hack" } zip = { version = "0.6.3", default-features = false, features = ["deflate", "time"] } -zstd = { version = "0.11.2", features = ["zstdmt"] } +zstd = { version = "0.12.0", features = ["zstdmt"] } diff --git a/rslib/src/import_export/package/apkg/import/notes.rs b/rslib/src/import_export/package/apkg/import/notes.rs index 987ceda39..00ecaa8c5 100644 --- a/rslib/src/import_export/package/apkg/import/notes.rs +++ b/rslib/src/import_export/package/apkg/import/notes.rs @@ -8,7 +8,7 @@ use std::{ sync::Arc, }; -use sha1::Sha1; +use sha1::{Digest, Sha1}; use super::{media::MediaUseMap, Context}; use crate::{ @@ -285,7 +285,7 @@ impl Notetype { for template in &self.templates { hasher.update(template.name.as_bytes()); } - hasher.digest().bytes() + hasher.finalize().into() } } diff --git a/rslib/src/import_export/package/colpkg/export.rs b/rslib/src/import_export/package/colpkg/export.rs index eaeef76b9..55fdbe273 100644 --- a/rslib/src/import_export/package/colpkg/export.rs +++ b/rslib/src/import_export/package/colpkg/export.rs @@ -11,7 +11,7 @@ use std::{ }; use prost::Message; -use sha1::Sha1; +use sha1::{Digest, Sha1}; use tempfile::NamedTempFile; use zip::{write::FileOptions, CompressionMethod, ZipWriter}; use zstd::{ @@ -359,7 +359,7 @@ impl MediaCopier { self.encoder = wrapped_writer.finish()?; - Ok((size, hasher.digest().bytes())) + Ok((size, hasher.finalize().into())) } } diff --git a/rslib/src/media/files.rs b/rslib/src/media/files.rs index ab3178770..bd565b78c 100644 --- a/rslib/src/media/files.rs +++ b/rslib/src/media/files.rs @@ -11,7 +11,7 @@ use std::{ use lazy_static::lazy_static; use regex::Regex; -use sha1::Sha1; +use sha1::{Digest, Sha1}; use unic_ucd_category::GeneralCategory; use unicode_normalization::{is_nfc, UnicodeNormalization}; @@ -297,14 +297,14 @@ pub(crate) fn sha1_of_reader(reader: &mut impl Read) -> std::io::Result return Err(e), }; } - Ok(hasher.digest().bytes()) + Ok(hasher.finalize().into()) } /// Return the SHA1 of provided data. pub(crate) fn sha1_of_data(data: &[u8]) -> Sha1Hash { let mut hasher = Sha1::new(); hasher.update(data); - hasher.digest().bytes() + hasher.finalize().into() } pub(super) fn mtime_as_i64>(path: P) -> io::Result { diff --git a/rslib/src/notes/mod.rs b/rslib/src/notes/mod.rs index 3d535e13d..9b29ff8ea 100644 --- a/rslib/src/notes/mod.rs +++ b/rslib/src/notes/mod.rs @@ -10,6 +10,7 @@ use std::{ use itertools::Itertools; use num_integer::Integer; +use sha1::{Digest, Sha1}; use crate::{ cloze::contains_cloze, @@ -290,7 +291,9 @@ impl From for Note { /// Text must be passed to strip_html_preserving_media_filenames() by /// caller prior to passing in here. pub(crate) fn field_checksum(text: &str) -> u32 { - let digest = sha1::Sha1::from(text).digest().bytes(); + let mut hash = Sha1::new(); + hash.update(text); + let digest = hash.finalize(); u32::from_be_bytes(digest[..4].try_into().unwrap()) } diff --git a/tools/workspace-hack/Cargo.toml b/tools/workspace-hack/Cargo.toml index 961108ae3..9bc791fc2 100644 --- a/tools/workspace-hack/Cargo.toml +++ b/tools/workspace-hack/Cargo.toml @@ -16,17 +16,14 @@ description = "workspace-hack package, managed by hakari" [dependencies] bstr = { version = "0.2", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] } bytes = { version = "1", features = ["std"] } -chrono = { version = "0.4", features = ["alloc", "clock", "iana-time-zone", "js-sys", "oldtime", "std", "time", "wasm-bindgen", "wasmbind", "winapi"] } -crossbeam-utils = { version = "0.8", features = ["once_cell", "std"] } +crossbeam-utils = { version = "0.8", features = ["std"] } either = { version = "1", features = ["use_std"] } flate2 = { version = "1", features = ["miniz_oxide", "rust_backend"] } -generic-array = { version = "0.14", default-features = false, features = ["more_lengths"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hashbrown = { version = "0.12", features = ["ahash", "inline-more", "raw"] } +hmac = { version = "0.12", default-features = false, features = ["reset"] } indexmap = { version = "1", default-features = false, features = ["std"] } log = { version = "0.4", default-features = false, features = ["std"] } -nodrop = { version = "0.1", features = ["std"] } -num-integer = { version = "0.1", features = ["std"] } num-traits = { version = "0.2", features = ["std"] } phf_shared = { version = "0.11", default-features = false, features = ["std"] } prost = { version = "0.11", features = ["prost-derive", "std"] } @@ -37,14 +34,13 @@ regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode scopeguard = { version = "1", features = ["use_std"] } serde = { version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] } sha2 = { version = "0.10", features = ["std"] } -slog = { version = "2", features = ["max_level_trace", "release_max_level_debug", "std"] } snafu = { version = "0.7", features = ["backtrace", "backtraces", "rust_1_39", "rust_1_46", "std"] } -time = { version = "0.3", features = ["alloc", "formatting", "itoa", "local-offset", "macros", "parsing", "std", "time-macros"] } +time = { version = "0.3", features = ["alloc", "formatting", "local-offset", "macros", "parsing", "std"] } tokio = { version = "1", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros"] } url = { version = "2", features = ["serde"] } zip = { version = "0.6", features = ["aes", "aes-crypto", "bzip2", "constant_time_eq", "deflate", "flate2", "hmac", "pbkdf2", "sha1", "time", "zstd"] } -zstd = { version = "0.11", features = ["arrays", "legacy", "zdict_builder", "zstdmt"] } -zstd-safe = { version = "5", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder", "zstdmt"] } +zstd = { version = "0.12", features = ["arrays", "legacy", "zdict_builder", "zstdmt"] } +zstd-safe = { version = "6", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder", "zstdmt"] } zstd-sys = { version = "2", default-features = false, features = ["legacy", "std", "zdict_builder", "zstdmt"] } [build-dependencies] @@ -63,5 +59,6 @@ regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cac regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } serde = { version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] } syn = { version = "1", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit-mut"] } +time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing"] } ### END HAKARI SECTION