diff --git a/README.md b/README.md index 1ae43ff4e947bbda68778a506bfe420242548869..d919cff10a27357e410053db9d0b3f4c799c3c96 100644 --- a/README.md +++ b/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/). diff --git a/appveyor.yml b/appveyor.yml index 054b88f2fb8828773ca3e18270c680a3d032ebcc..4cd6c2318b8f3eefefc1bc9f41952df06fff07f0 100644 --- a/appveyor.yml +++ b/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" diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 96402eb87980c42ef4467bbcdfbc72dc98cdb5f0..3fd46c4b957cc89f467cd6e5ee51da1347223785 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 "] 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 be72aa59ccc0ce7bcd7044df93f441fdd2881678..c11285f895f1f416876038961b8926ac14956978 100644 --- a/openssl/src/crypto/util.rs +++ b/openssl/src/crypto/util.rs @@ -41,7 +41,7 @@ pub extern "C" fn invoke_passwd_cb(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 cc89b5db708eba426126f21a71bb1985f770a20e..d76e7cbd9293e1ad20f8e0e9e6c71889a9191b35 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); impl ErrorStack { @@ -61,6 +61,7 @@ impl From 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 0c4bc51fe7c8c7afdeda8e476c77d64d05733adb..879681f4e411d3da3e90255b7063911d23fc35be 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;