Switch to accessors in libressl where possible

Some accessors are mysteriously still macros so we can't make everything
opaque yet, unfortunately.

cc #909

1 files changed, 28 insertions, 24 deletions

diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index 5c1bb23f..a07fc1f1 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -1245,21 +1245,9 @@ impl X509AlgorithmRef {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
-        use ffi::{
-            X509_ALGOR_get0, X509_REQ_get_subject_name, X509_REQ_get_version,
-            X509_get0_signature, X509_getm_notAfter, X509_getm_notBefore, X509_up_ref,
-            ASN1_STRING_get0_data, X509_STORE_CTX_get0_chain, X509_set1_notAfter,
-            X509_set1_notBefore,
-        };
+    if #[cfg(any(ossl110, libressl273))] {
+        use ffi::{X509_getm_notAfter, X509_getm_notBefore, X509_up_ref, X509_get0_signature};
     } else {
-        use ffi::{
-            ASN1_STRING_data as ASN1_STRING_get0_data,
-            X509_STORE_CTX_get_chain as X509_STORE_CTX_get0_chain,
-            X509_set_notAfter as X509_set1_notAfter,
-            X509_set_notBefore as X509_set1_notBefore,
-        };
-
         #[allow(bad_style)]
         unsafe fn X509_getm_notAfter(x: *mut ffi::X509) -> *mut ffi::ASN1_TIME {
             (*(*(*x).cert_info).validity).notAfter
@@ -1282,16 +1270,6 @@ cfg_if! {
         }
 
         #[allow(bad_style)]
-        unsafe fn X509_REQ_get_version(x: *mut ffi::X509_REQ) -> ::libc::c_long {
-            ffi::ASN1_INTEGER_get((*(*x).req_info).version)
-        }
-
-        #[allow(bad_style)]
-        unsafe fn X509_REQ_get_subject_name(x: *mut ffi::X509_REQ) -> *mut ::ffi::X509_NAME {
-            (*(*x).req_info).subject
-        }
-
-        #[allow(bad_style)]
         unsafe fn X509_get0_signature(
             psig: *mut *const ffi::ASN1_BIT_STRING,
             palg: *mut *const ffi::X509_ALGOR,
@@ -1304,6 +1282,32 @@ cfg_if! {
                 *palg = (*x).sig_alg;
             }
         }
+    }
+}
+
+cfg_if! {
+    if #[cfg(ossl110)] {
+        use ffi::{
+            X509_ALGOR_get0, ASN1_STRING_get0_data, X509_STORE_CTX_get0_chain, X509_set1_notAfter,
+            X509_set1_notBefore, X509_REQ_get_version, X509_REQ_get_subject_name,
+        };
+    } else {
+        use ffi::{
+            ASN1_STRING_data as ASN1_STRING_get0_data,
+            X509_STORE_CTX_get_chain as X509_STORE_CTX_get0_chain,
+            X509_set_notAfter as X509_set1_notAfter,
+            X509_set_notBefore as X509_set1_notBefore,
+        };
+
+        #[allow(bad_style)]
+        unsafe fn X509_REQ_get_version(x: *mut ffi::X509_REQ) -> ::libc::c_long {
+            ffi::ASN1_INTEGER_get((*(*x).req_info).version)
+        }
+
+        #[allow(bad_style)]
+        unsafe fn X509_REQ_get_subject_name(x: *mut ffi::X509_REQ) -> *mut ::ffi::X509_NAME {
+            (*(*x).req_info).subject
+        }
 
         #[allow(bad_style)]
         unsafe fn X509_ALGOR_get0(