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

Merge branch 'release-v0.7.10' into release

parents a25f1153 54fc1df7

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

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

version = "0.7.10"

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

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

build = "build.rs"



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


[dependencies]

libc = "0.2"

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

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

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



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

version = "0.7.10"

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

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

links = "openssl"

build = "build.rs"

openssl-sys/src/lib.rs

+12 −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.9")]

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



extern crate libc;
@@ -259,6 +259,12 @@ pub const SSL_TLSEXT_ERR_ALERT_WARNING: c_int = 1; 
pub const SSL_TLSEXT_ERR_ALERT_FATAL: c_int = 2;

pub const SSL_TLSEXT_ERR_NOACK: c_int = 3;



pub const SSLEAY_VERSION : c_int = 0;

pub const SSLEAY_CFLAGS : c_int = 2;

pub const SSLEAY_BUILT_ON : c_int = 3;

pub const SSLEAY_PLATFORM : c_int = 4;

pub const SSLEAY_DIR : c_int = 5;



#[cfg(any(feature = "npn", feature = "alpn"))]

pub const OPENSSL_NPN_UNSUPPORTED: c_int = 0;

#[cfg(any(feature = "npn", feature = "alpn"))]
@@ -667,6 +673,7 @@ extern "C" { 
    pub fn SSL_CTX_set_verify_depth(ctx: *mut SSL_CTX, depth: c_int);

    pub fn SSL_CTX_load_verify_locations(ctx: *mut SSL_CTX, CAfile: *const c_char,

                                         CApath: *const c_char) -> c_int;

    pub fn SSL_CTX_set_default_verify_paths(ctx: *mut SSL_CTX) -> c_int;

    pub fn SSL_CTX_get_ex_new_index(argl: c_long, argp: *const c_void,

                                    new_func: Option<CRYPTO_EX_new>,

                                    dup_func: Option<CRYPTO_EX_dup>,
@@ -675,6 +682,7 @@ extern "C" { 
    pub fn SSL_CTX_set_ex_data(ctx: *mut SSL_CTX, idx: c_int, data: *mut c_void)

                               -> c_int;

    pub fn SSL_CTX_get_ex_data(ctx: *mut SSL_CTX, idx: c_int) -> *mut c_void;

    pub fn SSL_CTX_set_session_id_context(ssl: *mut SSL_CTX, sid_ctx: *const c_uchar, sid_ctx_len: c_uint) -> c_int;



    pub fn SSL_CTX_use_certificate_file(ctx: *mut SSL_CTX, cert_file: *const c_char, file_type: c_int) -> c_int;

    pub fn SSL_CTX_use_certificate_chain_file(ctx: *mut SSL_CTX, cert_chain_file: *const c_char, file_type: c_int) -> c_int;
@@ -768,6 +776,9 @@ extern "C" { 
    pub fn d2i_RSA_PUBKEY(k: *const *mut RSA, buf: *const *const u8, len: c_uint) -> *mut RSA;

    pub fn i2d_RSAPrivateKey(k: *mut RSA, buf: *const *mut u8) -> c_int;

    pub fn d2i_RSAPrivateKey(k: *const *mut RSA, buf: *const *const u8, len: c_uint) -> *mut RSA;



    pub fn SSLeay() -> c_long;

    pub fn SSLeay_version(key: c_int) -> *const c_char;

}



pub mod probe;