Commit 1417ebdd authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.7.5' into release

parents 3fdfe56f 2ece5b10

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.3/openssl).

[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.5/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.4"

version = "0.7.5"

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

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

build = "build.rs"



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


[dependencies]

libc = "0.2"

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

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



[build-dependencies]

gcc = "0.3"

openssl-sys-extras/src/lib.rs

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

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



extern crate openssl_sys;

extern crate libc;

openssl-sys/Cargo.toml

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

name = "openssl-sys"

version = "0.7.4"

version = "0.7.5"

authors = ["Alex Crichton <alex@alexcrichton.com>",

           "Steven Fackler <sfackler@gmail.com>"]

license = "MIT"

description = "FFI bindings to OpenSSL"

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

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.4/openssl_sys"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.5/openssl_sys"

links = "openssl"

build = "build.rs"

openssl-sys/src/lib.rs

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

#![allow(dead_code)]

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

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



extern crate libc;
@@ -48,7 +48,6 @@ pub type bio_info_cb = Option<unsafe extern "C" fn(*mut BIO, 


#[repr(C)]

#[derive(Copy, Clone)]

#[allow(raw_pointer_derive)]

pub struct BIO_METHOD {

    pub type_: c_int,

    pub name: *const c_char,
@@ -527,6 +526,9 @@ extern "C" { 
    pub fn PEM_read_bio_PUBKEY(bio: *mut BIO, out: *mut *mut EVP_PKEY, callback: Option<PasswordCallback>,

                             user_data: *mut c_void) -> *mut X509;



    pub fn PEM_read_bio_RSAPrivateKey(bio: *mut BIO, rsa: *mut *mut RSA, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut RSA;

    pub fn PEM_read_bio_RSA_PUBKEY(bio:    *mut BIO, rsa: *mut *mut RSA, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut RSA;



    pub fn PEM_write_bio_PrivateKey(bio: *mut BIO, pkey: *mut EVP_PKEY, cipher: *const EVP_CIPHER,

                                    kstr: *mut c_char, klen: c_int,

                                    callback: Option<PasswordCallback>,