Commit 8940bd76 authored by Paul Kehrer's avatar Paul Kehrer
Browse files

add support for SSL_CTX_clear_options and use bitflags

parent 06ba41ad

openssl-sys/src/lib.rs

+5 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ pub const NID_ext_key_usage: c_int = 126; 
pub const NID_key_usage:     c_int = 83;



pub const SSL_CTRL_OPTIONS: c_int = 32;

pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77;



pub const SSL_CTRL_SET_TLSEXT_HOSTNAME: c_int = 55;

pub const SSL_ERROR_NONE: c_int = 0;
@@ -247,6 +248,10 @@ pub unsafe fn SSL_CTX_get_options(ssl: *mut SSL_CTX) -> c_long { 
    SSL_CTX_ctrl(ssl, SSL_CTRL_OPTIONS, 0, ptr::null_mut())

}



pub unsafe fn SSL_CTX_clear_options(ssl: *mut SSL_CTX, op: c_long) -> c_long {

    SSL_CTX_ctrl(ssl, SSL_CTRL_CLEAR_OPTIONS, (op), ptr::null_mut())

}



// True functions

extern "C" {

    pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;

openssl/Cargo.toml

+3 −0
Original line number Diff line number Diff line
@@ -21,3 +21,6 @@ version = "0.4.3" 


[dev-dependencies]

rustc-serialize = "0.2"



[dependencies]

bitflags = "0.1.1"

openssl/src/lib.rs

+3 −0
Original line number Diff line number Diff line 
#![feature(unsafe_destructor, core, old_io, std_misc, libc, old_path)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl")]



#[macro_use]

extern crate bitflags;



extern crate libc;

#[cfg(test)]

extern crate "rustc-serialize" as serialize;

openssl/src/ssl/mod.rs

+51 −7
Original line number Diff line number Diff line
@@ -33,6 +33,39 @@ fn init() { 
    }

}



bitflags! {

    flags SslContextOptions: c_long {

        const SSL_OP_LEGACY_SERVER_CONNECT = 0x00000004,

        const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG = 0x00000008,

        const SSL_OP_TLSEXT_PADDING = 0x00000010,

        const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER = 0x00000020,

        const SSL_OP_SAFARI_ECDHE_ECDSA_BUG = 0x00000040,

        const SSL_OP_SSLEAY_080_CLIENT_DH_BUG = 0x00000080,

        const SSL_OP_TLS_D5_BUG = 0x00000100,

        const SSL_OP_TLS_BLOCK_PADDING_BUG = 0x00000200,

        const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS = 0x00000800,

        const SSL_OP_ALL = 0x80000BFF,

        const SSL_OP_NO_QUERY_MTU = 0x00001000,

        const SSL_OP_COOKIE_EXCHANGE = 0x00002000,

        const SSL_OP_NO_TICKET = 0x00004000,

        const SSL_OP_CISCO_ANYCONNECT = 0x00008000,

        const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION = 0x00010000,

        const SSL_OP_NO_COMPRESSION = 0x00020000,

        const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION = 0x00040000,

        const SSL_OP_SINGLE_ECDH_USE = 0x00080000,

        const SSL_OP_SINGLE_DH_USE = 0x00100000,

        const SSL_OP_CIPHER_SERVER_PREFERENCE = 0x00400000,

        const SSL_OP_TLS_ROLLBACK_BUG = 0x00800000,

        const SSL_OP_NO_SSLV2 = 0x00000000,

        const SSL_OP_NO_SSLV3 = 0x02000000,

        const SSL_OP_NO_TLSV1 = 0x04000000,

        const SSL_OP_NO_TLSV1_2 = 0x08000000,

        const SSL_OP_NO_TLSV1_1 = 0x10000000,

        const SSL_OP_NO_DTLSV1 = 0x04000000,

        const SSL_OP_NO_DTLSV1_2 = 0x08000000

    }

}



/// Determines the SSL method supported

#[allow(non_camel_case_types)]

#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
@@ -280,16 +313,27 @@ impl SslContext { 
            })

    }



    pub fn set_options(&mut self, option: c_long) -> c_long {

        unsafe {

            ffi::SSL_CTX_set_options(*self.ctx, option)

        }

    pub fn set_options(&mut self, option: SslContextOptions) -> SslContextOptions {

        let raw_bits = option.bits();

        let ret = unsafe {

            ffi::SSL_CTX_set_options(*self.ctx, raw_bits)

        };

        SslContextOptions::from_bits(ret).unwrap()

    }



    pub fn get_options(&mut self) -> c_long {

        unsafe {

    pub fn get_options(&mut self) -> SslContextOptions {

        let ret = unsafe {

            ffi::SSL_CTX_get_options(*self.ctx)

        };

        SslContextOptions::from_bits(ret).unwrap()

    }



    pub fn clear_options(&mut self, option: SslContextOptions) -> SslContextOptions {

        let raw_bits = option.bits();

        let ret = unsafe {

            ffi::SSL_CTX_clear_options(*self.ctx, raw_bits)

        };

        SslContextOptions::from_bits(ret).unwrap()

    }

}

openssl/src/ssl/tests.rs

+15 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ use std::old_io::{Writer}; 
use std::thread;



use crypto::hash::Type::{SHA256};

use ssl;

use ssl::SslMethod::Sslv23;

use ssl::{SslContext, SslStream, VerifyCallback};

use ssl::SslVerifyMode::SslVerifyPeer;
@@ -183,10 +184,20 @@ fn test_get_ctx_options() { 
#[test]

fn test_set_ctx_options() {

    let mut ctx = SslContext::new(Sslv23).unwrap();

    let start_opts = ctx.get_options();

    let ssl_op_no_sslv3 = 0x02000000;

    let res = ctx.set_options(ssl_op_no_sslv3);

    assert_eq!(res, start_opts | ssl_op_no_sslv3);

    let opts = ctx.set_options(ssl::SSL_OP_NO_TICKET);

    assert!(opts.contains(ssl::SSL_OP_NO_TICKET));

    assert!(!opts.contains(ssl::SSL_OP_CISCO_ANYCONNECT));

    let more_opts = ctx.set_options(ssl::SSL_OP_CISCO_ANYCONNECT);

    assert!(more_opts.contains(ssl::SSL_OP_NO_TICKET));

    assert!(more_opts.contains(ssl::SSL_OP_CISCO_ANYCONNECT));

}



#[test]

fn test_clear_ctx_options() {

    let mut ctx = SslContext::new(Sslv23).unwrap();

    ctx.set_options(ssl::SSL_OP_ALL);

    let opts = ctx.clear_options(ssl::SSL_OP_ALL);

    assert!(!opts.contains(ssl::SSL_OP_ALL));

}



#[test]