min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move init to crate root

This commit is contained in:
Steven Fackler 2016-08-07 22:04:00 -07:00
parent 77ba043acf
commit 25752280ae
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openssl/src/lib.rs
View File

@ -14,6 +14,9 @@ extern crate rustc_serialize as serialize;
#[cfg(test)] #[cfg(test)]
extern crate net2; extern crate net2;
#[doc(inline)]
pub use ffi::init;
use nid::Nid; use nid::Nid;
mod macros; mod macros;

9
openssl/src/ssl/mod.rs
View File

@ -18,8 +18,9 @@ use libc::{c_uchar, c_uint};
#[cfg(any(feature = "npn", feature = "alpn"))] #[cfg(any(feature = "npn", feature = "alpn"))]
use std::slice; use std::slice;
use std::marker::PhantomData; use std::marker::PhantomData;
use ffi; use ffi;
use init;
use dh::DH; use dh::DH;
use x509::{X509StoreContext, X509FileType, X509, X509Ref}; use x509::{X509StoreContext, X509FileType, X509, X509Ref};
use crypto::pkey::PKey; use crypto::pkey::PKey;
@ -40,12 +41,6 @@ extern "C" {
fn rust_SSL_CTX_clone(cxt: *mut ffi::SSL_CTX); fn rust_SSL_CTX_clone(cxt: *mut ffi::SSL_CTX);
} }
/// Manually initialize SSL.
/// It is optional to call this function and safe to do so more than once.
pub fn init() {
ffi::init();
}
bitflags! { bitflags! {
pub flags SslContextOptions: c_long { pub flags SslContextOptions: c_long {
const SSL_OP_MICROSOFT_SESS_ID_BUG = ffi::SSL_OP_MICROSOFT_SESS_ID_BUG, const SSL_OP_MICROSOFT_SESS_ID_BUG = ffi::SSL_OP_MICROSOFT_SESS_ID_BUG,