aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/lib.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-12-25 22:02:41 -0700
committerSteven Fackler <[email protected]>2017-12-25 22:09:27 -0700
commit2adf2cf12bf1afb806ec8bfb222d32831137d749 (patch)
tree7af6a6aeecd9113d7b22028a13eed5df11fa3127 /openssl/src/lib.rs
parentMerge pull request #797 from sfackler/fixmes (diff)
downloadrust-openssl-2adf2cf12bf1afb806ec8bfb222d32831137d749.tar.xz
rust-openssl-2adf2cf12bf1afb806ec8bfb222d32831137d749.zip
Remove deprecated APIs
Diffstat (limited to 'openssl/src/lib.rs')
-rw-r--r--openssl/src/lib.rs17
1 files changed, 9 insertions, 8 deletions
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 5c3e7cc8..84c49d19 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -1,20 +1,20 @@
-#![doc(html_root_url="https://docs.rs/openssl/0.9")]
+#![doc(html_root_url = "https://docs.rs/openssl/0.9")]
#[macro_use]
extern crate bitflags;
#[macro_use]
extern crate foreign_types;
-extern crate libc;
#[macro_use]
extern crate lazy_static;
+extern crate libc;
extern crate openssl_sys as ffi;
#[cfg(test)]
+extern crate data_encoding;
+#[cfg(test)]
extern crate hex;
#[cfg(test)]
extern crate tempdir;
-#[cfg(test)]
-extern crate data_encoding;
#[doc(inline)]
pub use ffi::init;
@@ -35,11 +35,9 @@ pub mod bn;
#[cfg(not(libressl))]
pub mod cms;
pub mod conf;
-pub mod crypto;
pub mod dh;
pub mod dsa;
pub mod ec;
-pub mod ec_key;
pub mod error;
pub mod ex_data;
pub mod hash;
@@ -57,7 +55,6 @@ pub mod ssl;
pub mod stack;
pub mod string;
pub mod symm;
-pub mod types;
pub mod version;
pub mod x509;
#[cfg(any(ossl102, ossl110))]
@@ -80,5 +77,9 @@ fn cvt(r: c_int) -> Result<c_int, ErrorStack> {
}
fn cvt_n(r: c_int) -> Result<c_int, ErrorStack> {
- if r < 0 { Err(ErrorStack::get()) } else { Ok(r) }
+ if r < 0 {
+ Err(ErrorStack::get())
+ } else {
+ Ok(r)
+ }
}