From dd4836cdf61842512338fa63eaabad80d3f12bde Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 31 Oct 2016 23:06:27 -0700 Subject: [PATCH] Fix 1.1.0 build --- openssl/src/asn1.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openssl/src/asn1.rs b/openssl/src/asn1.rs index d0704693..78c66d4b 100644 --- a/openssl/src/asn1.rs +++ b/openssl/src/asn1.rs @@ -54,7 +54,7 @@ impl Ref { } pub fn as_slice(&self) -> &[u8] { - unsafe { slice::from_raw_parts(ffi::ASN1_STRING_data(self.as_ptr()), self.len()) } + unsafe { slice::from_raw_parts(ASN1_STRING_data(self.as_ptr()), self.len()) } } pub fn len(&self) -> usize { @@ -63,3 +63,12 @@ impl Ref { } } } + +#[cfg(any(ossl101, ossl102))] +use ffi::ASN1_STRING_data; + +#[cfg(ossl110)] +#[allow(bad_style)] +unsafe fn ASN1_STRING_data(s: *mut ffi::ASN1_STRING) -> *mut ::libc::c_uchar { + ffi::ASN1_STRING_get0_data(s) as *mut _ +}