aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-12 12:43:44 +0000
committerSteven Fackler <[email protected]>2016-11-12 12:43:44 +0000
commit563754fb0892ebf8021bb6043f4540c98f3b86a6 (patch)
tree7d2f505f93748d15ccc6d5de553b218a48546146 /openssl-sys/src
parentDrop bits to u32 (diff)
downloadrust-openssl-563754fb0892ebf8021bb6043f4540c98f3b86a6.tar.xz
rust-openssl-563754fb0892ebf8021bb6043f4540c98f3b86a6.zip
Add SslContextBuilder::set_tmp_{ec,}dh_callback
Diffstat (limited to 'openssl-sys/src')
-rw-r--r--openssl-sys/src/lib.rs10
-rw-r--r--openssl-sys/src/ossl10x.rs10
2 files changed, 20 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 17c2864d..7fda34d4 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1592,6 +1592,11 @@ extern {
#[cfg(not(ossl101))]
pub fn SSL_get_privatekey(ssl: *const SSL) -> *mut EVP_PKEY;
pub fn SSL_load_client_CA_file(file: *const c_char) -> *mut stack_st_X509_NAME;
+ pub fn SSL_set_tmp_dh_callback(ctx: *mut SSL,
+ dh: unsafe extern fn(ssl: *mut SSL,
+ is_export: c_int,
+ keylength: c_int)
+ -> *mut DH);
#[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char;
@@ -1624,6 +1629,11 @@ extern {
pub fn SSL_CTX_check_private_key(ctx: *const SSL_CTX) -> c_int;
pub fn SSL_CTX_set_client_CA_list(ctx: *mut SSL_CTX, list: *mut stack_st_X509_NAME);
pub fn SSL_CTX_get_cert_store(ctx: *const SSL_CTX) -> *mut X509_STORE;
+ pub fn SSL_CTX_set_tmp_dh_callback(ctx: *mut SSL_CTX,
+ dh: unsafe extern fn(ssl: *mut SSL,
+ is_export: c_int,
+ keylength: c_int)
+ -> *mut DH);
#[cfg(not(ossl101))]
pub fn SSL_CTX_get0_certificate(ctx: *const SSL_CTX) -> *mut X509;
diff --git a/openssl-sys/src/ossl10x.rs b/openssl-sys/src/ossl10x.rs
index baab16ac..ad7d065c 100644
--- a/openssl-sys/src/ossl10x.rs
+++ b/openssl-sys/src/ossl10x.rs
@@ -576,12 +576,22 @@ extern {
dup_func: Option<::CRYPTO_EX_dup>,
free_func: Option<::CRYPTO_EX_free>)
-> c_int;
+ pub fn SSL_set_tmp_ecdh_callback(ssl: *mut ::SSL,
+ ecdh: unsafe extern fn(ssl: *mut ::SSL,
+ is_export: c_int,
+ keylength: c_int)
+ -> *mut ::EC_KEY);
pub fn SSL_CIPHER_get_version(cipher: *const ::SSL_CIPHER) -> *mut c_char;
pub fn SSL_CTX_get_ex_new_index(argl: c_long, argp: *mut c_void,
new_func: Option<::CRYPTO_EX_new>,
dup_func: Option<::CRYPTO_EX_dup>,
free_func: Option<::CRYPTO_EX_free>)
-> c_int;
+ pub fn SSL_CTX_set_tmp_ecdh_callback(ctx: *mut ::SSL_CTX,
+ ecdh: unsafe extern fn(ssl: *mut ::SSL,
+ is_export: c_int,
+ keylength: c_int)
+ -> *mut ::EC_KEY);
pub fn X509_get_subject_name(x: *mut ::X509) -> *mut ::X509_NAME;
pub fn X509_set_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
pub fn X509_set_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;