Skip to content

Commit be8dcfd

Browse files
authored
Merge pull request #2318 from alex/msrv-fix
fixes #2317 -- restore compatibility with our MSRV and release openssl 0.9.68
2 parents 7b3ec80 + 065cc77 commit be8dcfd

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

openssl/CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## [Unreleased]
44

5+
## [v0.10.68] - 2024-10-16
6+
7+
### Fixed
8+
9+
* Fixed building on Rust 1.63.0 (our MSRV) with OpenSSL 3.2 or newer.
10+
511
## [v0.10.67] - 2024-10-15
612

713
### Added
@@ -925,7 +931,8 @@
925931

926932
Look at the [release tags] for information about older releases.
927933

928-
[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.67...master
934+
[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.68...master
935+
[v0.10.68]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.67...openssl-v0.10.68
929936
[v0.10.67]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.66...openssl-v0.10.67
930937
[v0.10.66]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.65...openssl-v0.10.66
931938
[v0.10.65]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.64...openssl-v0.10.65

openssl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "openssl"
3-
version = "0.10.67"
3+
version = "0.10.68"
44
authors = ["Steven Fackler <[email protected]>"]
55
license = "Apache-2.0"
66
description = "OpenSSL bindings"

openssl/src/kdf.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ impl Drop for EvpKdfCtx {
2525
cfg_if::cfg_if! {
2626
if #[cfg(all(ossl320, not(osslconf = "OPENSSL_NO_ARGON2")))] {
2727
use std::cmp;
28-
use std::ffi::{c_char, c_void};
28+
use std::ffi::c_void;
2929
use std::mem::MaybeUninit;
3030
use std::ptr;
3131
use foreign_types::ForeignTypeRef;
32+
use libc::c_char;
3233
use crate::{cvt, cvt_p};
3334
use crate::lib_ctx::LibCtxRef;
3435
use crate::error::ErrorStack;

0 commit comments

Comments
 (0)