From 25752280ae72c39617b3648d61922d3a3020a40e Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 7 Aug 2016 22:04:00 -0700
Subject: [PATCH] Move init to crate root

---
 openssl/src/lib.rs     | 3 +++
 openssl/src/ssl/mod.rs | 9 ++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 8dc73dde..a694d536 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -14,6 +14,9 @@ extern crate rustc_serialize as serialize;
 #[cfg(test)]
 extern crate net2;
 
+#[doc(inline)]
+pub use ffi::init;
+
 use nid::Nid;
 
 mod macros;
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index aa8d9657..2bb15497 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -18,8 +18,9 @@ use libc::{c_uchar, c_uint};
 #[cfg(any(feature = "npn", feature = "alpn"))]
 use std::slice;
 use std::marker::PhantomData;
-
 use ffi;
+
+use init;
 use dh::DH;
 use x509::{X509StoreContext, X509FileType, X509, X509Ref};
 use crypto::pkey::PKey;
@@ -40,12 +41,6 @@ extern "C" {
     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! {
     pub flags SslContextOptions: c_long {
         const SSL_OP_MICROSOFT_SESS_ID_BUG = ffi::SSL_OP_MICROSOFT_SESS_ID_BUG,