Skip to content

Commit

Permalink
Bump MSRV to 1.64.0
Browse files Browse the repository at this point in the history
  • Loading branch information
randombit committed Aug 23, 2024
1 parent 4cd024a commit c201c3e
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------
Expand Down
2 changes: 2 additions & 0 deletions botan-src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions botan-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "botan-sys"
version = "0.10.5"
version = "0.11.0"
authors = ["Jack Lloyd <[email protected]>"]
links = "botan-2"
build = "build.rs"
Expand All @@ -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 = []

Expand Down
6 changes: 1 addition & 5 deletions botan-sys/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![allow(non_camel_case_types)]
#![cfg_attr(feature = "no-std", no_std)]

mod block;
mod cipher;
Expand All @@ -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;

Expand Down
7 changes: 3 additions & 4 deletions botan/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "botan"
version = "0.10.7"
version = "0.11.0"
authors = ["Jack Lloyd <[email protected]>"]
description = "Rust wrapper for Botan cryptography library"
license = "MIT"
Expand All @@ -11,17 +11,16 @@ 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"
hex = "0.4"

[features]
default = []
no-std = ["botan-sys/no-std"]
vendored = ["botan-sys/vendored"]
botan3 = ["botan-sys/botan3"]

0 comments on commit c201c3e

Please sign in to comment.