min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1284 from vishwin/master 

Support LibreSSL 3.2.0
This commit is contained in:
Steven Fackler 2020-06-02 07:04:54 -04:00 committed by GitHub
parent 7446f9fa68 32de038385
commit fdc09c9ae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

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

3
openssl-sys/build/main.rs
View File

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