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