Unverified Commit fdc09c9a authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1284 from vishwin/master 

Support LibreSSL 3.2.0
parents 7446f9fa 32de0383

.circleci/config.yml

+2 −2
Original line number Diff line number Diff line
@@ -292,10 +292,10 @@ workflows: 
          library: libressl

          version: 2.5.5

      - linux:

          name: x86_64-libressl-3.1.1

          name: x86_64-libressl-3.2.0

          target: x86_64-unknown-linux-gnu

          library: libressl

          version: 3.1.1

          version: 3.2.0

      - macos:

          name: macos

      - macos:

openssl-sys/build/main.rs

+2 −1
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ See rust-openssl README for more information: 
            (3, 0, _) => ('3', '0', 'x'),

            (3, 1, 0) => ('3', '1', '0'),

            (3, 1, _) => ('3', '1', 'x'),

            (3, 2, 0) => ('3', '2', '0'),

            _ => 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

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.



"