aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorLeon Anavi <[email protected]>2016-03-22 00:16:56 +0200
committerLeon Anavi <[email protected]>2016-03-22 00:16:56 +0200
commit6d4bfaa490af285443a7e8413040e58b889d2993 (patch)
tree01e411a745f7e0433a1ee1081bfc817f6ed875f1 /openssl/src
parentMerge branch 'release' (diff)
downloadrust-openssl-6d4bfaa490af285443a7e8413040e58b889d2993.tar.xz
rust-openssl-6d4bfaa490af285443a7e8413040e58b889d2993.zip
Cast correctly c_char raw pointers (fixes build on ARM #363)
Fix error caused by mismatched types while building crate openssl for Raspberry Pi 2 and other ARM devices. Signed-off-by: Leon Anavi <[email protected]>
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/mod.rs2
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
}