From 3c3051e31eec835cf492fa9db5e45292c152eb60 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Mon, 13 Feb 2023 13:32:44 +0100 Subject: [PATCH 1/2] openpgp-card-sequoia: Allow disabling default crypto backend. Previously the list of features of `sequoia-openpgp` unconditionally included `crypto-nettle`. That was preventing the use of this crate in pure Rust setups. This commit allows disabling crypto backends and it is up to the crate user to explicitly include `sequoia_openpgp` features that they want. See: https://gitlab.com/sequoia-pgp/sequoia/-/blob/main/README.md#note --- openpgp-card-sequoia/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpgp-card-sequoia/Cargo.toml b/openpgp-card-sequoia/Cargo.toml index 834be87..10d5c16 100644 --- a/openpgp-card-sequoia/Cargo.toml +++ b/openpgp-card-sequoia/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://gitlab.com/openpgp-card/openpgp-card" documentation = "https://docs.rs/crate/openpgp-card-sequoia" [dependencies] -sequoia-openpgp = "1.4" +sequoia-openpgp = { version = "1.4", default-features = false } openpgp-card = { path = "../openpgp-card", version = "0.3.3" } chrono = "0.4" anyhow = "1" @@ -26,5 +26,8 @@ openpgp-card-pcsc = { path = "../pcsc", version = "0.3" } env_logger = "0.9" testresult = "0.3.0" +[features] +default = ["sequoia-openpgp/default"] + [[example]] name = "test" From 6c3163da4be50bc7ac674d9adcc385f66e370461 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Tue, 14 Feb 2023 16:22:02 +0100 Subject: [PATCH 2/2] CI: Install cargo-udeps in a more straightforward way --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4dae0d4..7d4e1f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,8 +88,7 @@ udeps: - apt update -y -qq - apt install -y -qq --no-install-recommends curl git clang make pkg-config nettle-dev libssl-dev capnproto ca-certificates libpcsclite-dev - apt clean - - curl --location --output /tmp/cargo-udeps.tar.gz https://github.com/est31/cargo-udeps/releases/download/v0.1.33/cargo-udeps-v0.1.33-x86_64-unknown-linux-gnu.tar.gz - - tar --extract --verbose --gzip --file /tmp/cargo-udeps.tar.gz --directory /usr/local/bin/ --strip-components=2 ./cargo-udeps-v0.1.33-x86_64-unknown-linux-gnu/cargo-udeps + - cargo install cargo-udeps script: - cargo udeps --workspace --all-features --all-targets cache: [ ]