Commit d66d84b2 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #607 from sfackler/set-session 

Logic to support client-side session reuse
parents 3aec0a38 c8d1698f

.travis.yml

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ matrix: 


before_install:

  - ./openssl/test/build.sh

  - curl https://static.rust-lang.org/rustup.sh |

    sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`

  - rustup target add $TARGET || true

script:

  - ./openssl/test/run.sh

openssl-sys/src/lib.rs

+2 −1
Original line number Diff line number Diff line
@@ -1891,6 +1891,7 @@ extern { 
                                 client: *const c_uchar, client_len: c_uint) -> c_int;

    pub fn SSL_get0_next_proto_negotiated(s: *const SSL, data: *mut *const c_uchar, len: *mut c_uint);

    pub fn SSL_get_session(s: *const SSL) -> *mut SSL_SESSION;

    pub fn SSL_set_session(ssl: *mut SSL, session: *mut SSL_SESSION) -> c_int;

    #[cfg(not(any(ossl101, libressl)))]

    pub fn SSL_is_server(s: *mut SSL) -> c_int;

openssl-sys/src/libressl.rs

+10 −3
Original line number Diff line number Diff line 
use std::sync::{Mutex, MutexGuard};

use std::sync::{Once, ONCE_INIT};

use std::mem;

use std::ptr;



use libc::{c_int, c_char, c_void, c_long, c_uchar, size_t, c_uint, c_ulong};

use libc::time_t;
@@ -500,7 +501,7 @@ pub struct SSL_SESSION { 
    verify_result: c_long,

    timeout: c_long,

    time: time_t,

    references: c_int,

    pub references: c_int,

    cipher: *const c_void,

    cipher_id: c_ulong,

    ciphers: *mut c_void,
@@ -533,6 +534,7 @@ pub struct X509_VERIFY_PARAM { 
pub enum X509_VERIFY_PARAM_ID {}

pub enum PKCS12 {}



pub const SSL_CTRL_GET_SESSION_REUSED: c_int = 8;

pub const SSL_CTRL_OPTIONS: c_int = 32;

pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77;

pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94;
@@ -565,6 +567,7 @@ pub const SSLEAY_DIR : c_int = 5; 


pub const CRYPTO_LOCK_X509: c_int = 3;

pub const CRYPTO_LOCK_SSL_CTX: c_int = 12;

pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14;



static mut MUTEXES: *mut Vec<Mutex<()>> = 0 as *mut Vec<Mutex<()>>;

static mut GUARDS: *mut Vec<Option<MutexGuard<'static, ()>>> = 0 as *mut Vec<Option<MutexGuard<'static, ()>>>;
@@ -622,11 +625,15 @@ fn set_id_callback() {} 
// macros



pub unsafe fn SSL_CTX_set_ecdh_auto(ctx: *mut SSL_CTX, onoff: c_int) -> c_int {

    ::SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ::std::ptr::null_mut()) as c_int

    ::SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ptr::null_mut()) as c_int

}



pub unsafe fn SSL_set_ecdh_auto(ssl: *mut ::SSL, onoff: c_int) -> c_int {

    ::SSL_ctrl(ssl, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ::std::ptr::null_mut()) as c_int

    ::SSL_ctrl(ssl, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ptr::null_mut()) as c_int

}



pub unsafe fn SSL_session_reused(ssl: *mut ::SSL) -> c_int {

    ::SSL_ctrl(ssl, SSL_CTRL_GET_SESSION_REUSED, 0, ptr::null_mut()) as c_int

}



extern {

openssl-sys/src/ossl10x.rs

+10 −3
Original line number Diff line number Diff line 
use std::sync::{Mutex, MutexGuard};

use std::sync::{Once, ONCE_INIT};

use std::mem;

use std::ptr;



use libc::{c_int, c_char, c_void, c_long, c_uchar, size_t, c_uint, c_ulong};

#[cfg(not(ossl101))]
@@ -610,7 +611,7 @@ pub struct SSL_SESSION { 
    sess_cert: *mut c_void,

    peer: *mut X509,

    verify_result: c_long,

    references: c_int,

    pub references: c_int,

    timeout: c_long,

    time: c_long,

    compress_meth: c_uint,
@@ -678,6 +679,7 @@ pub struct X509_VERIFY_PARAM { 
pub enum X509_VERIFY_PARAM_ID {}

pub enum PKCS12 {}



pub const SSL_CTRL_GET_SESSION_REUSED: c_int = 8;

pub const SSL_CTRL_OPTIONS: c_int = 32;

pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77;

#[cfg(ossl102)]
@@ -708,6 +710,7 @@ pub const SSLEAY_DIR : c_int = 5; 


pub const CRYPTO_LOCK_X509: c_int = 3;

pub const CRYPTO_LOCK_SSL_CTX: c_int = 12;

pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14;



static mut MUTEXES: *mut Vec<Mutex<()>> = 0 as *mut Vec<Mutex<()>>;

static mut GUARDS: *mut Vec<Option<MutexGuard<'static, ()>>> = 0 as *mut Vec<Option<MutexGuard<'static, ()>>>;
@@ -766,12 +769,16 @@ fn set_id_callback() {} 


#[cfg(ossl102)]

pub unsafe fn SSL_CTX_set_ecdh_auto(ctx: *mut SSL_CTX, onoff: c_int) -> c_int {

    ::SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ::std::ptr::null_mut()) as c_int

    ::SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ptr::null_mut()) as c_int

}



#[cfg(ossl102)]

pub unsafe fn SSL_set_ecdh_auto(ssl: *mut ::SSL, onoff: c_int) -> c_int {

    ::SSL_ctrl(ssl, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ::std::ptr::null_mut()) as c_int

    ::SSL_ctrl(ssl, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ptr::null_mut()) as c_int

}



pub unsafe fn SSL_session_reused(ssl: *mut ::SSL) -> c_int {

    ::SSL_ctrl(ssl, SSL_CTRL_GET_SESSION_REUSED, 0, ptr::null_mut()) as c_int

}



extern {

openssl-sys/src/ossl110.rs

+2 −0
Original line number Diff line number Diff line
@@ -172,10 +172,12 @@ extern { 
                                   -> c_int;

    pub fn X509_up_ref(x: *mut X509) -> c_int;

    pub fn SSL_CTX_up_ref(x: *mut SSL_CTX) -> c_int;

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

    pub fn SSL_SESSION_get_master_key(session: *const SSL_SESSION,

                                      out: *mut c_uchar,

                                      outlen: size_t)

                                      -> size_t;

    pub fn SSL_SESSION_up_ref(ses: *mut SSL_SESSION) -> c_int;

    pub fn X509_get0_extensions(req: *const ::X509) -> *const stack_st_X509_EXTENSION;

    pub fn X509_STORE_CTX_get0_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509;

    pub fn EVP_MD_CTX_new() -> *mut EVP_MD_CTX;