Unverified Commit 67c90f08 authored Sep 21, 2021 by Steven Fackler Committed by GitHub Sep 21, 2021

Merge pull request #1524 from hargoniX/master

 Keep LibreSSL 3.4.0 up-to-date for OpenBSD -current, continuation

parents 6b5a4365 c7677ef1

.github/workflows/ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ jobs:
		- target: x86_64-unknown-linux-gnu
		library:
		name: libressl
		version: 3.3.3
		version: 3.4.0
		name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}
		runs-on: ubuntu-latest
		env:

openssl-sys/build/main.rs

+2 −1

Original line number	Diff line number	Diff line
		@@ -237,6 +237,7 @@ See rust-openssl README for more information:
		(3, 3, 0) => ('3', '3', '0'),
		(3, 3, 1) => ('3', '3', '1'),
		(3, 3, _) => ('3', '3', 'x'),
		(3, 4, 0) => ('3', '4', '0'),
		_ => version_error(),
		};

		@@ -279,7 +280,7 @@ fn version_error() -> ! {
		"

		This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
		through 3.3.x, but a different version of OpenSSL was found. The build is now aborting
		through 3.4.0, but a different version of OpenSSL was found. The build is now aborting
		due to this version mismatch.

		"

openssl/build.rs

+4 −0

Original line number	Diff line number	Diff line
		@@ -74,5 +74,9 @@ fn main() {
		if version >= 0x3_03_02_00_0 {
		println!("cargo:rustc-cfg=libressl332");
		}

		if version >= 0x3_04_00_00_0 {
		println!("cargo:rustc-cfg=libressl340");
		}
		}
		}

openssl/src/lib.rs

+1 −1

Original line number	Diff line number	Diff line
		//! Bindings to OpenSSL
		//!
		//! This crate provides a safe interface to the popular OpenSSL cryptography library. OpenSSL versions 1.0.1 through
		//! 1.1.1 and LibreSSL versions 2.5 through 3.3.x are supported.
		//! 1.1.1 and LibreSSL versions 2.5 through 3.4.0 are supported.
		//!
		//! # Building
		//!