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

Merge branch 'release-v0.7.14' into release

parents 743451e9 5135fca8

.travis.yml

+1 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ addons: 
    - gcc-arm-linux-gnueabihf

rust:

- nightly

- 1.7.0

- 1.8.0

os:

- osx

- linux
@@ -25,6 +25,4 @@ matrix: 
before_install:

- ./openssl/test/build.sh

script:

- cargo fetch --manifest-path openssl/Cargo.toml # generate a cargo.lock

- cargo update --manifest-path openssl/Cargo.toml -p bitflags --precise 0.5.0

- ./openssl/test/run.sh

README.md

+1 −1
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.13/openssl).

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



## Building

openssl-sys-extras/Cargo.toml

+3 −3
Original line number Diff line number Diff line 
[package]

name = "openssl-sys-extras"

version = "0.7.13"

version = "0.7.14"

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.13/openssl_sys_extras"

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

build = "build.rs"



[features]
@@ -13,7 +13,7 @@ ecdh_auto = [] 


[dependencies]

libc = "0.2"

openssl-sys = { version = "0.7.13", path = "../openssl-sys" }

openssl-sys = { version = "0.7.14", path = "../openssl-sys" }



[build-dependencies]

gcc = "0.3"

openssl-sys-extras/src/lib.rs

+3 −1
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.13")]

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



extern crate openssl_sys;

extern crate libc;
@@ -60,6 +60,8 @@ extern { 
    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;

    #[link_name = "SSL_CTX_set_mode_shim"]

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

    #[link_name = "SSL_CTX_add_extra_chain_cert_shim"]

    pub fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long;

    #[link_name = "SSL_CTX_set_read_ahead_shim"]

openssl-sys-extras/src/openssl_shim.c

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ long SSL_CTX_clear_options_shim(SSL_CTX *ctx, long options) { 
    return SSL_CTX_clear_options(ctx, options);

}



long SSL_CTX_set_mode_shim(SSL_CTX *ctx, long options) {

    return SSL_CTX_set_mode(ctx, options);

}



long SSL_CTX_add_extra_chain_cert_shim(SSL_CTX *ctx, X509 *x509) {

    return SSL_CTX_add_extra_chain_cert(ctx, x509);

}