Commit cf075d8e authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.7.2' into release

parents badec803 13f7cfd9

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ os: 
- linux

env:

  global:

    - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto"

    - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac"

before_install:

- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)

script:

README.md

+4 −2
Original line number Diff line number Diff line
@@ -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.7.1/openssl).

[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl).



## Building
@@ -25,7 +25,9 @@ sudo pacman -S openssl 


OpenSSL 0.9.8 is preinstalled on OSX. Some features are only available when

linking against OpenSSL 1.0.0 or greater; see below on how to point

rust-openssl to a separate installation.

rust-openssl to a separate installation. OSX releases starting at 10.11, "El

Capitan", no longer include OpenSSL headers which will prevent the `openssl`

crate from compiling.



### Windows

appveyor.yml

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ environment: 
  - TARGET: x86_64-pc-windows-msvc

    BITS: 64

install:

  - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2d.exe"

  - Win%BITS%OpenSSL-1_0_2d.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL"

  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"

  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"

  - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2e.exe"

  - Win%BITS%OpenSSL-1_0_2e.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL"

  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.5.0-${env:TARGET}.exe"

  - rust-1.5.0-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"

  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin

  - SET PATH=%PATH%;C:\MinGW\bin

  - rustc -V

openssl-sys-extras/Cargo.toml

+2 −4
Original line number Diff line number Diff line 
[package]

name = "openssl-sys-extras"

version = "0.7.1"

version = "0.7.2"

authors = ["Steven Fackler <sfackler@gmail.com>"]

license = "MIT"

description = "Extra FFI bindings to OpenSSL that require a C shim"

repository = "https://github.com/sfackler/rust-openssl"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.1/openssl_sys_extras"



links = "openssl_shim"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl_sys_extras"

build = "build.rs"



[features]

openssl-sys-extras/src/lib.rs

+14 −2
Original line number Diff line number Diff line 
#![allow(non_upper_case_globals, non_snake_case)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.0")]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.2")]



extern crate openssl_sys;

extern crate libc;



use libc::{c_int, c_uint, c_long, c_char};

use libc::{c_int, c_uint, c_long, c_char, c_void};

use openssl_sys::{HMAC_CTX, EVP_MD, ENGINE, SSL_CTX, BIO, X509, stack_st_X509_EXTENSION, SSL, DH};



macro_rules! import_options {
@@ -49,6 +49,14 @@ extern { 
    pub fn BIO_set_nbio(b: *mut BIO, enabled: c_long) -> c_long;

    #[link_name = "BIO_set_mem_eof_return_shim"]

    pub fn BIO_set_mem_eof_return(b: *mut BIO, v: c_int);

    #[link_name = "BIO_clear_retry_flags_shim"]

    pub fn BIO_clear_retry_flags(b: *mut BIO);

    #[link_name = "BIO_set_retry_read_shim"]

    pub fn BIO_set_retry_read(b: *mut BIO);

    #[link_name = "BIO_set_retry_write_shim"]

    pub fn BIO_set_retry_write(b: *mut BIO);

    #[link_name = "BIO_flush"]

    pub fn BIO_flush(b: *mut BIO) -> c_long;

    pub fn SSL_CTX_set_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;

    pub fn SSL_CTX_get_options_shim(ctx: *mut SSL_CTX) -> c_long;

    pub fn SSL_CTX_clear_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;
@@ -65,4 +73,8 @@ extern { 
    pub fn SSL_CTX_set_tmp_dh(s: *mut SSL, dh: *const DH) -> c_long;

    #[link_name = "X509_get_extensions_shim"]

    pub fn X509_get_extensions(x: *mut X509) -> *mut stack_st_X509_EXTENSION;

    #[link_name = "SSL_CTX_set_tlsext_servername_callback_shim"]

    pub fn SSL_CTX_set_tlsext_servername_callback(ssl: *mut SSL_CTX, callback: Option<extern fn()>);

    #[link_name = "SSL_CTX_set_tlsext_servername_arg_shim"]

    pub fn SSL_CTX_set_tlsext_servername_arg(ssl: *mut SSL_CTX, arg: *const c_void);

}