Commit 2c9ff44b authored by Steven Fackler's avatar Steven Fackler
Browse files

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

parents e1e7b407 624effd3

.github/workflows/ci.yml

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ jobs: 
    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update stable && rustup default stable

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

      - name: Check formatting

        run: cargo fmt --all -- --check
@@ -29,7 +29,7 @@ jobs: 
    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update stable && rustup default stable

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

      - name: Get rust version

        id: rust-version

        run: echo "::set-output name=version::$(rustc --version)"
@@ -63,7 +63,7 @@ jobs: 
    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update 1.34.0 && rustup default 1.34.0

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

      - name: Get rust version

        id: rust-version

        run: echo "::set-output name=version::$(rustc --version)"
@@ -99,12 +99,12 @@ jobs: 
    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update stable && rustup default stable

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

      - name: Get rust version

        id: rust-version

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

      - name: Set vcpkg root

        run: echo "::set-env name=VCPKG_ROOT::$Env:VCPKG_INSTALLATION_ROOT"

        run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append

      - name: Install OpenSSL

        run: vcpkg install openssl:x64-windows

      - name: Cache cargo index

openssl-sys/build/find_normal.rs

+4 −7
Original line number Diff line number Diff line
@@ -97,14 +97,11 @@ openssl-sys = {} 
            msg.push_str(

                "



It looks like you're compiling on macOS, where the system contains a version of

OpenSSL 0.9.8. This crate no longer supports OpenSSL 0.9.8.

openssl-sys crate build failed: no supported version of OpenSSL found.



As a consumer of this crate, you can fix this error by using Homebrew to

install the `openssl` package, or as a maintainer you can use the openssl-sys

0.7 crate for support with OpenSSL 0.9.8.



Unfortunately though the compile cannot continue, so aborting.

Ways to fix it:

- Use the `vendored` feature of openssl-sys crate to build OpenSSL from source.

- Use Homebrew to install the `openssl` package.



",

            );

openssl-sys/build/main.rs

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ fn check_rustc_versions() { 


/// Validates the header files found in `include_dir` and then returns the

/// version string of OpenSSL.

#[allow(clippy::manual_strip)] // we need to support pre-1.45.0

fn validate_headers(include_dirs: &[PathBuf]) -> Version {

    // This `*-sys` crate only works with OpenSSL 1.0.1, 1.0.2, and 1.1.0. To

    // correctly expose the right API from this crate, take a look at

openssl-sys/src/dh.rs

+22 −1
Original line number Diff line number Diff line
@@ -4,6 +4,17 @@ extern "C" { 
    pub fn DH_new() -> *mut DH;

    pub fn DH_free(dh: *mut DH);



    pub fn DH_generate_parameters(

        prime_len: c_int,

        generator: c_int,

        callback: Option<extern "C" fn(c_int, c_int, *mut c_void)>,

        cb_arg: *mut c_void,

    ) -> *mut DH;



    pub fn DH_generate_key(dh: *mut DH) -> c_int;

    pub fn DH_compute_key(key: *mut c_uchar, pub_key: *const BIGNUM, dh: *mut DH) -> c_int;

    pub fn DH_size(dh: *const DH) -> c_int;



    pub fn d2i_DHparams(k: *mut *mut DH, pp: *mut *const c_uchar, length: c_long) -> *mut DH;

    pub fn i2d_DHparams(dh: *const DH, pp: *mut *mut c_uchar) -> c_int;
@@ -14,6 +25,16 @@ extern "C" { 
    #[cfg(ossl102)]

    pub fn DH_get_2048_256() -> *mut DH;



    #[cfg(any(ossl110, libressl273))]

    #[cfg(any(ossl110, libressl270))]

    pub fn DH_set0_pqg(dh: *mut DH, p: *mut BIGNUM, q: *mut BIGNUM, g: *mut BIGNUM) -> c_int;

    #[cfg(any(ossl110, libressl270))]

    pub fn DH_get0_pqg(

        dh: *const DH,

        p: *mut *const BIGNUM,

        q: *mut *const BIGNUM,

        g: *mut *const BIGNUM,

    );



    #[cfg(any(ossl110, libressl270))]

    pub fn DH_get0_key(dh: *const DH, pub_key: *mut *const BIGNUM, priv_key: *mut *const BIGNUM);

}

openssl-sys/src/ossl_typ.rs

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ cfg_if! { 
    }

}



pub enum X509_LOOKUP_METHOD {}



pub enum X509_NAME {}



cfg_if! {