jaiden
/
bearssl-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bearssl(-sys): update msrv to 1.64 

* `core::ffi` types are stable and thus libc isn't used where
`sizeof uintptr_t == sizeof size_t`
main
Aydin Mercan 2022-09-25 14:00:57 +03:00
parent 2f977dc7dd
commit 70495f7fdc
Signed by: jaiden
SSH Key Fingerprint: SHA256:vy6hjzotbn/MWZAbjzURNk3NL62EPkjoHsJ5xr/s7nk
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Cargo.lock generated
View File

@ -99,9 +99,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "clang-sys" name = "clang-sys"
version = "1.3.3" version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
dependencies = [ dependencies = [
"glob", "glob",
"libc", "libc",
@ -110,9 +110,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.2.20" version = "3.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
@ -140,9 +140,9 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]] [[package]]
name = "env_logger" name = "env_logger"
version = "0.9.0" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
dependencies = [ dependencies = [
"atty", "atty",
"humantime", "humantime",
@ -213,9 +213,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.132" version = "0.2.133"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
[[package]] [[package]]
name = "libloading" name = "libloading"
@ -260,9 +260,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.14.0" version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
[[package]] [[package]]
name = "os_str_bytes" name = "os_str_bytes"
@ -296,9 +296,9 @@ dependencies = [
[[package]] [[package]]
name = "rand_core" name = "rand_core"
version = "0.6.3" version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [ dependencies = [
"getrandom", "getrandom",
] ]
@ -349,15 +349,15 @@ dependencies = [
[[package]] [[package]]
name = "textwrap" name = "textwrap"
version = "0.15.0" version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
version = "1.0.3" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
[[package]] [[package]]
name = "wasi" name = "wasi"

6
bearssl-sys/Cargo.toml
View File

@ -8,13 +8,13 @@ readme = "README.md"
categories = ["cryptography", "no-std", "external-ffi-bindings"] categories = ["cryptography", "no-std", "external-ffi-bindings"]
keywords = ["bearssl", "crypto", "tls", "ssl"] keywords = ["bearssl", "crypto", "tls", "ssl"]
edition = "2021" edition = "2021"
rust-version = "1.63" rust-version = "1.64"
[badges] [badges]
maintenance = { status = "actively-developed" } maintenance = { status = "actively-developed" }
[dependencies] [dependencies]
libc = "0.2.132" libc = { version = "0.2.133", optional = true }
[build-dependencies] [build-dependencies]
bindgen = "0.60.1" bindgen = "0.60.1"
@ -22,4 +22,4 @@ cc = { version = "1.0.73", optional = true }
[features] [features]
bundled = ["dep:cc"] bundled = ["dep:cc"]
dont-assume-size_t-equals-uintptr_t = [] dont-assume-size_t-equals-uintptr_t = ["dep:libc"]

8
bearssl-sys/build.rs
View File

@ -7,6 +7,12 @@ static HEADER_PATH: &str = "wrapper.h";
#[cfg(feature = "bundled")] #[cfg(feature = "bundled")]
static HEADER_PATH: &str = "bundled/inc/bearssl.h"; static HEADER_PATH: &str = "bundled/inc/bearssl.h";
#[cfg(feature = "dont-assume-size_t-equals-uintptr_t")]
static CTYPES_PREFIX: &str = "::libc";
#[cfg(not(feature = "dont-assume-size_t-equals-uintptr_t"))]
static CTYPES_PREFIX: &str = "::core::ffi";
#[cfg(not(feature = "bundled"))] #[cfg(not(feature = "bundled"))]
fn bearssl_handle_linkage() { fn bearssl_handle_linkage() {
#[cfg(not(unix))] #[cfg(not(unix))]
@ -83,7 +89,7 @@ fn main() {
let bindings = bindgen::builder() let bindings = bindgen::builder()
.use_core() .use_core()
.ctypes_prefix("::libc") .ctypes_prefix(CTYPES_PREFIX)
.header(HEADER_PATH) .header(HEADER_PATH)
.default_macro_constant_type(bindgen::MacroTypeVariation::Signed) .default_macro_constant_type(bindgen::MacroTypeVariation::Signed)
.parse_callbacks(Box::new(bindgen::CargoCallbacks)) .parse_callbacks(Box::new(bindgen::CargoCallbacks))

6
bearssl/Cargo.toml
View File

@ -8,14 +8,14 @@ readme = "README.md"
categories = ["cryptography", "no-std", "api-bindings"] categories = ["cryptography", "no-std", "api-bindings"]
keywords = ["bearssl", "crypto", "tls", "ssl"] keywords = ["bearssl", "crypto", "tls", "ssl"]
edition = "2021" edition = "2021"
rust-version = "1.63" rust-version = "1.64"
[badges] [badges]
maintenance = { status = "actively-developed" } maintenance = { status = "actively-developed" }
[dependencies] [dependencies]
bearssl-sys = { path = "../bearssl-sys" } bearssl-sys = { path = "../bearssl-sys" }
libc = "0.2.132" libc = { version = "0.2.133", optional = true }
rand_core = { version = "0.6.3", default-features = false } rand_core = { version = "0.6.3", default-features = false }
zeroize = { version = "1.5.7", default-features = false, optional = true } zeroize = { version = "1.5.7", default-features = false, optional = true }
@ -24,5 +24,5 @@ default = ["zeroize"]
std = ["rand_core/std", "zeroize?/std"] std = ["rand_core/std", "zeroize?/std"]
bundled = ["bearssl-sys/bundled"] bundled = ["bearssl-sys/bundled"]
dont-assume-size_t-equals-uintptr_t = ["bearssl-sys/dont-assume-size_t-equals-uintptr_t"] dont-assume-size_t-equals-uintptr_t = ["dep:libc", "bearssl-sys/dont-assume-size_t-equals-uintptr_t"]
zeroize = ["dep:zeroize"] zeroize = ["dep:zeroize"]