summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2023-03-13 12:40:59 +0100
committerJustus Winter <justus@sequoia-pgp.org>2023-03-13 12:40:59 +0100
commit9aa0ff88061fb3bcec4927aaff09a43657f4f07d (patch)
tree17618268f68a9bad0b4ff3a95c8110bec97b9bf7
parent4dc6e624c2394936dc447f18aedb4a4810bb2ddb (diff)
openpgp: Bump botan to 0.10.1 to avoid raising our MSRV.
-rw-r--r--.gitlab-ci.yml9
-rw-r--r--Cargo.lock8
-rw-r--r--openpgp/README.md2
3 files changed, 6 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d3ae64f..8d192704 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,17 +113,12 @@ fedora-crypto-openssl:
CARGO_TARGET_DIR: /target
CARGO_HOME: /cargo
-rust-stable-crypto-botan:
+bookworm-crypto-botan:
tags:
- linux
stage: build
interruptible: true
- image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
- before_script:
- - *before_script_start
- - apt -y install libbotan-2-dev
- - rustup override set stable
- - *before_script_end
+ image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
script:
- cargo run --manifest-path openpgp/Cargo.toml --no-default-features --features crypto-botan,compression --example supported-algorithms
- cargo test --manifest-path openpgp/Cargo.toml --no-default-features --features crypto-botan,compression
diff --git a/Cargo.lock b/Cargo.lock
index 7ba2fd59..870991c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -214,18 +214,18 @@ dependencies = [
[[package]]
name = "botan"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca148eb4be2a336a57efb859f664847cb1d268649e4a6032c5b16f21e8fd5027"
+checksum = "3e8d21360858787fe89f8bf6cd7e4c33c23808c594e309cf419d80edaacac78b"
dependencies = [
"botan-sys",
]
[[package]]
name = "botan-sys"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b986825430fa1dff571f2dc36562a7a228b98c42e9f9552727c60a4a16de6555"
+checksum = "494d97cac1c95bf3043ec3569cc6c0724d541dd795b03af293818cf00b9f216c"
[[package]]
name = "bstr"
diff --git a/openpgp/README.md b/openpgp/README.md
index ecf3eb61..990883a7 100644
--- a/openpgp/README.md
+++ b/openpgp/README.md
@@ -84,8 +84,6 @@ at compile time. Currently, these libraries are available:
`default-features = false`, and explicitly include the
`crypto-botan` feature to enable it.
- **Note**: Using the Botan backend raises the MSRV to 1.64.
-
- The Windows Cryptography API: Next Generation (CNG). To select
this backend, use `default-features = false`, and explicitly
include the `crypto-cng` feature to enable it. Currently, the CNG