aboutsummaryrefslogtreecommitdiff
path: root/ffi.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2013-11-09 17:27:17 -0800
committerSteven Fackler <[email protected]>2013-11-09 17:32:33 -0800
commit2e168ab820384c543faaa4eabf4004dfc1670851 (patch)
treeaa2e7cb1a524977735ca4acc855889d7902c674b /ffi.rs
parentSsl errors may return a stack (diff)
downloadrust-openssl-2e168ab820384c543faaa4eabf4004dfc1670851.tar.xz
rust-openssl-2e168ab820384c543faaa4eabf4004dfc1670851.zip
Update for latest master and fix segfault
Diffstat (limited to 'ffi.rs')
-rw-r--r--ffi.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffi.rs b/ffi.rs
index deb552e7..7711032c 100644
--- a/ffi.rs
+++ b/ffi.rs
@@ -11,10 +11,10 @@ pub type BIO_METHOD = c_void;
pub type X509_STORE_CTX = c_void;
pub type CRYPTO_EX_DATA = c_void;
-pub type CRYPTO_EX_new = Option<extern "C" fn(parent: *c_void, ptr: *c_void,
+pub type CRYPTO_EX_new = extern "C" fn(parent: *c_void, ptr: *c_void,
ad: *CRYPTO_EX_DATA, idx: c_int,
argl: c_long, argp: *c_void)
- -> c_int>;
+ -> c_int;
pub type CRYPTO_EX_dup = extern "C" fn(to: *CRYPTO_EX_DATA,
from: *CRYPTO_EX_DATA, from_d: *c_void,
idx: c_int, argl: c_long, argp: *c_void)