Commit d080c109 authored by Benjamin Fry's avatar Benjamin Fry
Browse files

fix cfg options for v102 and v110

parent f8298882

openssl/src/ssl/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ use ec::EcKeyRef; 
use ec::EcKey;

use x509::{X509StoreContextRef, X509FileType, X509, X509Ref, X509VerifyError, X509Name};

use x509::store::{X509StoreBuilderRef, X509StoreRef};

#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]

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

use x509::store::X509Store;

#[cfg(any(ossl102, ossl110))]

use verify::X509VerifyParamRef;
@@ -655,7 +655,7 @@ impl SslContextBuilder { 
    }



    /// Sets a custom X509Store for verifying peer certificates

    #[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]

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

    pub fn set_verify_cert_store(&mut self, cert_store: X509Store) -> Result<(), ErrorStack> {

        unsafe {

            // set0 will free, set1 increments, and then requires a free