aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2014-05-11 21:17:32 -0700
committerSteven Fackler <[email protected]>2014-05-11 21:17:32 -0700
commit7e47bc8a4c13cd1c37d565a353406a59fa2fe047 (patch)
tree047bb27d11b43910f7deb3c38251b2d5eb4f876b
parentMerge pull request #11 from ebfe/fix-build (diff)
downloadrust-openssl-7e47bc8a4c13cd1c37d565a353406a59fa2fe047.tar.xz
rust-openssl-7e47bc8a4c13cd1c37d565a353406a59fa2fe047.zip
Update for transmute move
-rw-r--r--crypto/pkey.rs4
-rw-r--r--ssl/mod.rs12
2 files changed, 8 insertions, 8 deletions
diff --git a/crypto/pkey.rs b/crypto/pkey.rs
index 1fd88061..6c0b4e83 100644
--- a/crypto/pkey.rs
+++ b/crypto/pkey.rs
@@ -1,6 +1,6 @@
-use std::cast;
use libc::{c_char, c_int, c_uint};
use libc;
+use std::mem;
use std::ptr;
use crypto::hash::{HashType, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};
@@ -123,7 +123,7 @@ impl PKey {
EVP_PKEY_assign(
self.evp,
6 as c_int,
- cast::transmute(rsa));
+ mem::transmute(rsa));
self.parts = Both;
}
diff --git a/ssl/mod.rs b/ssl/mod.rs
index cad9811d..88f121a0 100644
--- a/ssl/mod.rs
+++ b/ssl/mod.rs
@@ -1,9 +1,9 @@
-use sync::one::{Once, ONCE_INIT};
-use std::cast;
use libc::{c_int, c_void, c_char};
-use std::ptr;
use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer};
+use std::mem;
+use std::ptr;
use std::unstable::mutex::NativeMutex;
+use sync::one::{Once, ONCE_INIT};
use ssl::error::{SslError, SslSessionClosed, StreamError};
@@ -37,7 +37,7 @@ fn init() {
let num_locks = ffi::CRYPTO_num_locks();
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);
});
@@ -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_ctx = ffi::SSL_get_SSL_CTX(ssl);
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 };
@@ -149,7 +149,7 @@ impl SslContext {
verify: Option<VerifyCallback>) {
unsafe {
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));
}
}