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

even more fixes

parent a5a39911

openssl-sys/build/run_bindgen.rs

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

#include <openssl/x509v3.h>

#include <openssl/kdf.h>

#include <openssl/ssl.h>

";



pub fn run(include_dirs: &[PathBuf]) {
@@ -50,7 +51,9 @@ pub fn run(include_dirs: &[PathBuf]) { 
        .rustified_enum("point_conversion_form_t")

        // Maintain compatibility for pre-union definitions

        .blocklist_type("GENERAL_NAME")

        .blocklist_type("GENERAL_NAME_st")

        .blocklist_type("EVP_PKEY")

        .blocklist_type("evp_pkey_st")

        .layout_tests(false)

        .header_contents("includes.h", INCLUDES);
@@ -89,7 +92,13 @@ impl ParseCallbacks for OpensslCallbacks { 
            | "BIO_meth_set_create"

            | "BIO_meth_set_destroy"

            | "CRYPTO_set_locking_callback"

            | "CRYPTO_set_id_callback" => Some(format!("{}__fixed_rust", original_item_name)),

            | "CRYPTO_set_id_callback"

            | "SSL_CTX_set_tmp_dh_callback"

            | "SSL_set_tmp_dh_callback"

            | "SSL_CTX_set_tmp_ecdh_callback"

            | "SSL_set_tmp_ecdh_callback"

            | "SSL_CTX_callback_ctrl"

            | "SSL_CTX_set_alpn_select_cb" => Some(format!("{}__fixed_rust", original_item_name)),

            _ => None,

        }

    }

openssl-sys/src/handwritten/mod.rs

+4 −0
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ pub use handwritten::ocsp::*; 
pub use handwritten::pkcs7::*;

pub use handwritten::rsa::*;

pub use handwritten::sha::*;

pub use handwritten::ssl::*;

pub use handwritten::stack::*;

pub use handwritten::tls1::*;

pub use handwritten::types::*;

pub use handwritten::x509::*;

pub use handwritten::x509_vfy::*;
@@ -34,7 +36,9 @@ mod ocsp; 
mod pkcs7;

mod rsa;

mod sha;

mod ssl;

mod stack;

mod tls1;

mod types;

mod x509;

mod x509_vfy;

openssl-sys/src/handwritten/ssl.rs

0 → 100644
+889 −0

File added.

Preview size limit exceeded, changes collapsed.

openssl-sys/src/handwritten/tls1.rs

0 → 100644
+28 −0
Original line number Diff line number Diff line 
use libc::*;

use *;



extern "C" {

    pub fn SSL_get_servername(ssl: *const SSL, name_type: c_int) -> *const c_char;



    pub fn SSL_export_keying_material(

        s: *mut SSL,

        out: *mut c_uchar,

        olen: size_t,

        label: *const c_char,

        llen: size_t,

        context: *const c_uchar,

        contextlen: size_t,

        use_context: c_int,

    ) -> c_int;



    #[cfg(ossl111)]

    pub fn SSL_export_keying_material_early(

        s: *mut ::SSL,

        out: *mut c_uchar,

        olen: size_t,

        label: *const c_char,

        llen: size_t,

        context: *const c_uchar,

        contextlen: size_t,

    ) -> c_int;

}

openssl-sys/src/ssl.rs

+23 −844

File changed.

Preview size limit exceeded, changes collapsed.