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

Fix build on 1.0.1

parent bcb7b3f5

openssl-sys/src/lib.rs

+5 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,9 @@ extern { 
    pub fn SSL_get_verify_result(ssl: *const SSL) -> c_long;

    pub fn SSL_shutdown(ssl: *mut SSL) -> c_int;

    pub fn SSL_get_certificate(ssl: *const SSL) -> *mut X509;

    #[cfg(ossl101)]

    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;



    #[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
@@ -1608,7 +1611,9 @@ extern { 
    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;



    #[cfg(not(ossl101))]

    pub fn SSL_CTX_get0_certificate(ctx: *const SSL_CTX) -> *mut X509;

    #[cfg(not(ossl101))]

    pub fn SSL_CTX_get0_privatekey(ctx: *const SSL_CTX) -> *mut EVP_PKEY;



    pub fn SSL_CTX_set_cipher_list(ssl: *mut SSL_CTX, s: *const c_char) -> c_int;

openssl/src/ssl/mod.rs

+6 −0
Original line number Diff line number Diff line
@@ -764,6 +764,9 @@ impl SslContext { 


impl SslContextRef {

    /// Returns the certificate associated with this `SslContext`, if present.

    ///

    /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0.

    #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]

    pub fn certificate(&self) -> Option<&X509Ref> {

        unsafe {

            let ptr = ffi::SSL_CTX_get0_certificate(self.as_ptr());
@@ -776,6 +779,9 @@ impl SslContextRef { 
    }



    /// Returns the private key associated with this `SslContext`, if present.

    ///

    /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0.

    #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]

    pub fn private_key(&self) -> Option<&PKeyRef> {

        unsafe {

            let ptr = ffi::SSL_CTX_get0_privatekey(self.as_ptr());