Unverified Commit be8dcfd1 authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2318 from alex/msrv-fix 

fixes #2317 -- restore compatibility with our MSRV and release openssl 0.9.68
parents 7b3ec80b 065cc77d

openssl/CHANGELOG.md

+8 −1
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ 


## [Unreleased]



## [v0.10.68] - 2024-10-16



### Fixed



* Fixed building on Rust 1.63.0 (our MSRV) with OpenSSL 3.2 or newer.



## [v0.10.67] - 2024-10-15



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


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



[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.67...master

[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.68...master

[v0.10.68]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.67...openssl-v0.10.68

[v0.10.67]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.66...openssl-v0.10.67

[v0.10.66]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.65...openssl-v0.10.66

[v0.10.65]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.64...openssl-v0.10.65

openssl/Cargo.toml

+1 −1
Original line number Diff line number Diff line 
[package]

name = "openssl"

version = "0.10.67"

version = "0.10.68"

authors = ["Steven Fackler <sfackler@gmail.com>"]

license = "Apache-2.0"

description = "OpenSSL bindings"

openssl/src/kdf.rs

+2 −1
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ impl Drop for EvpKdfCtx { 
cfg_if::cfg_if! {

    if #[cfg(all(ossl320, not(osslconf = "OPENSSL_NO_ARGON2")))] {

        use std::cmp;

        use std::ffi::{c_char, c_void};

        use std::ffi::c_void;

        use std::mem::MaybeUninit;

        use std::ptr;

        use foreign_types::ForeignTypeRef;

        use libc::c_char;

        use crate::{cvt, cvt_p};

        use crate::lib_ctx::LibCtxRef;

        use crate::error::ErrorStack;