diff options
| author | Steven Fackler <[email protected]> | 2016-10-18 21:45:53 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-18 21:45:53 -0700 |
| commit | 591c03e78a68ea9792c3f8e820123fdc5ce612b2 (patch) | |
| tree | 9e1e7e1187effd4bdadd7a32c9e3c634c31ccfd8 /openssl-sys/src | |
| parent | Merge pull request #478 from sfackler/feature-overhaul (diff) | |
| parent | Callback cleanup (diff) | |
| download | rust-openssl-591c03e78a68ea9792c3f8e820123fdc5ce612b2.tar.xz rust-openssl-591c03e78a68ea9792c3f8e820123fdc5ce612b2.zip | |
Merge pull request #481 from sfackler/pn-errors
Check for errors in NPN and ALPN logic
Diffstat (limited to 'openssl-sys/src')
| -rw-r--r-- | openssl-sys/src/lib.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index ae38d1b3..aae2540c 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -78,19 +78,19 @@ pub type BN_ULONG = libc::c_ulonglong; #[cfg(target_pointer_width = "32")] pub type BN_ULONG = c_uint; -pub type CRYPTO_EX_new = extern "C" fn(parent: *mut c_void, ptr: *mut c_void, - ad: *const CRYPTO_EX_DATA, idx: c_int, - argl: c_long, argp: *const c_void) -> c_int; -pub type CRYPTO_EX_dup = extern "C" fn(to: *mut CRYPTO_EX_DATA, - from: *mut CRYPTO_EX_DATA, from_d: *mut c_void, - idx: c_int, argl: c_long, argp: *mut c_void) - -> c_int; -pub type CRYPTO_EX_free = 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 PasswordCallback = extern "C" fn(buf: *mut c_char, size: c_int, - rwflag: c_int, user_data: *mut c_void) +pub type CRYPTO_EX_new = unsafe extern fn(parent: *mut c_void, ptr: *mut c_void, + ad: *const CRYPTO_EX_DATA, idx: c_int, + argl: c_long, argp: *const c_void) -> c_int; +pub type CRYPTO_EX_dup = unsafe extern fn(to: *mut CRYPTO_EX_DATA, + from: *mut CRYPTO_EX_DATA, from_d: *mut c_void, + idx: c_int, argl: c_long, argp: *mut c_void) -> c_int; +pub type CRYPTO_EX_free = unsafe extern 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 PasswordCallback = unsafe extern fn(buf: *mut c_char, size: c_int, + rwflag: c_int, user_data: *mut c_void) + -> c_int; pub const BIO_TYPE_NONE: c_int = 0; |