summaryrefslogtreecommitdiffstats
path: root/openpgp/src/crypto
diff options
context:
space:
mode:
authorAlexander Kjäll <alexander.kjall@gmail.com>2023-05-09 16:52:12 +0200
committerNeal H. Walfield <neal@pep.foundation>2023-05-15 13:12:55 +0200
commit013bbc3983d7eade008e9b5936f9d9d95aa75283 (patch)
tree921be407a91555479264de98d2194c2df6e2f145 /openpgp/src/crypto
parentc9d5e495e4f9c682c22f1b9c02e7679ad97e4637 (diff)
openpgp: Change crypto-botan to use botan v3.
- Version 3 of Botan was release in April 2023. It is already distributed by Arch. Switch crypto-botan to select the v3 interface. - Introduce the `crypto-botan2` feature to use Botan with Botan's v2 interface.
Diffstat (limited to 'openpgp/src/crypto')
-rw-r--r--openpgp/src/crypto/backend.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/openpgp/src/crypto/backend.rs b/openpgp/src/crypto/backend.rs
index 7cae8a8a..2aecfb69 100644
--- a/openpgp/src/crypto/backend.rs
+++ b/openpgp/src/crypto/backend.rs
@@ -15,12 +15,14 @@ pub(crate) mod sha1cd;
not(all(feature = "__implicit-crypto-backend-for-tests",
any(feature = "crypto-openssl",
feature = "crypto-botan",
+ feature = "crypto-botan2",
feature = "crypto-rust")))))]
mod nettle;
#[cfg(all(feature = "crypto-nettle",
not(all(feature = "__implicit-crypto-backend-for-tests",
any(feature = "crypto-openssl",
feature = "crypto-botan",
+ feature = "crypto-botan2",
feature = "crypto-rust")))))]
pub use self::nettle::*;
@@ -37,6 +39,7 @@ pub use self::nettle::*;
any(feature = "crypto-nettle",
feature = "crypto-openssl",
feature = "crypto-botan",
+ feature = "crypto-botan2",
feature = "crypto-rust")))))]
mod cng;
#[cfg(all(feature = "crypto-cng",
@@ -44,6 +47,7 @@ mod cng;
any(feature = "crypto-nettle",
feature = "crypto-openssl",
feature = "crypto-botan",
+ feature = "crypto-botan2",
feature = "crypto-rust")))))]
pub use self::cng::*;
@@ -57,7 +61,7 @@ mod openssl;
#[cfg(feature = "crypto-openssl")]
pub use self::openssl::*;
-#[cfg(feature = "crypto-botan")]
+#[cfg(any(feature = "crypto-botan", feature = "crypto-botan2"))]
mod botan;
-#[cfg(feature = "crypto-botan")]
+#[cfg(any(feature = "crypto-botan", feature = "crypto-botan2"))]
pub use self::botan::*;