Unverified Commit ab21823f authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2287 from botovq/libressl-4 

Adjustments for LibreSSL 4
parents 36dcae80 44c2be57

openssl-sys/src/handwritten/conf.rs

+7 −1
Original line number Diff line number Diff line 
use super::super::*;



const_ptr_api! {

    extern "C" {

    pub fn NCONF_new(meth: *mut CONF_METHOD) -> *mut CONF;

        pub fn NCONF_new(meth: #[const_ptr_if(libressl400)] CONF_METHOD) -> *mut CONF;

    }

}



extern "C" {

    #[cfg(not(libressl400))]

    pub fn NCONF_default() -> *mut CONF_METHOD;

    pub fn NCONF_free(conf: *mut CONF);

}

openssl-sys/src/handwritten/types.rs

+1 −0
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ pub struct X509V3_CTX { 
    subject_cert: *mut c_void,

    subject_req: *mut c_void,

    crl: *mut c_void,

    #[cfg(not(libressl400))]

    db_meth: *mut c_void,

    db: *mut c_void,

    #[cfg(ossl300)]

openssl/build.rs

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ fn main() { 
    println!("cargo:rustc-check-cfg=cfg(libressl380)");

    println!("cargo:rustc-check-cfg=cfg(libressl382)");

    println!("cargo:rustc-check-cfg=cfg(libressl390)");

    println!("cargo:rustc-check-cfg=cfg(libressl400)");



    println!("cargo:rustc-check-cfg=cfg(ossl101)");

    println!("cargo:rustc-check-cfg=cfg(ossl102)");
@@ -112,6 +113,9 @@ fn main() { 
        if version >= 0x3_09_00_00_0 {

            println!("cargo:rustc-cfg=libressl390");

        }

        if version >= 0x4_00_00_00_0 {

            println!("cargo:rustc-cfg=libressl400");

        }

    }



    if let Ok(vars) = env::var("DEP_OPENSSL_CONF") {

openssl/src/conf.rs

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ foreign_type_and_impl_send_sync! { 
    pub struct ConfRef;

}



#[cfg(not(boringssl))]

#[cfg(not(any(boringssl, libressl400)))]

mod methods {

    use super::Conf;

    use crate::cvt_p;
@@ -61,5 +61,5 @@ mod methods { 
        }

    }

}

#[cfg(not(boringssl))]

#[cfg(not(any(boringssl, libressl400)))]

pub use methods::*;