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

Merge branch 'release'

parents 11129aa5 3fdfe56f

openssl-sys-extras/Cargo.toml

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

name = "openssl-sys-extras"

version = "0.7.3"

version = "0.7.4"

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

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

build = "build.rs"



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


[dependencies]

libc = "0.2"

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

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

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



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

version = "0.7.4"

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

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

links = "openssl"

build = "build.rs"

openssl-sys/src/lib.rs

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

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



extern crate libc;

openssl/Cargo.toml

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

name = "openssl"

version = "0.7.3"

version = "0.7.4"

authors = ["Steven Fackler <sfackler@gmail.com>"]

license = "Apache-2.0"

description = "OpenSSL bindings"

repository = "https://github.com/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.4/openssl"

readme = "../README.md"

keywords = ["crypto", "tls", "ssl", "dtls"]

build = "build.rs"
@@ -29,8 +29,8 @@ pkcs5_pbkdf2_hmac = ["openssl-sys/pkcs5_pbkdf2_hmac"] 
bitflags = ">= 0.2, < 0.4"

lazy_static = "0.1"

libc = "0.2"

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

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

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

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



[build-dependencies]

gcc = "0.3"