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

Merge branch 'release-v0.7.9' into release

parents 9043d323 d143203f

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

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

version = "0.7.9"

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

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

build = "build.rs"



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


[dependencies]

libc = "0.2"

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

openssl-sys = { version = "0.7.9", 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.8")]

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



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.8"

version = "0.7.9"

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

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

links = "openssl"

build = "build.rs"

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.8")]

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



extern crate libc;
@@ -548,6 +548,7 @@ extern "C" { 
    pub fn EVP_PKEY_new() -> *mut EVP_PKEY;

    pub fn EVP_PKEY_free(k: *mut EVP_PKEY);

    pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *const c_void) -> c_int;

    pub fn EVP_PKEY_copy_parameters(to: *mut EVP_PKEY, from: *const EVP_PKEY) -> c_int;

    pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;

    pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int;

    pub fn EVP_PKEY_cmp(a: *const EVP_PKEY, b: *const EVP_PKEY) -> c_int;