diff options
| author | Steven Fackler <[email protected]> | 2016-10-31 23:06:27 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-10-31 23:06:27 -0700 |
| commit | dd4836cdf61842512338fa63eaabad80d3f12bde (patch) | |
| tree | aafe5cc445745844d6abd51a91ca7cc2352178d0 /openssl/src | |
| parent | Little cfg cleanup (diff) | |
| download | rust-openssl-dd4836cdf61842512338fa63eaabad80d3f12bde.tar.xz rust-openssl-dd4836cdf61842512338fa63eaabad80d3f12bde.zip | |
Fix 1.1.0 build
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/asn1.rs | 11 |
1 files changed, 10 insertions, 1 deletions
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<Asn1String> { } 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<Asn1String> { } } } + +#[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 _ +} |