Commit 0982081d authored by pyrho's avatar pyrho
Browse files

Merge remote-tracking branch 'upstream/master' into aes-256-cbc-decrypt-test

parents d10c552a b41201c3

src/bn/mod.rs

+1 −11
Original line number Diff line number Diff line 
use libc::{c_int, c_ulong, c_void};

use libc::{c_int, c_ulong};

use std::{fmt, ptr};

use std::c_str::CString;

use std::num::{One, Zero};
@@ -6,16 +6,6 @@ use std::num::{One, Zero}; 
use ffi;

use ssl::error::SslError;



#[allow(dead_code)]

#[repr(C)]

pub struct BIGNUM {

    d: *mut c_void,

    top: c_int,

    dmax: c_int,

    neg: c_int,

    flags: c_int,

}



pub struct BigNum(*mut ffi::BIGNUM);



#[repr(C)]

src/ffi.rs

100755 → 100644
+9 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ use std::ptr; 
use std::rt::mutex::NativeMutex;

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



pub use bn::BIGNUM;



pub type ASN1_INTEGER = c_void;

pub type ASN1_STRING = c_void;

pub type ASN1_TIME = c_void;
@@ -66,6 +64,15 @@ pub struct X509V3_CTX { 
    // Maybe more here

}



#[repr(C)]

pub struct BIGNUM {

    pub d: *mut c_void,

    pub top: c_int,

    pub dmax: c_int,

    pub neg: c_int,

    pub flags: c_int,

}



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

                                       ad: *const CRYPTO_EX_DATA, idx: c_int,

                                       argl: c_long, argp: *const c_void) -> c_int;

src/lib.rs

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ pub mod asn1; 
pub mod bn;

pub mod bio;

pub mod crypto;

pub mod ffi;

mod ffi;

pub mod ssl;

pub mod x509;