Merge remote-tracking branch 'upstream/master'

Author: cosmycoder

Diff for: Cargo.toml

@@ -1,18 +1,24 @@
 [package]
 name = "rust-crypto"
-version = "0.2.29"
+version = "0.2.30"
 authors = ["The Rust-Crypto Project Developers"]
 license = "MIT/Apache-2.0"
 homepage = "https://github.com/DaGenix/rust-crypto/"
 repository = "https://github.com/DaGenix/rust-crypto/"
 description = "A (mostly) pure-Rust implementation of various common cryptographic algorithms."
 keywords = [ "Crypto", "MD5", "Sha1", "Sha2", "AES" ]
 readme = "README.md"
+build = "build.rs"
 
 [lib]
 name = "crypto"
 
+[build-dependencies]
+gcc = "*"
+
 [dependencies]
+libc = "*"
 time = "*"
 rand = "*"
 rustc-serialize = "*"
+

Diff for: build.rs

@@ -0,0 +1,14 @@
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+extern crate gcc;
+
+fn main() {
+    gcc::compile_library(
+        "lib_rust_crypto_helpers.a",
+        &["src/util_helpers.c", "src/aesni_helpers.c"]);
+}
+

Diff for: src/aes.rs

@@ -700,7 +700,7 @@ mod test {
             let mut result: Vec<u8> = repeat(0).take(test.plain.len()).collect();
             aes_enc.process(&test.plain[..], &mut result[..]);
             let res: &[u8] = result.as_ref();
-            assert!(res == test.cipher);
+            assert!(res == &test.cipher[..]);
         }
     }
 }

Diff for: src/aes_gcm.rs

@@ -6,7 +6,7 @@
 
 use aes::{ctr, KeySize};
 use aead::{AeadEncryptor,AeadDecryptor};
-use std::slice::bytes::copy_memory;
+use cryptoutil::copy_memory;
 use symmetriccipher::SynchronousStreamCipher;
 use ghash::{Ghash};
 use util::fixed_time_eq;