From 2d510e21a371e6fa8663d91edd9e1d1a3cbd88a6 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 20 Aug 2016 12:50:12 -0400 Subject: [PATCH 1/6] Re-enable 64 bit MSVC Closes #443 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 054b88f2..4cd6c231 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" From 76c09f89f2d72890f7478a7a8e239fa01f1e8f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adelar=20da=20Silva=20Queir=C3=B3z?= Date: Mon, 29 Aug 2016 22:59:11 -0300 Subject: [PATCH 2/6] Add cargo clean in the list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1ae43ff4..41f3bf00 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ as described below. brew install openssl export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib +cargo clean ``` ### Windows From f04d5e026b9aeabd88a6afe5bc663fa26384529c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adelar=20da=20Silva=20Queir=C3=B3z?= Date: Mon, 29 Aug 2016 23:08:28 -0300 Subject: [PATCH 3/6] Add description about how to solve openssl issue --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 41f3bf00..78bce6cd 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,10 @@ as described below. brew install openssl export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib -cargo clean ``` +May be necessary clean the repository with `cargo clean` before build again. + ### Windows On Windows, consider building with [mingw-w64](http://mingw-w64.org/). From 5e08ad00859d5402cec003e646475b9d36a6d454 Mon Sep 17 00:00:00 2001 From: "Novotnik, Petr" Date: Thu, 1 Sep 2016 20:10:02 +0200 Subject: [PATCH 4/6] Implement Clone for openssl::error::ErrorStack --- openssl/src/error.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); 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 { From 9a449dbd6e549425bc70078e3ea2b8a2cd6edc58 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 8 Sep 2016 09:35:56 -0700 Subject: [PATCH 5/6] Fix password callback on ARM Closes #449 --- openssl/src/crypto/util.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(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) }; From 8d95383f323345a2154b062e3c36bc5edf1def19 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 9 Sep 2016 09:19:24 -0700 Subject: [PATCH 6/6] Release v0.8.3 --- README.md | 2 +- openssl/Cargo.toml | 4 ++-- openssl/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 78bce6cd..d919cff1 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 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 "] 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/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;