Merge pull request #110 from GuillaumeGomez/master

Few fixes and updates

Author: cosmycoder

Cargo.toml

@@ -3,7 +3,7 @@ name = "rust-crypto"
 version = "0.1.0"
 authors = []
 
-[[lib]]
+[lib]
 name = "rust-crypto"
 path = "src/rust-crypto/lib.rs"
 

src/rust-crypto/blockmodes.rs

@@ -1143,9 +1143,10 @@ mod test {
         use std::rand;
         use std::rand::Rng;
 
-        let mut rng1: rand::StdRng = rand::SeedableRng::from_seed(&[1, 2, 3, 4]);
-        let mut rng2: rand::StdRng = rand::SeedableRng::from_seed(&[1, 2, 3, 4]);
-        let mut rng3: rand::StdRng = rand::SeedableRng::from_seed(&[1, 2, 3, 4]);
+        let tmp : &[_] = &[1, 2, 3, 4];
+        let mut rng1: rand::StdRng = rand::SeedableRng::from_seed(tmp);
+        let mut rng2: rand::StdRng = rand::SeedableRng::from_seed(tmp);
+        let mut rng3: rand::StdRng = rand::SeedableRng::from_seed(tmp);
         let max_size = cmp::max(test.get_plain().len(), test.get_cipher().len());
 
         let r1 = || {

src/rust-crypto/util.rs

@@ -25,12 +25,13 @@ pub fn supports_aesni() -> bool {
         asm!("")
     }
 
-    return (flags & 0x02000000) != 0;
+    (flags & 0x02000000) != 0
 }
 
 #[cfg(target_arch = "x86")]
 #[cfg(target_arch = "x86_64")]
 #[allow(dead_assignment)]
+#[allow(unused_variable)]
 unsafe fn fixed_time_eq_asm(mut lhsp: *const u8, mut rhsp: *const u8, mut count: uint) -> bool {
     let mut result: u8 = 0;
 
@@ -53,7 +54,7 @@ unsafe fn fixed_time_eq_asm(mut lhsp: *const u8, mut rhsp: *const u8, mut count:
         : "volatile" // flags
     );
 
-    return result == 0;
+    result == 0
 }
 
 #[cfg(target_arch = "arm")]
@@ -81,25 +82,24 @@ unsafe fn fixed_time_eq_asm(mut lhsp: *const u8, mut rhsp: *const u8, mut count:
         : "volatile" // flags
     );
 
-    return result == 0;
+    result == 0
 }
 
 /// Compare two vectors using a fixed number of operations. If the two vectors are not of equal
 /// length, the function returns false immediately.
 pub fn fixed_time_eq(lhs: &[u8], rhs: &[u8]) -> bool {
     if lhs.len() != rhs.len() {
-        return false;
-    }
-    if lhs.len() == 0 {
-        return true;
-    }
-
-    let count = lhs.len();
-
-    unsafe {
-        let lhsp = lhs.unsafe_get(0);
-        let rhsp = rhs.unsafe_get(0);
-        return fixed_time_eq_asm(lhsp, rhsp, count);
+        false
+    } else if lhs.len() == 0 {
+        true
+    } else {
+        let count = lhs.len();
+
+        unsafe {
+            let lhsp = lhs.unsafe_get(0);
+            let rhsp = rhs.unsafe_get(0);
+            fixed_time_eq_asm(lhsp, rhsp, count)
+        }
     }
 }