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

Merge branch 'release-v0.7.1' into release

parents 094e8e5b fce7cf4d

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

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

version = "0.7.1"

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

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



links = "openssl_shim"

build = "build.rs"
@@ -15,7 +15,7 @@ ecdh_auto = [] 


[dependencies]

libc = "0.2"

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

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



[build-dependencies]

gcc = "0.3"

openssl-sys/Cargo.toml

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

name = "openssl-sys"

version = "0.7.0"

version = "0.7.1"

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.0/openssl_sys"

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



links = "openssl"

build = "build.rs"
@@ -29,7 +29,6 @@ libc = "0.2" 


[build-dependencies]

pkg-config = "0.3"

gcc = "0.3"



[target.le32-unknown-nacl.dependencies]

libressl-pnacl-sys = "2.1.0"

openssl-sys/build.rs

+5 −3
Original line number Diff line number Diff line 
extern crate pkg_config;

extern crate gcc;



use std::env;
@@ -16,8 +15,11 @@ fn main() { 
        // rustc doesn't seem to work with pkg-config's output in mingw64

        if !target.contains("windows") {

            if let Ok(info) = pkg_config::find_library("openssl") {

                // avoid empty include paths as they are not supported by GCC

                if info.include_paths.len() > 0 {

                    let paths = env::join_paths(info.include_paths).unwrap();

                    println!("cargo:include={}", paths.to_str().unwrap());

                }

                return;

            }

        }

openssl-sys/src/lib.rs

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

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



extern crate libc;
@@ -482,6 +482,7 @@ extern "C" { 


    pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int;



    pub fn RSA_free(rsa: *mut RSA);

    pub fn RSA_generate_key(modsz: c_int, e: c_ulong, cb: *const c_void, cbarg: *const c_void) -> *mut RSA;

    pub fn RSA_generate_key_ex(rsa: *mut RSA, bits: c_int, e: *mut BIGNUM, cb: *const c_void) -> c_int;

    pub fn RSA_private_decrypt(flen: c_int, from: *const u8, to: *mut u8, k: *mut RSA,