Merge branch 'release-v0.8.3' into release

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/sfackler/rust-openssl.svg?branch=master)](https://travis-ci.org/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).
 
 ## Building
 
@@ -39,6 +39,8 @@ export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
 export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib
 ```
 
+May be necessary clean the repository with `cargo clean` before build again.
+
 ### Windows
 
 On Windows, consider building with [mingw-w64](http://mingw-w64.org/).

appveyor.yml

@@ -5,8 +5,8 @@ environment:
   matrix:
   - TARGET: i686-pc-windows-gnu
     BITS: 32
-#  - TARGET: x86_64-pc-windows-msvc
-#    BITS: 64
+  - TARGET: x86_64-pc-windows-msvc
+    BITS: 64
 install:
   - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2h.exe"
   - Win%BITS%OpenSSL-1_0_2h.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL"

openssl/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "openssl"
-version = "0.8.2"
+version = "0.8.3"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 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"

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) };

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 {

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;