From 1c0a88e1b2057784ab597dfd6453a27a0266d518 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@walfield.org>
Date: Thu, 13 Apr 2023 00:45:03 +0200
Subject: [PATCH] Make the botan backend the default

---
 .gitlab-ci.yml                   | 5 +++++
 Cargo.toml                       | 2 +-
 NMakefile                        | 2 +-
 README.md                        | 4 ++--
 pep_engine_sequoia_backend.pc.in | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac960a7..0fa6732 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,7 @@ bookworm:
   needs:
     - codespell
   script:
+    - apt update && apt install -y libbotan-2-dev
     - cargo test
   variables:
     CARGO_TARGET_DIR: /target
@@ -68,6 +69,7 @@ makefile:
   needs:
     - codespell
   script:
+    - apt update && apt install -y libbotan-2-dev
     - make build
     - make test
     - make clean
@@ -84,6 +86,7 @@ all_commits:
   image: registry.gitlab.com/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
   needs: ["rust-stable"]
   script:
+    - apt update && apt install -y libbotan-2-dev
     - .ci/all_commits.sh
   variables:
     CARGO_TARGET_DIR: /target
@@ -114,6 +117,7 @@ rust-stable:
     - rustup override set stable
     - *before_script_end
   script:
+    - apt update && apt install -y libbotan-2-dev
     - cargo test
   variables:
     CARGO_TARGET_DIR: /target
@@ -129,6 +133,7 @@ rust-stable-armv7:
     - cat .ci/snippet_for_cross_compilation_config.toml >> .cargo/config.toml
     - *before_script_end
   script:
+    - apt update && apt install -y libbotan-2-dev
     - cargo test
   variables:
     CARGO_TARGET_DIR: /target
diff --git a/Cargo.toml b/Cargo.toml
index b36765b..4207d69 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ crate-type = ["lib", "cdylib", "staticlib"]
 
 [features]
 default = [
-    "sequoia-openpgp/default",
+    "crypto-botan",
 ]
 crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
 crypto-botan = ["sequoia-openpgp/crypto-botan"]
diff --git a/NMakefile b/NMakefile
index e71e12b..3035cd6 100644
--- a/NMakefile
+++ b/NMakefile
@@ -23,7 +23,7 @@ CARGOFLAGS=--release
 !ENDIF
 
 build:
-	$(CARGO) build --features crypto-cng --no-default-features $(CARGOFLAGS)
+	$(CARGO) build --features crypto-botan --no-default-features $(CARGOFLAGS)
 	@echo.
 	@echo Built $(TARGET)
 
diff --git a/README.md b/README.md
index 9ce7c28..7500a36 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,8 @@ variable.
 
 ## Windows
 
-On Windows, the Sequoia PGP backend for the pEp engine uses the CNG
-backend.
+On Windows, the Sequoia PGP backend for the pEp engine also uses the
+Botan backend.
 
 ### Use the Visual Studio compatible Rust compiler
 
diff --git a/pep_engine_sequoia_backend.pc.in b/pep_engine_sequoia_backend.pc.in
index 0fd349d..de8cd24 100644
--- a/pep_engine_sequoia_backend.pc.in
+++ b/pep_engine_sequoia_backend.pc.in
@@ -5,6 +5,6 @@ Name: pEpEngineSequoiaBackend
 Description: An implementation of the pEp Engine's crypttext interface using Sequoia
 URL: https://sequoia-pgp.org/
 Version: VERSION
-Requires: nettle
+Requires: botan-2
 Cflags:
 Libs: -L${libdir} -lpep_engine_sequoia_backend
-- 
GitLab