aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-06 12:16:44 -0800
committerSteven Fackler <[email protected]>2016-11-06 12:17:14 -0800
commit1edb6f682eaa728871e39aa41735a668fcc7447c (patch)
treee58e5412091483a332c6552290d8fbf2076e532d /openssl-sys/src
parentFix build on 1.0.1 (diff)
downloadrust-openssl-1edb6f682eaa728871e39aa41735a668fcc7447c.tar.xz
rust-openssl-1edb6f682eaa728871e39aa41735a668fcc7447c.zip
Support client CA advertisement
Diffstat (limited to 'openssl-sys/src')
-rw-r--r--openssl-sys/src/lib.rs2
-rw-r--r--openssl-sys/src/ossl10x.rs5
-rw-r--r--openssl-sys/src/ossl110.rs1
3 files changed, 8 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 13532477..496cc379 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1580,6 +1580,7 @@ extern {
pub fn SSL_get_privatekey(ssl: *mut SSL) -> *mut EVP_PKEY;
#[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;
#[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char;
@@ -1610,6 +1611,7 @@ extern {
pub fn SSL_CTX_use_PrivateKey_file(ctx: *mut SSL_CTX, key_file: *const c_char, file_type: c_int) -> c_int;
pub fn SSL_CTX_use_PrivateKey(ctx: *mut SSL_CTX, key: *mut EVP_PKEY) -> c_int;
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);
#[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 2b066446..0cc75fca 100644
--- a/openssl-sys/src/ossl10x.rs
+++ b/openssl-sys/src/ossl10x.rs
@@ -17,6 +17,11 @@ pub struct stack_st_X509 {
}
#[repr(C)]
+pub struct stack_st_X509_NAME {
+ pub stack: _STACK,
+}
+
+#[repr(C)]
pub struct stack_st_X509_ATTRIBUTE {
pub stack: _STACK,
}
diff --git a/openssl-sys/src/ossl110.rs b/openssl-sys/src/ossl110.rs
index a2259fc6..e8d62d73 100644
--- a/openssl-sys/src/ossl110.rs
+++ b/openssl-sys/src/ossl110.rs
@@ -18,6 +18,7 @@ pub enum stack_st_GENERAL_NAME {}
pub enum stack_st_OPENSSL_STRING {}
pub enum stack_st_void {}
pub enum stack_st_X509 {}
+pub enum stack_st_X509_NAME {}
pub enum stack_st_X509_ATTRIBUTE {}
pub enum stack_st_X509_EXTENSION {}
pub enum X509 {}