From 8c6bc774dbf2bcea664579381ac4eb4488044cea Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 12 Sep 2018 20:42:43 -0700
Subject: Support libressl 2.8.0

Closes #988
---
 openssl/src/ssl/callbacks.rs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'openssl/src')

diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs
index c9779416..daa58a4e 100644
--- a/openssl/src/ssl/callbacks.rs
+++ b/openssl/src/ssl/callbacks.rs
@@ -379,10 +379,13 @@ pub unsafe extern "C" fn raw_remove_session<F>(
     callback(ctx, session)
 }
 
-#[cfg(ossl110)]
-type DataPtr = *const c_uchar;
-#[cfg(not(ossl110))]
-type DataPtr = *mut c_uchar;
+cfg_if! {
+    if #[cfg(any(ossl110, libressl280))] {
+        type DataPtr = *const c_uchar;
+    } else {
+        type DataPtr = *mut c_uchar;
+    }
+}
 
 pub unsafe extern "C" fn raw_get_session<F>(
     ssl: *mut ffi::SSL,
@@ -503,11 +506,13 @@ where
     }
 }
 
-#[cfg(ossl110)]
-type CookiePtr = *const c_uchar;
-
-#[cfg(not(ossl110))]
-type CookiePtr = *mut c_uchar;
+cfg_if! {
+    if #[cfg(any(ossl110, libressl280))] {
+        type CookiePtr = *const c_uchar;
+    } else {
+        type CookiePtr = *mut c_uchar;
+    }
+}
 
 pub extern "C" fn raw_cookie_verify<F>(
     ssl: *mut ffi::SSL,
-- 
cgit v1.2.3