diff options
| author | Steven Fackler <[email protected]> | 2015-12-15 19:42:12 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-12-15 19:42:12 -0800 |
| commit | cf075d8e6b7f5849a40659f380a660dc226a9118 (patch) | |
| tree | 630ed9e2a3fcd047fd95a778977585803cd5a94a /openssl/src/x509 | |
| parent | Merge branch 'release-v0.7.1' into release (diff) | |
| parent | Release v0.7.2 (diff) | |
| download | rust-openssl-0.7.2.tar.xz rust-openssl-0.7.2.zip | |
Merge branch 'release-v0.7.2' into releasev0.7.2
Diffstat (limited to 'openssl/src/x509')
| -rw-r--r-- | openssl/src/x509/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index 5574077a..c7039089 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -50,7 +50,7 @@ impl Deref for SslString { impl SslString { unsafe fn new(buf: *const c_char) -> SslString { SslString { - s: str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap() + s: str::from_utf8(CStr::from_ptr(buf as *const _).to_bytes()).unwrap() } } } @@ -275,8 +275,8 @@ impl X509Generator { lift_ssl!(unsafe { let key = CString::new(key.as_bytes()).unwrap(); let value = CString::new(value.as_bytes()).unwrap(); - ffi::X509_NAME_add_entry_by_txt(name, key.as_ptr(), ffi::MBSTRING_UTF8, - value.as_ptr(), value_len, -1, 0) + ffi::X509_NAME_add_entry_by_txt(name, key.as_ptr() as *const _, ffi::MBSTRING_UTF8, + value.as_ptr() as *const _, value_len, -1, 0) }) } |