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

Merge pull request #2423 from justsmth/bindgen-feature-macros 

Improve support for OPENSSL_NO_COMP and OPENSSL_NO_SRTP
parents c723b6b0 0e91ccce

openssl-sys/build/expando.c

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ RUST_CONF_OPENSSL_NO_SHA 
RUST_CONF_OPENSSL_NO_SRP

#endif



#ifdef OPENSSL_NO_SRTP

RUST_CONF_OPENSSL_NO_SRTP

#endif



#ifdef OPENSSL_NO_SSL3_METHOD

RUST_CONF_OPENSSL_NO_SSL3_METHOD

#endif

openssl-sys/build/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ fn check_ssl_kind() { 
}



fn main() {

    println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_COMP\", \"OPENSSL_NO_SOCK\", \"OPENSSL_NO_STDIO\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_SSL3_METHOD\", \"OPENSSL_NO_KRB5\", \"OPENSSL_NO_TLSEXT\", \"OPENSSL_NO_SRP\", \"OPENSSL_NO_RFC3779\", \"OPENSSL_NO_SHA\", \"OPENSSL_NO_NEXTPROTONEG\", \"OPENSSL_NO_ENGINE\", \"OPENSSL_NO_BUF_FREELISTS\", \"OPENSSL_NO_RC2\"))");

    println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_COMP\", \"OPENSSL_NO_SOCK\", \"OPENSSL_NO_STDIO\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_SSL3_METHOD\", \"OPENSSL_NO_KRB5\", \"OPENSSL_NO_TLSEXT\", \"OPENSSL_NO_SRP\", \"OPENSSL_NO_SRTP\", \"OPENSSL_NO_RFC3779\", \"OPENSSL_NO_SHA\", \"OPENSSL_NO_NEXTPROTONEG\", \"OPENSSL_NO_ENGINE\", \"OPENSSL_NO_BUF_FREELISTS\", \"OPENSSL_NO_RC2\"))");



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

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

openssl-sys/build/run_bindgen.rs

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ const INCLUDES: &str = " 
#include <openssl/cms.h>

#endif



#if !(defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC))

#if !defined(OPENSSL_NO_COMP) && !(defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC))

#include <openssl/comp.h>

#endif

openssl-sys/src/handwritten/types.rs

+2 −2
Original line number Diff line number Diff line
@@ -1072,9 +1072,9 @@ cfg_if! { 
pub enum COMP_CTX {}



cfg_if! {

    if #[cfg(any(ossl110, libressl350))] {

    if #[cfg(all(any(ossl110, libressl350), not(osslconf = "OPENSSL_NO_COMP")))] {

        pub enum COMP_METHOD {}

    } else {

    } else if #[cfg(not(osslconf = "OPENSSL_NO_COMP"))] {

        #[repr(C)]

        pub struct COMP_METHOD {

            pub type_: c_int,

openssl-sys/src/tls1.rs

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ pub unsafe fn SSL_CTX_set_tlsext_status_cb( 
    )

}



#[cfg(not(osslconf = "OPENSSL_NO_SRTP"))]

pub unsafe fn SSL_CTX_set_tlsext_status_arg(ctx: *mut SSL_CTX, arg: *mut c_void) -> c_long {

    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG, 0, arg)

}