From 1a288da86ce1ca94b5a0b3eac8750e5ffd03e8e7 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Fri, 28 Oct 2016 22:14:44 -0700
Subject: [PATCH] Make verification unconditionally exposed internally

---
 openssl/src/lib.rs               | 2 ++
 openssl/src/{x509 => }/verify.rs | 0
 openssl/src/x509/mod.rs          | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename openssl/src/{x509 => }/verify.rs (100%)

diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index b191ec5b..acdc2ea8 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -42,6 +42,8 @@ pub mod ssl;
 pub mod symm;
 pub mod version;
 pub mod x509;
+#[cfg(any(ossl102, ossl110))]
+mod verify;
 
 pub fn cvt_p<T>(r: *mut T) -> Result<*mut T, ErrorStack> {
     if r.is_null() {
diff --git a/openssl/src/x509/verify.rs b/openssl/src/verify.rs
similarity index 100%
rename from openssl/src/x509/verify.rs
rename to openssl/src/verify.rs
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index b92462d4..cc6b73bb 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -37,12 +37,12 @@ use ffi::{
     ASN1_STRING_get0_data as ASN1_STRING_data,
 };
 
-pub mod extension;
-
 #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
-pub mod verify;
+pub use verify;
 
-use self::extension::{ExtensionType, Extension};
+use x509::extension::{ExtensionType, Extension};
+
+pub mod extension;
 
 #[cfg(test)]
 mod tests;