Commit 2e168ab8 authored by Steven Fackler's avatar Steven Fackler
Browse files

Update for latest master and fix segfault

parent 7ea442be

.gitignore

+1 −1
Original line number Diff line number Diff line 
/lib
 
/.rust/

ffi.rs

+2 −2
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ pub type BIO_METHOD = c_void; 
pub type X509_STORE_CTX = c_void;

pub type CRYPTO_EX_DATA = c_void;



pub type CRYPTO_EX_new = Option<extern "C" fn(parent: *c_void, ptr: *c_void,

pub type CRYPTO_EX_new = extern "C" fn(parent: *c_void, ptr: *c_void,

                                              ad: *CRYPTO_EX_DATA, idx: c_int,

                                              argl: c_long, argp: *c_void)

                                              -> c_int>;

                                              -> c_int;

pub type CRYPTO_EX_dup = extern "C" fn(to: *CRYPTO_EX_DATA,

                                       from: *CRYPTO_EX_DATA, from_d: *c_void,

                                       idx: c_int, argl: c_long, argp: *c_void)

lib.rs

+1 −4
Original line number Diff line number Diff line
@@ -9,13 +9,10 @@ use std::unstable::atomics::{AtomicBool, INIT_ATOMIC_BOOL, AtomicInt, 
use std::rt::io::{Stream, Reader, Writer, Decorator};

use std::vec;



use error::{SslError, SslSessionClosed, StreamEof};

use self::error::{SslError, SslSessionClosed, StreamEof};



pub mod error;



#[cfg(test)]

mod tests;



mod ffi;



static mut STARTED_INIT: AtomicBool = INIT_ATOMIC_BOOL;

tests.rs→test.rs

+5 −2
Original line number Diff line number Diff line 
#[feature(struct_variant)];



use std::rt::io::Writer;

use std::rt::io::extensions::ReaderUtil;

use std::rt::io::net::tcp::TcpStream;

use std::str;



use super::{Sslv23, SslContext, SslStream, SslVerifyPeer};

use lib::{Sslv23, SslContext, SslStream, SslVerifyPeer};



mod lib;



#[test]

fn test_new_ctx() {