Unverified Commit 63710188 authored by Steven Fackler's avatar Steven Fackler
Browse files

hack around evp_pkey_st

parent eb218488

openssl-sys/build/run_bindgen.rs

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ pub fn run(include_dirs: &[PathBuf]) { 
        .rust_target(RustTarget::Stable_1_47)

        .ctypes_prefix("::libc")

        .raw_line("use libc::*;")

        .raw_line("type evp_pkey_st = EVP_PKEY;")

        .allowlist_file(".*/openssl/[^/]+\\.h")

        .allowlist_recursively(false)

        // libc is missing pthread_once_t on macOS

openssl-sys/src/handwritten/ssl.rs

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ extern "C" { 
    ) -> c_int;

    pub fn SSL_ctrl(ssl: *mut SSL, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long;

    pub fn SSL_CTX_ctrl(ctx: *mut SSL_CTX, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long;

    #[link_name = "SSL_CTX_callback_ctrl"]

    pub fn SSL_CTX_callback_ctrl__fixed_rust(

        ctx: *mut SSL_CTX,

        cmd: c_int,

openssl-sys/src/types.rs

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ use *; 


cfg_if! {

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

        pub type EVP_PKEY = evp_pkey_st;

        pub enum evp_pkey_st {}

        pub enum EVP_PKEY {}

    } else {

        #[repr(C)]

        pub struct EVP_PKEY {