<< requires uint shift now.

Author: cosmycoder

src/rust-crypto/aessafe.rs

@@ -321,7 +321,7 @@ define_aes_enc_x8!(AesSafe256EncryptorX8, 14)
 define_aes_dec_x8!(AesSafe256DecryptorX8, 14)
 
 fn rotate(r: u32, rotate: u32) -> u32 {
-    return (r >> rotate) | (r << (32 - rotate));
+    return (r >> rotate as uint) | (r << (32 - rotate) as uint);
 }
 
 fn ffmulx(x: u32) -> u32 {

src/rust-crypto/md5.rs

@@ -57,7 +57,7 @@ impl Md5State {
         }
 
         fn rotate_left(x: u32, n: u32) -> u32 {
-            return (x << n) | (x >> (32 - n));
+            return (x << n as uint) | (x >> (32 - n as uint));
         }
 
         fn op_f(w: u32, x: u32, y: u32, z: u32, m: u32, s: u32) -> u32 {

src/rust-crypto/scrypt.rs

@@ -168,7 +168,7 @@ impl ScryptParams {
         assert!(log_n > 0);
         assert!((log_n as uint) < size_of::<uint>() * 8);
 
-        let n = 1u32 << log_n;
+        let n = 1u32 << log_n as uint;
 
         let rp = match r.checked_mul(&p) {
             Some(x) => x,
@@ -232,7 +232,7 @@ pub fn scrypt(password: &[u8], salt: &[u8], params: &ScryptParams, output: &mut
     assert!(output.len() / 32 <= 0xffffffff);
 
     // The checks in the ScryptParams constructor guarantee that the following is safe:
-    let n = 1u << params.log_n;
+    let n = 1u << params.log_n as uint;
     let r = params.r as uint;
     let p = params.p as uint;
 

src/rust-crypto/sha1.rs

@@ -125,7 +125,7 @@ fn process_msg_block(data: &[u8], h: &mut [u32, ..DIGEST_BUF_LEN]) {
 }
 
 fn circular_shift(bits: u32, word: u32) -> u32 {
-    return word << bits | word >> 32u32 - bits;
+    return word << bits as uint | word >> (32u32 - bits) as uint;
 }
 
 fn mk_result(st: &mut Sha1, rs: &mut [u8]) {