diff options
author | Steven Fackler <sfackler@gmail.com> | 2017-12-25 22:02:41 -0700 |
---|---|---|
committer | Steven Fackler <sfackler@gmail.com> | 2017-12-25 22:09:27 -0700 |
commit | 2adf2cf12bf1afb806ec8bfb222d32831137d749 (patch) | |
tree | 7af6a6aeecd9113d7b22028a13eed5df11fa3127 /openssl/src/util.rs | |
parent | ff9fe6fe047231dbb2e8b576b90d68f71c09f5d9 (diff) | |
download | rust-openssl-2adf2cf12bf1afb806ec8bfb222d32831137d749.zip |
Remove deprecated APIs
Diffstat (limited to 'openssl/src/util.rs')
-rw-r--r-- | openssl/src/util.rs | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/openssl/src/util.rs b/openssl/src/util.rs index e4010587..8c8d41a9 100644 --- a/openssl/src/util.rs +++ b/openssl/src/util.rs @@ -1,4 +1,4 @@ -use libc::{c_int, c_char, c_void}; +use libc::{c_char, c_int, c_void}; use std::any::Any; use std::panic::{self, AssertUnwindSafe}; use std::slice; @@ -34,31 +34,6 @@ impl<F> Drop for CallbackState<F> { } } -pub unsafe extern "C" fn invoke_passwd_cb_old<F>( - buf: *mut c_char, - size: c_int, - _rwflag: c_int, - cb_state: *mut c_void, -) -> c_int -where - F: FnOnce(&mut [c_char]) -> usize, -{ - let callback = &mut *(cb_state as *mut CallbackState<F>); - - let result = panic::catch_unwind(AssertUnwindSafe(|| { - let pass_slice = slice::from_raw_parts_mut(buf, size as usize); - callback.cb.take().unwrap()(pass_slice) - })); - - match result { - Ok(len) => len as c_int, - Err(err) => { - callback.panic = Some(err); - 0 - } - } -} - /// Password callback function, passed to private key loading functions. /// /// `cb_state` is expected to be a pointer to a `CallbackState`. |