min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for transmute move

This commit is contained in:
Steven Fackler 2014-05-11 21:17:32 -07:00
parent d7b2f9f53e
commit 7e47bc8a4c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/pkey.rs
View File

@ -1,6 +1,6 @@
use std::cast;
use libc::{c_char, c_int, c_uint}; use libc::{c_char, c_int, c_uint};
use libc; use libc;
use std::mem;
use std::ptr; use std::ptr;
use crypto::hash::{HashType, MD5, SHA1, SHA224, SHA256, SHA384, SHA512}; use crypto::hash::{HashType, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};
@ -123,7 +123,7 @@ impl PKey {
EVP_PKEY_assign( EVP_PKEY_assign(
self.evp, self.evp,
6 as c_int, 6 as c_int,
cast::transmute(rsa)); mem::transmute(rsa));
self.parts = Both; self.parts = Both;
} }

12
ssl/mod.rs
View File

@ -1,9 +1,9 @@
use sync::one::{Once, ONCE_INIT};
use std::cast;
use libc::{c_int, c_void, c_char}; use libc::{c_int, c_void, c_char};
use std::ptr;
use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer}; use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer};
use std::mem;
use std::ptr;
use std::unstable::mutex::NativeMutex; use std::unstable::mutex::NativeMutex;
use sync::one::{Once, ONCE_INIT};
use ssl::error::{SslError, SslSessionClosed, StreamError}; use ssl::error::{SslError, SslSessionClosed, StreamError};
@ -37,7 +37,7 @@ fn init() {
let num_locks = ffi::CRYPTO_num_locks(); let num_locks = ffi::CRYPTO_num_locks();
let mutexes = box Vec::from_fn(num_locks as uint, |_| NativeMutex::new()); let mutexes = box Vec::from_fn(num_locks as uint, |_| NativeMutex::new());
MUTEXES = cast::transmute(mutexes); MUTEXES = mem::transmute(mutexes);
ffi::CRYPTO_set_locking_callback(locking_function); ffi::CRYPTO_set_locking_callback(locking_function);
}); });
@ -97,7 +97,7 @@ extern fn raw_verify(preverify_ok: c_int, x509_ctx: *ffi::X509_STORE_CTX)
let ssl = ffi::X509_STORE_CTX_get_ex_data(x509_ctx, idx); let ssl = ffi::X509_STORE_CTX_get_ex_data(x509_ctx, idx);
let ssl_ctx = ffi::SSL_get_SSL_CTX(ssl); let ssl_ctx = ffi::SSL_get_SSL_CTX(ssl);
let verify = ffi::SSL_CTX_get_ex_data(ssl_ctx, VERIFY_IDX); let verify = ffi::SSL_CTX_get_ex_data(ssl_ctx, VERIFY_IDX);
let verify: Option<VerifyCallback> = cast::transmute(verify); let verify: Option<VerifyCallback> = mem::transmute(verify);
let ctx = X509StoreContext { ctx: x509_ctx }; let ctx = X509StoreContext { ctx: x509_ctx };
@ -149,7 +149,7 @@ impl SslContext {
verify: Option<VerifyCallback>) { verify: Option<VerifyCallback>) {
unsafe { unsafe {
ffi::SSL_CTX_set_ex_data(self.ctx, VERIFY_IDX, ffi::SSL_CTX_set_ex_data(self.ctx, VERIFY_IDX,
cast::transmute(verify)); mem::transmute(verify));
ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(raw_verify)); ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(raw_verify));
} }
} }