Merge pull request #1271 from vishwin/master

Support LibreSSL 3.1.x
This commit is contained in:
Steven Fackler 2020-05-09 14:18:52 -04:00 committed by GitHub
commit 95c0866c1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -298,10 +298,10 @@ workflows:
library: libressl
version: 2.5.5
- linux:
name: x86_64-libressl-3.1.0
name: x86_64-libressl-3.1.1
target: x86_64-unknown-linux-gnu
library: libressl
version: 3.1.0
version: 3.1.1
- macos:
name: macos
- macos:

View File

@ -217,6 +217,7 @@ See rust-openssl README for more information:
(3, 0, 1) => ('3', '0', '1'),
(3, 0, _) => ('3', '0', 'x'),
(3, 1, 0) => ('3', '1', '0'),
(3, 1, _) => ('3', '1', 'x'),
_ => version_error(),
};
@ -257,7 +258,7 @@ fn version_error() -> ! {
"
This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
through 3.0.x, but a different version of OpenSSL was found. The build is now aborting
through 3.1.x, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.
"