Commit 39df95b9 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge remote-tracking branch 'origin/master' into openssl-300

parents 770ba327 6f395bcb

.github/workflows/ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ jobs: 
            - target: x86_64-unknown-linux-gnu

              library:

                name: libressl

                version: 3.3.1

                version: 3.3.3

      name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}

      runs-on: ubuntu-latest

      env:

openssl-sys/CHANGELOG.md

+16 −1
Original line number Diff line number Diff line
@@ -2,6 +2,20 @@ 


## [Unreleased]



## [v0.9.63] - 2021-05-06



### Added



* Added support for LibreSSL 3.3.x.



## [v0.9.62] - 2021-04-28



### Added



* Added support for LibreSSL 3.3.2.

* Added `DH_set0_key`.

* Added `EC_POINT_get_affine_coordinates`.



## [v0.9.61] - 2021-03-13



### Added
@@ -178,7 +192,8 @@ 
* Added `X509_verify` and `X509_REQ_verify`.

* Added `EVP_MD_type` and `EVP_GROUP_get_curve_name`.



[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.61...master

[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.62...master

[v0.9.62]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.61...openssl-sys-v0.9.62

[v0.9.61]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.60...openssl-sys-v0.9.61

[v0.9.60]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.59...openssl-sys-v0.9.60

[v0.9.59]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.58...openssl-sys-v0.9.59

openssl-sys/Cargo.toml

+1 −1
Original line number Diff line number Diff line 
[package]

name = "openssl-sys"

version = "0.9.61"

version = "0.9.63"

authors = ["Alex Crichton <alex@alexcrichton.com>",

           "Steven Fackler <sfackler@gmail.com>"]

license = "MIT"

openssl-sys/build/cfgs.rs

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<& 
        if libressl_version >= 0x3_02_01_00_0 {

            cfgs.push("libressl321");

        }

        if libressl_version >= 0x3_03_02_00_0 {

            cfgs.push("libressl332");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl-sys/build/main.rs

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

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

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

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

            _ => version_error(),

        };
@@ -278,7 +279,7 @@ fn version_error() -> ! { 
        "



This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5

through 3.3.1, but a different version of OpenSSL was found. The build is now aborting

through 3.3.x, but a different version of OpenSSL was found. The build is now aborting

due to this version mismatch.



"