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

Merge pull request #2002 from davidben/no-sock 

Gate BIO_new_socket in OPENSSL_NO_SOCK in handwritten bindings
parents 99bce5b3 c8b6077c

openssl-sys/build/expando.c

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ RUST_CONF_OPENSSL_NO_SSL3_METHOD 
RUST_CONF_OPENSSL_NO_TLSEXT

#endif



#ifdef OPENSSL_NO_SOCK

RUST_CONF_OPENSSL_NO_SOCK

#endif



#ifdef OPENSSL_NO_STDIO

RUST_CONF_OPENSSL_NO_STDIO

#endif

openssl-sys/src/handwritten/bio.rs

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ const_ptr_api! { 
}



extern "C" {

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

    pub fn BIO_new_socket(sock: c_int, close_flag: c_int) -> *mut BIO;



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