From 54fbab73b7a6b334e727511416b677b14dbbb8b7 Mon Sep 17 00:00:00 2001 From: Charlie Li Date: Fri, 8 May 2020 21:21:51 -0400 Subject: [PATCH] LibreSSL 3.1 branch marked as stable; add support --- .circleci/config.yml | 4 ++-- openssl-sys/build/main.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f7298bfc..5bf3cf0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs index f4ad7171..1933438a 100644 --- a/openssl-sys/build/main.rs +++ b/openssl-sys/build/main.rs @@ -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. "