diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83d0875..830523a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,9 +46,9 @@ jobs: features: git - toolchain: stable features: vendored - - toolchain: 1.64.0 # no-std MSRV + - toolchain: 1.64.0 # MSRV no-std features: no-std - - toolchain: 1.58.0 # MSRV + - toolchain: 1.64.0 # MSRV - toolchain: nightly - toolchain: nightly features: no-std diff --git a/NEWS.md b/NEWS.md index 6974e5d..32305f1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +## 0.11.0 Not Yet Released + +- Bump MSRV to 1.64.0 for both std and no-std builds + ## 0.10.7 2023-10-05 - Fix a bug which prevented compilation on systems where C chars diff --git a/README.md b/README.md index 961ae8f..ad81be7 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,14 @@ PRs and comments/issues happily accepted. MSRV ----- -The Minimum Supported Rust Version of this crate is Rust 1.58.0, -*unless* you enable support for `no_std` builds, in which case Rust -1.64.0 is required. +The Minimum Supported Rust Version of this crate is Rust 1.64.0. Botan Versions Supported -------------------------- -This crate requires Botan 2.13.0 or higher. +This crate requires Botan 2.13.0 or higher. However the latest +available version of Botan3 is highly recomended for best security and +performance. Features --------- diff --git a/botan-src/Cargo.toml b/botan-src/Cargo.toml index b7c4ac1..e0c525a 100644 --- a/botan-src/Cargo.toml +++ b/botan-src/Cargo.toml @@ -9,6 +9,8 @@ homepage = "https://botan.randombit.net/" repository = "https://github.com/randombit/botan-rs" readme = "README.md" categories = ["cryptography"] +rust-version = "1.64" + exclude = ["botan/doc", "botan/src/cli", "botan/src/lib/compat/sodium", diff --git a/botan-sys/Cargo.toml b/botan-sys/Cargo.toml index b9bdf64..62370ab 100644 --- a/botan-sys/Cargo.toml +++ b/botan-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "botan-sys" -version = "0.10.5" +version = "0.11.0" authors = ["Jack Lloyd "] links = "botan-2" build = "build.rs" @@ -12,11 +12,10 @@ documentation = "https://docs.rs/botan-sys" readme = "README.md" categories = [ "cryptography", "external-ffi-bindings", "no-std" ] edition = "2021" -rust-version = "1.58" +rust-version = "1.64" [features] default = [] -no-std = [] vendored = ["botan-src", "botan3"] botan3 = [] diff --git a/botan-sys/src/lib.rs b/botan-sys/src/lib.rs index bd12f8b..19b2e20 100644 --- a/botan-sys/src/lib.rs +++ b/botan-sys/src/lib.rs @@ -1,5 +1,5 @@ +#![no_std] #![allow(non_camel_case_types)] -#![cfg_attr(feature = "no-std", no_std)] mod block; mod cipher; @@ -21,12 +21,8 @@ mod x509; mod zfec; pub mod ffi_types { - #[cfg(feature = "no-std")] pub use core::ffi::{c_char, c_int, c_uint, c_void}; - #[cfg(not(feature = "no-std"))] - pub use std::os::raw::{c_char, c_int, c_uint, c_void}; - #[cfg(feature = "botan3")] pub type botan_view_ctx = *mut c_void; diff --git a/botan/Cargo.toml b/botan/Cargo.toml index 8f3e7e6..0252480 100644 --- a/botan/Cargo.toml +++ b/botan/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "botan" -version = "0.10.7" +version = "0.11.0" authors = ["Jack Lloyd "] description = "Rust wrapper for Botan cryptography library" license = "MIT" @@ -11,10 +11,10 @@ keywords = [ "crypto" ] readme = "../README.md" categories = [ "cryptography", "api-bindings", "no-std" ] edition = "2021" -rust-version = "1.58" +rust-version = "1.64" [dependencies] -botan-sys = { version = "0.10.5", path = "../botan-sys" } +botan-sys = { version = "0.11", path = "../botan-sys" } [dev-dependencies] wycheproof = "0.5" @@ -22,6 +22,6 @@ hex = "0.4" [features] default = [] -no-std = ["botan-sys/no-std"] +no-std = [] vendored = ["botan-sys/vendored"] botan3 = ["botan-sys/botan3"]