Merge pull request #81 from ebfe/fix-build-master

Fix build with rust master

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/bcrypt.rs

@@ -29,7 +29,7 @@ pub fn bcrypt(cost: uint, salt: &[u8], password: &[u8], output: &mut [u8]) {
     // OrpheanBeholderScryDoubt
     let mut ctext = [0x4f727068, 0x65616e42, 0x65686f6c, 0x64657253, 0x63727944, 0x6f756274];
     for i in range_step(0u, 6u, 2u) {
-        for _ in range(0, 64) {
+        for _ in range(0u, 64) {
             let (l, r) = state.encrypt(ctext[i], ctext[i+1]);
             ctext[i] = l;
             ctext[i+1] = r;

src/rust-crypto/bcrypt_pbkdf.rs

@@ -14,7 +14,7 @@ fn bcrypt_hash(hpass: &[u8], hsalt: &[u8], output: &mut [u8, ..32]) {
     let mut bf = Blowfish::init_state();
     bf.salted_expand_key(hsalt, hpass);
 
-    for _ in range(0, 64) {
+    for _ in range(0u, 64) {
         bf.expand_key(hsalt);
         bf.expand_key(hpass);
     }
@@ -23,7 +23,7 @@ fn bcrypt_hash(hpass: &[u8], hsalt: &[u8], output: &mut [u8, ..32]) {
     read_u32v_be(buf, b"OxychromaticBlowfishSwatDynamite");
 
     for i in range_step(0u, 8, 2) {
-        for _ in range(0, 64) {
+        for _ in range(0u, 64) {
             let (l, r) = bf.encrypt(buf[i], buf[i+1]);
             buf[i] = l;
             buf[i+1] = r;

src/rust-crypto/blockmodes.rs

@@ -1155,7 +1155,7 @@ mod test {
             rng2.gen_range(0, max_size)
         };
 
-        for _ in range(0, 1000) {
+        for _ in range(0u, 1000) {
             let mut enc = new_enc();
             let mut dec = new_dec();
 

src/rust-crypto/chacha20.rs

@@ -72,7 +72,7 @@ impl ChaCha20 {
     fn update(&mut self) {
         let mut x = self.state;
 
-        for _ in range(0, 10) {
+        for _ in range(0u, 10) {
             quater_round!(x[0], x[4], x[ 8], x[12]);
             quater_round!(x[1], x[5], x[ 9], x[13]);
             quater_round!(x[2], x[6], x[10], x[14]);

src/rust-crypto/digest.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::num::ToStrRadix;
-
 /**
  * The Digest trait specifies an interface common to digest functions, such as SHA-1 and the SHA-2
  * family of digest functions.
@@ -81,10 +79,7 @@ pub trait Digest {
 fn to_hex(rr: &[u8]) -> String {
     let mut s = String::new();
     for b in rr.iter() {
-        let hex = (*b as uint).to_str_radix(16u);
-        if hex.len() == 1 {
-            s.push_char('0');
-        }
+        let hex = format!("{:02x}", *b);
         s.push_str(hex.as_slice());
     }
     return s;

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/salsa20.rs

@@ -137,7 +137,7 @@ impl Salsa20 {
         let mut z = [0u32, ..16];
         read_u32v_le(x.as_mut_slice(), self.state);
         read_u32v_le(z.as_mut_slice(), self.state);
-        for _ in range(0, 10) {
+        for _ in range(0u, 10) {
             doubleround(&mut z);
         }
         for i in range(0u, 16) {
@@ -151,7 +151,7 @@ impl Salsa20 {
     fn hsalsa20_hash(&mut self) {
         let mut x = [0u32, ..16];
         read_u32v_le(x.as_mut_slice(), self.state);
-        for _ in range(0, 10) {
+        for _ in range(0u, 10) {
             doubleround(&mut x);
         }
         for i in range(0u, 16) {

src/rust-crypto/scrypt.rs

@@ -43,7 +43,7 @@ fn salsa20_8(input: &[u8], output: &mut [u8]) {
         } }
     )
 
-    for _ in range(0, rounds / 2) {
+    for _ in range(0u, rounds / 2) {
         run_round!(
             0x4, 0x0, 0xc, 7;
             0x8, 0x4, 0x0, 9;
@@ -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]) {