diff --git a/Cargo.lock b/Cargo.lock index cf619001163de2641a82bee6d0dc5f4ff19d2e50..7c6f5b337a0291c29fabb5a789642f61cff6a50c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -173,8 +173,6 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0dd286184b392a1ce6b3deecd073f0330df194bf935b87f852147d50d0d2d18" dependencies = [ - "bzip2", - "flate2", "lazy_static", "libc", ] @@ -191,27 +189,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cc" version = "1.0.79" @@ -303,15 +280,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -539,16 +507,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "generic-array" version = "0.14.6" @@ -611,14 +569,17 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hashlink" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ - "hashbrown 0.11.2", + "hashbrown 0.12.3", ] [[package]] @@ -768,9 +729,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libsqlite3-sys" -version = "0.22.2" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" dependencies = [ "cc", "pkg-config", @@ -1156,16 +1117,15 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.25.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4b1eaf239b47034fb450ee9cdedd7d0226571689d8823030c4b6c2cb407152" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" dependencies = [ "bitflags", "fallible-iterator", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "memchr", "smallvec", ] @@ -1208,12 +1168,10 @@ dependencies = [ "anyhow", "base64", "buffered-reader", - "bzip2", "chrono", "dyn-clone", "eax", "ed25519-dalek", - "flate2", "getrandom 0.2.8", "idna", "lalrpop", diff --git a/Cargo.toml b/Cargo.toml index d6823e43131847ca274ac180b1a2f83f93805704..648ec8aed6f676f9a0d8c2cecf80dd13b2a905ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,19 +27,24 @@ memmem = "0.1" memoffset = "0.6" # When bumping the version of Sequoia search the code for XXX to find # spots where we can take advantage of new features. -sequoia-openpgp = { version = "1.0", default-features = false } +sequoia-openpgp = { version = "1.0", default-features = false, features = ["compression"] } thiserror = "1" [dependencies.rusqlite] -version = "0.25" +version = "0.28" features = ["bundled", "collation", "blob"] [lib] crate-type = ["lib", "cdylib", "staticlib"] -[features] -default = [ - "sequoia-openpgp/default", -] -crypto-nettle = ["sequoia-openpgp/crypto-nettle"] -crypto-cng = ["sequoia-openpgp/crypto-cng"] +[target.'cfg(not(windows))'.dev-dependencies] +# Enables a crypto backend for the tests: +sequoia-openpgp = { version = "1", default-features = false, features = ["crypto-nettle"] } + +[target.'cfg(windows)'.dev-dependencies] +# Enables a crypto backend for the tests: +sequoia-openpgp = { version = "1", default-features = false, features = ["crypto-cng"] } + +[package.metadata.docs.rs] +# Enables a crypto backend for the docs.rs generation: +features = ["sequoia-openpgp/default"]