Commit ad7d2c55 authored by Paul Kehrer's avatar Paul Kehrer
Browse files

fix 3.2.0 thread support and simplify

parent 73892b52

openssl-sys/build/main.rs

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



fn main() {

    println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_THREADS\", \"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\"))");

    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\"))");



    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
@@ -64,7 +64,7 @@ const INCLUDES: &str = " 
#include <openssl/poly1305.h>

#endif



#if OPENSSL_VERSION_NUMBER >= 0x30200000 && defined(OPENSSL_THREADS)

#if OPENSSL_VERSION_NUMBER >= 0x30200000

#include <openssl/thread.h>

#endif

";

openssl-sys/src/handwritten/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ pub use self::sha::*; 
pub use self::srtp::*;

pub use self::ssl::*;

pub use self::stack::*;

#[cfg(all(ossl320, osslconf = "OPENSSL_THREADS"))]

#[cfg(ossl320)]

pub use self::thread::*;

pub use self::tls1::*;

pub use self::types::*;
@@ -68,7 +68,7 @@ mod sha; 
mod srtp;

mod ssl;

mod stack;

#[cfg(all(ossl320, osslconf = "OPENSSL_THREADS"))]

#[cfg(ossl320)]

mod thread;

mod tls1;

mod types;

systest/build.rs

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ fn main() { 
            cfg.header("openssl/provider.h");

        }

        if version >= 0x30200000 {

            // thread is present as a header even if OPENSSL_THREADS is not defined

            cfg.header("openssl/thread.h");

        }

    }