diff options
| author | Steven Fackler <[email protected]> | 2016-08-11 21:01:27 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-08-11 21:01:27 -0700 |
| commit | 652326003cefe215dbfc838051e6114515cc5190 (patch) | |
| tree | 22dc99a726321cd8228004c34c40ca4a0648c594 /openssl/src/lib.rs | |
| parent | Merge branch 'release-v0.7.14' into release (diff) | |
| parent | Release openssl-sys v0.7.15, openssl v0.8.0 (diff) | |
| download | rust-openssl-openssl-sys-v0.7.15.tar.xz rust-openssl-openssl-sys-v0.7.15.zip | |
Merge branch 'release-v0.7.15-sys-v0.8.0' into releaseopenssl-v0.8.0openssl-sys-v0.7.15
Diffstat (limited to 'openssl/src/lib.rs')
| -rw-r--r-- | openssl/src/lib.rs | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs index 690ab32b..d7e69b0c 100644 --- a/openssl/src/lib.rs +++ b/openssl/src/lib.rs @@ -1,5 +1,4 @@ -#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.14")] -#![cfg_attr(feature = "nightly", feature(const_fn))] +#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.8.0")] #[macro_use] extern crate bitflags; @@ -7,7 +6,6 @@ extern crate libc; #[macro_use] extern crate lazy_static; extern crate openssl_sys as ffi; -extern crate openssl_sys_extras as ffi_extras; #[cfg(test)] extern crate rustc_serialize as serialize; @@ -15,14 +13,27 @@ extern crate rustc_serialize as serialize; #[cfg(test)] extern crate net2; +#[doc(inline)] +pub use ffi::init; + +use nid::Nid; + mod macros; pub mod asn1; +mod bio; pub mod bn; -pub mod bio; +#[cfg(feature = "c_helpers")] +mod c_helpers; pub mod crypto; pub mod dh; -pub mod ssl; -pub mod x509; +pub mod error; pub mod nid; +pub mod ssl; pub mod version; +pub mod x509; + +trait HashTypeInternals { + fn as_nid(&self) -> Nid; + fn evp_md(&self) -> *const ffi::EVP_MD; +} |