From f66c860fce5b2c593baf329459f3055989ab67ed Mon Sep 17 00:00:00 2001 From: Charlie Li Date: Sat, 19 Oct 2019 09:56:56 -0400 Subject: [PATCH] Support LibreSSL 3.0.2 3.0.2 is the first stable release, so support the rest of the series. --- .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 ce6ff77d..0bf14ef2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -292,10 +292,10 @@ workflows: library: libressl version: 2.5.5 - linux: - name: x86_64-libressl-3.0.1 + name: x86_64-libressl-3.0.2 target: x86_64-unknown-linux-gnu library: libressl - version: 3.0.1 + version: 3.0.2 - macos: name: macos - macos: diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs index 0bc0d316..9d6f0e85 100644 --- a/openssl-sys/build/main.rs +++ b/openssl-sys/build/main.rs @@ -203,6 +203,7 @@ See rust-openssl README for more information: (2, 9, _) => ('2', '9', 'x'), (3, 0, 0) => ('3', '0', '0'), (3, 0, 1) => ('3', '0', '1'), + (3, 0, _) => ('3', '0', 'x'), _ => version_error(), }; @@ -243,7 +244,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.1, but a different version of OpenSSL was found. The build is now aborting +through 3.0.x, but a different version of OpenSSL was found. The build is now aborting due to this version mismatch. "