diff options
| author | Steven Fackler <[email protected]> | 2014-10-26 21:05:27 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-10-26 21:05:27 -0700 |
| commit | b41201c3c9fddf42d02f71d11b5d4718eb9e88c4 (patch) | |
| tree | 8b35341a5bcb0928a5c8b8179b6038898708b2ec /src | |
| parent | Update doc location (diff) | |
| download | rust-openssl-b41201c3c9fddf42d02f71d11b5d4718eb9e88c4.tar.xz rust-openssl-b41201c3c9fddf42d02f71d11b5d4718eb9e88c4.zip | |
Clean up some BN stuff
Diffstat (limited to 'src')
| -rw-r--r-- | src/bn/mod.rs | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/ffi.rs | 11 | ||||
| -rw-r--r-- | src/lib.rs | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/src/bn/mod.rs b/src/bn/mod.rs index 6311e89c..0900f478 100644 --- a/src/bn/mod.rs +++ b/src/bn/mod.rs @@ -1,4 +1,4 @@ -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)] diff --git a/src/ffi.rs b/src/ffi.rs index aa5758f3..dedff22c 100755..100644 --- a/src/ffi.rs +++ b/src/ffi.rs @@ -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; @@ -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; |