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

Merge branch 'master' into openssl-300

parents 405a581c 127413a8

.github/workflows/ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ jobs: 
    steps:

      - uses: actions/checkout@v2

      - uses: sfackler/actions/rustup@master

        with:

          version: 1.36.0

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

        id: rust-version

      - uses: actions/cache@v1
@@ -149,7 +151,7 @@ jobs: 
              version: 3.0.0-alpha14

              dl-path: /

            - name: openssl

              version: 1.1.1j

              version: 1.1.1k

              dl-path: /

            - name: openssl

              version: 1.1.0l

openssl-sys/build/find_normal.rs

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ https://github.com/sfackler/rust-openssl#windows 
        );

    }



    panic!(msg);

    panic!("{}", msg);

}



/// Attempt to find OpenSSL through pkg-config.

openssl-sys/build/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ fn parse_new_version(version: &str) -> u64 { 
fn determine_mode(libdir: &Path, libs: &[&str]) -> &'static str {

    // First see if a mode was explicitly requested

    let kind = env("OPENSSL_STATIC");

    match kind.as_ref().and_then(|s| s.to_str()).map(|s| &s[..]) {

    match kind.as_ref().and_then(|s| s.to_str()) {

        Some("0") => return "dylib",

        Some(_) => return "static",

        None => {}

openssl-sys/src/dh.rs

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ extern "C" { 
        g: *mut *const BIGNUM,

    );



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

    pub fn DH_set0_key(dh: *mut DH, pub_key: *mut BIGNUM, priv_key: *mut BIGNUM) -> c_int;



    #[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/ec.rs

+9 −0
Original line number Diff line number Diff line
@@ -95,6 +95,15 @@ extern "C" { 


    pub fn EC_POINT_dup(p: *const EC_POINT, group: *const EC_GROUP) -> *mut EC_POINT;



    #[cfg(ossl111)]

    pub fn EC_POINT_get_affine_coordinates(

        group: *const EC_GROUP,

        p: *const EC_POINT,

        x: *mut BIGNUM,

        y: *mut BIGNUM,

        ctx: *mut BN_CTX,

    ) -> c_int;



    pub fn EC_POINT_get_affine_coordinates_GFp(

        group: *const EC_GROUP,

        p: *const EC_POINT,