Commit 722bdb6a authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #550 from Keruspe/master 

LibreSSL support improvements
parents 4fbc16b8 0978f870

openssl-sys/src/lib.rs

+5 −5
Original line number Diff line number Diff line
@@ -1266,15 +1266,15 @@ pub const X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: c_int = 45; 
pub const X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53;

pub const X509_V_OK: c_int = 0;



#[cfg(not(ossl101))]

#[cfg(not(any(ossl101, libressl)))]

pub const X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT: c_uint = 0x1;

#[cfg(not(ossl101))]

#[cfg(not(any(ossl101, libressl)))]

pub const X509_CHECK_FLAG_NO_WILDCARDS: c_uint = 0x2;

#[cfg(not(ossl101))]

#[cfg(not(any(ossl101, libressl)))]

pub const X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS: c_uint = 0x4;

#[cfg(not(ossl101))]

#[cfg(not(any(ossl101, libressl)))]

pub const X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS: c_uint = 0x8;

#[cfg(not(ossl101))]

#[cfg(not(any(ossl101, libressl)))]

pub const X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS: c_uint = 0x10;



pub const GEN_OTHERNAME: c_int = 0;

openssl/src/ssl/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -828,12 +828,12 @@ impl SslContextBuilder { 
    /// Enables ECDHE key exchange with an automatically chosen curve list.

    ///

    /// Requires the `v102` feature and OpenSSL 1.0.2.

    #[cfg(all(feature = "v102", ossl102))]

    #[cfg(all(feature = "v102", any(ossl102, libressl)))]

    pub fn set_ecdh_auto(&mut self, onoff: bool) -> Result<(), ErrorStack> {

        self._set_ecdh_auto(onoff)

    }



    #[cfg(ossl102)]

    #[cfg(any(ossl102,libressl))]

    fn _set_ecdh_auto(&mut self, onoff: bool) -> Result<(), ErrorStack> {

        unsafe { cvt(ffi::SSL_CTX_set_ecdh_auto(self.as_ptr(), onoff as c_int)).map(|_| ()) }

    }