aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-09-09 11:13:14 -0500
committerGitHub <[email protected]>2016-09-09 11:13:14 -0500
commit63b3f4c2ac64986ac4dd6035a93bf2217edd1f67 (patch)
tree62c34abfbbabec56c11e794e930d6226acdd7a53 /openssl/src
parentMerge pull request #446 from xitep/master (diff)
parentFix password callback on ARM (diff)
downloadrust-openssl-63b3f4c2ac64986ac4dd6035a93bf2217edd1f67.tar.xz
rust-openssl-63b3f4c2ac64986ac4dd6035a93bf2217edd1f67.zip
Merge pull request #450 from sfackler/sfackler-patch-1
Fix password callback on ARM
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/crypto/util.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/src/crypto/util.rs b/openssl/src/crypto/util.rs
index be72aa59..c11285f8 100644
--- a/openssl/src/crypto/util.rs
+++ b/openssl/src/crypto/util.rs
@@ -41,7 +41,7 @@ pub extern "C" fn invoke_passwd_cb<F>(buf: *mut c_char,
_rwflag: c_int,
cb_state: *mut c_void)
-> c_int
- where F: FnOnce(&mut [i8]) -> usize {
+ where F: FnOnce(&mut [c_char]) -> usize {
let result = panic::catch_unwind(|| {
// build a `i8` slice to pass to the user callback
let pass_slice = unsafe { slice::from_raw_parts_mut(buf, size as usize) };