Commit 00577e4f authored by Steven Fackler's avatar Steven Fackler
Browse files

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

parents 63a31999 838e1b11

.circleci/config.yml

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.34.0

        default: 1.36.0

      minimal_build:

        type: boolean

        default: false
@@ -175,7 +175,7 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.34.0

        default: 1.36.0

    macos:

      xcode: "12.2.0"

    environment:
@@ -210,7 +210,7 @@ openssl_300: &openssl_300 
  version: 3.0.0-alpha11

openssl_111: &openssl_111

  library: openssl

  version: 1.1.1h

  version: 1.1.1i

openssl_110: &openssl_110

  library: openssl

  version: 1.1.0l
@@ -306,10 +306,10 @@ workflows: 
          library: libressl

          version: 2.5.5

      - linux:

          name: x86_64-libressl-3.2.0

          name: x86_64-libressl-3.3.1

          target: x86_64-unknown-linux-gnu

          library: libressl

          version: 3.2.0

          version: 3.3.1

      - macos:

          name: macos

      - macos:

.github/workflows/ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ jobs: 
    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update --no-self-update 1.34.0 && rustup default 1.34.0

        run: rustup update --no-self-update 1.36.0 && rustup default 1.36.0

      - name: Get rust version

        id: rust-version

        run: echo "::set-output name=version::$(rustc --version)"

openssl-sys/CHANGELOG.md

+21 −1
Original line number Diff line number Diff line
@@ -2,6 +2,24 @@ 


## [Unreleased]



## [v0.9.60] - 2020-12-24



### Added



* Added support for the default Homebrew install directory on ARM.

* Added `EVP_PKEY_CTX_set_rsa_oaep_md` and `EVP_PKEY_CTRL_RSA_OAEP_MD`.



## [v0.9.59] - 2020-12-09



### Added



* Added support for LibreSSL 3.2.x, 3.3.0, and 3.3.1.

* Added `DH_generate_parameters`, `DH_generate_key`, `DH_compute_key`, and `DH_size`.

* Added `NID_X25519`, `NID_X448`, `EVP_PKEY_x25519` and `EVP_PKEY_x448`.

* Added `OBJ_txt2obj`.

* Added `d2i_PKCS7` and `i2d_PKCS7`.

* Added `SRTP_AEAD_AES_128_GCM` and `SRTP_AEAD_AES_256_GCM`.



## [v0.9.58] - 2020-06-05



### Added
@@ -145,7 +163,9 @@ 
* 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.58...master

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

[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

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

[v0.9.57]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.56...openssl-sys-v0.9.57

[v0.9.56]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.55...openssl-sys-v0.9.56

openssl-sys/Cargo.toml

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

name = "openssl-sys"

version = "0.9.58"

version = "0.9.60"

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

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

license = "MIT"

openssl-sys/build/cfgs.rs

+3 −1
Original line number Diff line number Diff line 
#[allow(clippy::inconsistent_digit_grouping)]

pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&'static str> {

    let mut cfgs = vec![];
@@ -29,6 +28,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<& 
        if libressl_version >= 0x2_09_01_00_0 {

            cfgs.push("libressl291");

        }

        if libressl_version >= 0x3_02_01_00_0 {

            cfgs.push("libressl321");

        }

    } else {

        let openssl_version = openssl_version.unwrap();