aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-19 21:27:45 -0700
committerGitHub <[email protected]>2016-10-19 21:27:45 -0700
commit494bc9b7544bf724d9dea3b82ec2d4de0feb605c (patch)
treedb69ff63d60f1efcb9ae90124118814387520b1d /openssl-sys
parentMerge pull request #481 from sfackler/pn-errors (diff)
parentAllow the X509 verify error to be read from an SslRef (diff)
downloadrust-openssl-494bc9b7544bf724d9dea3b82ec2d4de0feb605c.tar.xz
rust-openssl-494bc9b7544bf724d9dea3b82ec2d4de0feb605c.zip
Merge pull request #483 from sfackler/x509-error
X509 verification error cleanup
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/src/lib.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index aae2540c..4c8d63ca 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -647,7 +647,8 @@ extern {
pub fn SSL_get_servername(ssl: *const SSL, name_type: c_int) -> *const c_char;
pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER;
#[cfg(not(ossl101))]
- pub fn SSL_get0_param(ssl: *mut ::SSL) -> *mut X509_VERIFY_PARAM;
+ pub fn SSL_get0_param(ssl: *mut SSL) -> *mut X509_VERIFY_PARAM;
+ pub fn SSL_get_verify_result(ssl: *const SSL) -> c_long;
#[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char;
@@ -731,6 +732,7 @@ extern {
pub fn X509_sign(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int;
pub fn X509_get_pubkey(x: *mut X509) -> *mut EVP_PKEY;
pub fn X509_to_X509_REQ(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> *mut X509_REQ;
+ pub fn X509_verify_cert_error_string(n: c_long) -> *const c_char;
pub fn X509_EXTENSION_free(ext: *mut X509_EXTENSION);