aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/crypto/util.rs2
-rw-r--r--openssl/src/error.rs3
-rw-r--r--openssl/src/lib.rs2
3 files changed, 4 insertions, 3 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) };
diff --git a/openssl/src/error.rs b/openssl/src/error.rs
index cc89b5db..d76e7cbd 100644
--- a/openssl/src/error.rs
+++ b/openssl/src/error.rs
@@ -7,7 +7,7 @@ use std::str;
use ffi;
-#[derive(Debug)]
+#[derive(Debug, Clone)]
pub struct ErrorStack(Vec<Error>);
impl ErrorStack {
@@ -61,6 +61,7 @@ impl From<ErrorStack> for fmt::Error {
}
/// An error reported from OpenSSL.
+#[derive(Clone)]
pub struct Error(c_ulong);
impl Error {
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 0c4bc51f..879681f4 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.8.2")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.8.3")]
#[macro_use]
extern crate bitflags;