min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release-v0.8.3' into release

This commit is contained in:
Steven Fackler 2016-09-09 09:19:43 -07:00
parent 87a3bc2615 8d95383f32
commit 37c475384a
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

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

4
appveyor.yml
View File

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

4
openssl/Cargo.toml
View File

@ -1,11 +1,11 @@
[package] [package]
name = "openssl" name = "openssl"
version = "0.8.2" version = "0.8.3"
authors = ["Steven Fackler <sfackler@gmail.com>"] authors = ["Steven Fackler <sfackler@gmail.com>"]
license = "Apache-2.0" license = "Apache-2.0"
description = "OpenSSL bindings" description = "OpenSSL bindings"
repository = "https://github.com/sfackler/rust-openssl" 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" readme = "../README.md"
keywords = ["crypto", "tls", "ssl", "dtls"] keywords = ["crypto", "tls", "ssl", "dtls"]
build = "build.rs" build = "build.rs"

2
openssl/src/crypto/util.rs
View File

@ -41,7 +41,7 @@ pub extern "C" fn invoke_passwd_cb<F>(buf: *mut c_char,
_rwflag: c_int, _rwflag: c_int,
cb_state: *mut c_void) cb_state: *mut c_void)
-> c_int -> c_int
where F: FnOnce(&mut [i8]) -> usize { where F: FnOnce(&mut [c_char]) -> usize {
let result = panic::catch_unwind(|| { let result = panic::catch_unwind(|| {
// build a `i8` slice to pass to the user callback // build a `i8` slice to pass to the user callback
let pass_slice = unsafe { slice::from_raw_parts_mut(buf, size as usize) }; let pass_slice = unsafe { slice::from_raw_parts_mut(buf, size as usize) };

3
openssl/src/error.rs
View File

@ -7,7 +7,7 @@ use std::str;
use ffi; use ffi;
#[derive(Debug)] #[derive(Debug, Clone)]
pub struct ErrorStack(Vec<Error>); pub struct ErrorStack(Vec<Error>);
impl ErrorStack { impl ErrorStack {
@ -61,6 +61,7 @@ impl From<ErrorStack> for fmt::Error {
} }
/// An error reported from OpenSSL. /// An error reported from OpenSSL.
#[derive(Clone)]
pub struct Error(c_ulong); pub struct Error(c_ulong);
impl Error { impl Error {

2
openssl/src/lib.rs
View File

@ -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] #[macro_use]
extern crate bitflags; extern crate bitflags;