diff options
| author | Steven Fackler <[email protected]> | 2016-09-09 09:19:43 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-09-09 09:19:43 -0700 |
| commit | 37c475384ade8e1be4d8acdba126ac0359dd0561 (patch) | |
| tree | 621adc0726086e6ab24f9dd1ca90640a99884b09 /openssl | |
| parent | Merge branch 'release-sys-v0.7.17-v0.8.2' into release (diff) | |
| parent | Release v0.8.3 (diff) | |
| download | rust-openssl-openssl-v0.8.3.tar.xz rust-openssl-openssl-v0.8.3.zip | |
Merge branch 'release-v0.8.3' into releaseopenssl-v0.8.3
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/Cargo.toml | 4 | ||||
| -rw-r--r-- | openssl/src/crypto/util.rs | 2 | ||||
| -rw-r--r-- | openssl/src/error.rs | 3 | ||||
| -rw-r--r-- | openssl/src/lib.rs | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 96402eb8..3fd46c4b 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "openssl" -version = "0.8.2" +version = "0.8.3" authors = ["Steven Fackler <[email protected]>"] license = "Apache-2.0" description = "OpenSSL bindings" repository = "https://github.com/sfackler/rust-openssl" -documentation = "https://sfackler.github.io/rust-openssl/doc/v0.8.2/openssl" +documentation = "https://sfackler.github.io/rust-openssl/doc/v0.8.3/openssl" readme = "../README.md" keywords = ["crypto", "tls", "ssl", "dtls"] build = "build.rs" 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; |