Commit 6fe7dd30 authored by Steven Fackler's avatar Steven Fackler
Browse files

Remove an enum

parent 772a5062

openssl/src/ssl/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ impl SslContextBuilder { 
        unsafe {

            cvt(ffi::SSL_CTX_use_certificate_file(self.as_ptr(),

                                                  file.as_ptr() as *const _,

                                                  file_type as c_int))

                                                  file_type.as_raw()))

                .map(|_| ())

        }

    }
@@ -607,7 +607,7 @@ impl SslContextBuilder { 
        unsafe {

            cvt(ffi::SSL_CTX_use_PrivateKey_file(self.as_ptr(),

                                                 file.as_ptr() as *const _,

                                                 file_type as c_int))

                                                 file_type.as_raw()))

                .map(|_| ())

        }

    }

openssl/src/ssl/tests/mod.rs

+13 −15
Original line number Diff line number Diff line
@@ -20,9 +20,7 @@ use ssl::SSL_VERIFY_PEER; 
use ssl::{SslMethod, HandshakeError};

use ssl::{SslContext, SslStream, Ssl, ShutdownResult, SslConnectorBuilder, SslAcceptorBuilder,

          Error};

use x509::X509StoreContext;

use x509::X509FileType;

use x509::X509;

use x509::{X509StoreContext, X509, X509_FILETYPE_PEM};

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

use x509::verify::X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS;

use pkey::PKey;
@@ -369,8 +367,8 @@ fn test_write_hits_stream() { 


    let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();

    ctx.set_verify(SSL_VERIFY_PEER);

    ctx.set_certificate_file(&Path::new("test/cert.pem"), X509FileType::PEM).unwrap();

    ctx.set_private_key_file(&Path::new("test/key.pem"), X509FileType::PEM).unwrap();

    ctx.set_certificate_file(&Path::new("test/cert.pem"), X509_FILETYPE_PEM).unwrap();

    ctx.set_private_key_file(&Path::new("test/key.pem"), X509_FILETYPE_PEM).unwrap();

    let stream = listener.accept().unwrap().0;

    let mut stream = Ssl::new(&ctx.build()).unwrap().accept(stream).unwrap();
@@ -634,9 +632,9 @@ fn test_npn_server_advertise_multiple() { 
        let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();

        ctx.set_verify(SSL_VERIFY_PEER);

        ctx.set_npn_protocols(&[b"http/1.1", b"spdy/3.1"]).unwrap();

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509FileType::PEM)

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509_FILETYPE_PEM)

                   .is_ok());

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509FileType::PEM)

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509_FILETYPE_PEM)

            .unwrap();

        ctx.build()

    };
@@ -675,9 +673,9 @@ fn test_alpn_server_advertise_multiple() { 
        let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();

        ctx.set_verify(SSL_VERIFY_PEER);

        ctx.set_alpn_protocols(&[b"http/1.1", b"spdy/3.1"]).unwrap();

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509FileType::PEM)

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509_FILETYPE_PEM)

                   .is_ok());

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509FileType::PEM)

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509_FILETYPE_PEM)

            .unwrap();

        ctx.build()

    };
@@ -716,9 +714,9 @@ fn test_alpn_server_select_none() { 
        let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();

        ctx.set_verify(SSL_VERIFY_PEER);

        ctx.set_alpn_protocols(&[b"http/1.1", b"spdy/3.1"]).unwrap();

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509FileType::PEM)

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509_FILETYPE_PEM)

                   .is_ok());

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509FileType::PEM)

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509_FILETYPE_PEM)

            .unwrap();

        ctx.build()

    };
@@ -751,9 +749,9 @@ fn test_alpn_server_select_none() { 
        let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();

        ctx.set_verify(SSL_VERIFY_PEER);

        ctx.set_alpn_protocols(&[b"http/1.1", b"spdy/3.1"]).unwrap();

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509FileType::PEM)

        assert!(ctx.set_certificate_file(&Path::new("test/cert.pem"), X509_FILETYPE_PEM)

                   .is_ok());

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509FileType::PEM)

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509_FILETYPE_PEM)

            .unwrap();

        ctx.build()

    };
@@ -1162,8 +1160,8 @@ fn shutdown() { 
    thread::spawn(move || {

        let stream = listener.accept().unwrap().0;

        let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();

        ctx.set_certificate_file(&Path::new("test/cert.pem"), X509FileType::PEM).unwrap();

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509FileType::PEM).unwrap();

        ctx.set_certificate_file(&Path::new("test/cert.pem"), X509_FILETYPE_PEM).unwrap();

        ctx.set_private_key_file(&Path::new("test/key.pem"), X509_FILETYPE_PEM).unwrap();

        let ssl = Ssl::new(&ctx.build()).unwrap();

        let mut stream = ssl.accept(stream).unwrap();

openssl/src/x509/mod.rs

+10 −6
Original line number Diff line number Diff line
@@ -39,13 +39,17 @@ pub mod extension; 
#[cfg(test)]

mod tests;



#[derive(Copy, Clone)]

#[repr(i32)]

pub enum X509FileType {

    PEM = ffi::X509_FILETYPE_PEM,

    ASN1 = ffi::X509_FILETYPE_ASN1,

    Default = ffi::X509_FILETYPE_DEFAULT,

pub struct X509FileType(c_int);



impl X509FileType {

    pub fn as_raw(&self) -> c_int {

        self.0

    }

}



pub const X509_FILETYPE_PEM: X509FileType = X509FileType(ffi::X509_FILETYPE_PEM);

pub const X509_FILETYPE_ASN1: X509FileType = X509FileType(ffi::X509_FILETYPE_ASN1);

pub const X509_FILETYPE_DEFAULT: X509FileType = X509FileType(ffi::X509_FILETYPE_DEFAULT);



type_!(X509StoreContext, ffi::X509_STORE_CTX, ffi::X509_STORE_CTX_free);