fix openssl bindgen build

Author: zh-jq

openssl-sys/src/crypto.rs

@@ -19,31 +19,36 @@ cfg_if! {
     }
 }
 
-// FIXME should be options
-pub type CRYPTO_EX_new = unsafe extern "C" fn(
-    parent: *mut c_void,
-    ptr: *mut c_void,
-    ad: *mut CRYPTO_EX_DATA,
-    idx: c_int,
-    argl: c_long,
-    argp: *mut c_void,
-) -> CRYPTO_EX_new_ret;
-pub type CRYPTO_EX_dup = unsafe extern "C" fn(
-    to: *mut CRYPTO_EX_DATA,
-    from: CRYPTO_EX_dup_from,
-    from_d: CRYPTO_EX_dup_from_d,
-    idx: c_int,
-    argl: c_long,
-    argp: *mut c_void,
-) -> c_int;
-pub type CRYPTO_EX_free = unsafe extern "C" fn(
-    parent: *mut c_void,
-    ptr: *mut c_void,
-    ad: *mut CRYPTO_EX_DATA,
-    idx: c_int,
-    argl: c_long,
-    argp: *mut c_void,
-);
+pub type CRYPTO_EX_new = Option<
+    unsafe extern "C" fn(
+        parent: *mut c_void,
+        ptr: *mut c_void,
+        ad: *mut CRYPTO_EX_DATA,
+        idx: c_int,
+        argl: c_long,
+        argp: *mut c_void,
+    ) -> CRYPTO_EX_new_ret,
+>;
+pub type CRYPTO_EX_dup = Option<
+    unsafe extern "C" fn(
+        to: *mut CRYPTO_EX_DATA,
+        from: CRYPTO_EX_dup_from,
+        from_d: CRYPTO_EX_dup_from_d,
+        idx: c_int,
+        argl: c_long,
+        argp: *mut c_void,
+    ) -> c_int,
+>;
+pub type CRYPTO_EX_free = Option<
+    unsafe extern "C" fn(
+        parent: *mut c_void,
+        ptr: *mut c_void,
+        ad: *mut CRYPTO_EX_DATA,
+        idx: c_int,
+        argl: c_long,
+        argp: *mut c_void,
+    ),
+>;
 
 #[cfg(any(ossl110, libressl390))]
 #[inline]

openssl-sys/src/handwritten/crypto.rs

@@ -23,9 +23,9 @@ extern "C" {
         class_index: c_int,
         argl: c_long,
         argp: *mut c_void,
-        new_func: Option<CRYPTO_EX_new>,
-        dup_func: Option<CRYPTO_EX_dup>,
-        free_func: Option<CRYPTO_EX_free>,
+        new_func: CRYPTO_EX_new,
+        dup_func: CRYPTO_EX_dup,
+        free_func: CRYPTO_EX_free,
     ) -> c_int;
 
     #[cfg(not(ossl110))]

openssl-sys/src/ssl.rs

@@ -577,9 +577,9 @@ cfg_if! {
         pub unsafe fn SSL_get_ex_new_index(
             l: c_long,
             p: *mut c_void,
-            newf: Option<CRYPTO_EX_new>,
-            dupf: Option<CRYPTO_EX_dup>,
-            freef: Option<CRYPTO_EX_free>,
+            newf: CRYPTO_EX_new,
+            dupf: CRYPTO_EX_dup,
+            freef: CRYPTO_EX_free,
         ) -> c_int {
             CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, l, p, newf, dupf, freef)
         }
@@ -590,9 +590,9 @@ cfg_if! {
         pub unsafe fn SSL_CTX_get_ex_new_index(
             l: c_long,
             p: *mut c_void,
-            newf: Option<CRYPTO_EX_new>,
-            dupf: Option<CRYPTO_EX_dup>,
-            freef: Option<CRYPTO_EX_free>,
+            newf: CRYPTO_EX_new,
+            dupf: CRYPTO_EX_dup,
+            freef: CRYPTO_EX_free,
         ) -> c_int {
             CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_CTX, l, p, newf, dupf, freef)
         }

openssl/src/ssl/mod.rs

@@ -2218,10 +2218,7 @@ impl SslContext {
     {
         unsafe {
             ffi::init();
-            #[cfg(boringssl)]
             let idx = cvt_n(get_new_idx(Some(free_data_box::<T>)))?;
-            #[cfg(not(boringssl))]
-            let idx = cvt_n(get_new_idx(free_data_box::<T>))?;
             Ok(Index::from_raw(idx))
         }
     }
@@ -2679,10 +2676,7 @@ impl Ssl {
     {
         unsafe {
             ffi::init();
-            #[cfg(boringssl)]
             let idx = cvt_n(get_new_ssl_idx(Some(free_data_box::<T>)))?;
-            #[cfg(not(boringssl))]
-            let idx = cvt_n(get_new_ssl_idx(free_data_box::<T>))?;
             Ok(Index::from_raw(idx))
         }
     }
@@ -5002,7 +4996,7 @@ cfg_if! {
                 ptr::null_mut(),
                 None,
                 None,
-                Some(f),
+                f,
             )
         }
 
@@ -5013,7 +5007,7 @@ cfg_if! {
                 ptr::null_mut(),
                 None,
                 None,
-                Some(f),
+                f,
             )
         }
     } else {