diff options
| author | Steven Fackler <[email protected]> | 2016-03-21 15:28:50 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-03-21 15:28:50 -0700 |
| commit | 983dab692433f48249ac76f2217c3ee7e18eda4c (patch) | |
| tree | 01e411a745f7e0433a1ee1081bfc817f6ed875f1 | |
| parent | Merge branch 'release' (diff) | |
| parent | Cast correctly c_char raw pointers (fixes build on ARM #363) (diff) | |
| download | rust-openssl-983dab692433f48249ac76f2217c3ee7e18eda4c.tar.xz rust-openssl-983dab692433f48249ac76f2217c3ee7e18eda4c.zip | |
Merge pull request #364 from leon-anavi/master
Cast correctly c_char raw pointers (fixes build on ARM #363)
| -rw-r--r-- | openssl/src/ssl/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 38527dc6..ebaffb18 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -827,7 +827,7 @@ impl <'a> SslCipher<'a> { let desc_ptr = ffi::SSL_CIPHER_description(self.cipher, buf.as_mut_ptr(), 128); if !desc_ptr.is_null() { - String::from_utf8(CStr::from_ptr(desc_ptr).to_bytes().to_vec()).ok() + String::from_utf8(CStr::from_ptr(desc_ptr as *const _).to_bytes().to_vec()).ok() } else { None } |