aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-04-06 21:34:26 -0700
committerSteven Fackler <[email protected]>2016-04-06 21:34:26 -0700
commita25f115360a9a82950352dcf524c9e5405ce683d (patch)
tree001c023f39b37a6b057dd6e573686ecc2388bd89 /openssl-sys
parentMerge branch 'release-v0.7.8' into release (diff)
parentRelease v0.7.9 (diff)
downloadrust-openssl-0.7.9.tar.xz
rust-openssl-0.7.9.zip
Merge branch 'release-v0.7.9' into releasev0.7.9
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/Cargo.toml4
-rw-r--r--openssl-sys/src/lib.rs3
2 files changed, 4 insertions, 3 deletions
diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
index 2498c234..35cebfc9 100644
--- a/openssl-sys/Cargo.toml
+++ b/openssl-sys/Cargo.toml
@@ -1,12 +1,12 @@
[package]
name = "openssl-sys"
-version = "0.7.8"
+version = "0.7.9"
authors = ["Alex Crichton <[email protected]>",
"Steven Fackler <[email protected]>"]
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"
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 6d6d6103..85f434ae 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1,6 +1,6 @@
#![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;