Merge remote-tracking branch 'upstream/master'

4 files changed, 37 insertions, 32 deletions

diff --git a/src/crypto/hash.rs b/src/crypto/hash.rs
index 2a181526..1f8a3936 100644
--- a/src/crypto/hash.rs
+++ b/src/crypto/hash.rs
@@ -1,10 +1,11 @@
 use libc::c_uint;
 use std::ptr;
 use std::io;
+use std::iter::repeat;
 
 use ffi;
 
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum HashType {
     MD5,
     SHA1,
@@ -101,7 +102,7 @@ impl Hasher {
      * initialization and its context for reuse
      */
     pub fn finalize_reuse(self) -> (Vec<u8>, HasherContext) {
-        let mut res = Vec::from_elem(self.len, 0u8);
+        let mut res = repeat(0u8).take(self.len).collect::<Vec<_>>();
         unsafe {
             ffi::EVP_DigestFinal_ex(self.ctx.ptr, res.as_mut_ptr(), ptr::null_mut())
         };
diff --git a/src/crypto/hmac.rs b/src/crypto/hmac.rs
index 9e8b6361..6de0b1e7 100644
--- a/src/crypto/hmac.rs
+++ b/src/crypto/hmac.rs
@@ -15,6 +15,7 @@
  */
 
 use libc::{c_int, c_uint};
+use std::iter::repeat;
 
 use crypto::hash;
 use ffi;
@@ -52,7 +53,7 @@ impl HMAC {
 
     pub fn finalize(&mut self) -> Vec<u8> {
         unsafe {
-            let mut res = Vec::from_elem(self.len, 0u8);
+            let mut res: Vec<u8> = repeat(0).take(self.len).collect();
             let mut outlen = 0;
             ffi::HMAC_Final(&mut self.ctx, res.as_mut_ptr(), &mut outlen);
             assert!(self.len == outlen as uint);
@@ -71,31 +72,32 @@ impl Drop for HMAC {
 
 #[cfg(test)]
 mod tests {
+    use std::iter::repeat;
     use serialize::hex::FromHex;
-    use crypto::hash::HashType::{mod, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};
+    use crypto::hash::HashType::{self, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};
     use super::HMAC;
 
     #[test]
     fn test_hmac_md5() {
         // test vectors from RFC 2202
         let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] = [
-            (Vec::from_elem(16, 0x0b_u8), b"Hi There".to_vec(),
+            (repeat(0x0b_u8).take(16).collect(), b"Hi There".to_vec(),
              "9294727a3638bb1c13f48ef8158bfc9d".from_hex().unwrap()),
             (b"Jefe".to_vec(),
              b"what do ya want for nothing?".to_vec(),
              "750c783e6ab0b503eaa86e310a5db738".from_hex().unwrap()),
-            (Vec::from_elem(16, 0xaa_u8), Vec::from_elem(50, 0xdd_u8),
+            (repeat(0xaa_u8).take(16).collect(), repeat(0xdd_u8).take(50).collect(),
              "56be34521d144c88dbb8c733f0e8b3f6".from_hex().unwrap()),
             ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
-             Vec::from_elem(50, 0xcd_u8),
+             repeat(0xcd_u8).take(50).collect(),
              "697eaf0aca3a3aea3a75164746ffaa79".from_hex().unwrap()),
-            (Vec::from_elem(16, 0x0c_u8),
+            (repeat(0x0c_u8).take(16).collect(),
              b"Test With Truncation".to_vec(),
              "56461ef2342edc00f9bab995690efd4c".from_hex().unwrap()),
-            (Vec::from_elem(80, 0xaa_u8),
+            (repeat(0xaa_u8).take(80).collect(),
              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
              "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap()),
-            (Vec::from_elem(80, 0xaa_u8),
+            (repeat(0xaa_u8).take(80).collect(),
              b"Test Using Larger Than Block-Size Key \
                and Larger Than One Block-Size Data".to_vec(),
              "6f630fad67cda0ee1fb1f562db3aa53e".from_hex().unwrap())
@@ -112,23 +114,23 @@ mod tests {
     fn test_hmac_sha1() {
         // test vectors from RFC 2202
         let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] = [
-            (Vec::from_elem(20, 0x0b_u8), b"Hi There".to_vec(),
+            (repeat(0x0b_u8).take(20).collect(), b"Hi There".to_vec(),
              "b617318655057264e28bc0b6fb378c8ef146be00".from_hex().unwrap()),
             (b"Jefe".to_vec(),
              b"what do ya want for nothing?".to_vec(),
              "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79".from_hex().unwrap()),
-            (Vec::from_elem(20, 0xaa_u8), Vec::from_elem(50, 0xdd_u8),
+            (repeat(0xaa_u8).take(20).collect(), repeat(0xdd_u8).take(50).collect(),
              "125d7342b9ac11cd91a39af48aa17b4f63f175d3".from_hex().unwrap()),
             ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
-             Vec::from_elem(50, 0xcd_u8),
+             repeat(0xcd_u8).take(50).collect(),
              "4c9007f4026250c6bc8414f9bf50c86c2d7235da".from_hex().unwrap()),
-            (Vec::from_elem(20, 0x0c_u8),
+            (repeat(0x0c_u8).take(20).collect(),
              b"Test With Truncation".to_vec(),
              "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04".from_hex().unwrap()),
-            (Vec::from_elem(80, 0xaa_u8),
+            (repeat(0xaa_u8).take(80).collect(),
              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
              "aa4ae5e15272d00e95705637ce8a3b55ed402112".from_hex().unwrap()),
-            (Vec::from_elem(80, 0xaa_u8),
+            (repeat(0xaa_u8).take(80).collect(),
              b"Test Using Larger Than Block-Size Key \
                and Larger Than One Block-Size Data".to_vec(),
              "e8e99d0f45237d786d6bbaa7965c7808bbff1a91".from_hex().unwrap())
@@ -144,15 +146,15 @@ mod tests {
     fn test_sha2(ty: HashType, results: &[Vec<u8>]) {
         // test vectors from RFC 4231
         let tests: [(Vec<u8>, Vec<u8>); 6] = [
-            (Vec::from_elem(20, 0x0b_u8), b"Hi There".to_vec()),
+            (repeat(0xb_u8).take(20).collect(), b"Hi There".to_vec()),
             (b"Jefe".to_vec(),
              b"what do ya want for nothing?".to_vec()),
-            (Vec::from_elem(20, 0xaa_u8), Vec::from_elem(50, 0xdd_u8)),
+            (repeat(0xaa_u8).take(20).collect(), repeat(0xdd_u8).take(50).collect()),
             ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
-             Vec::from_elem(50, 0xcd_u8)),
-            (Vec::from_elem(131, 0xaa_u8),
+             repeat(0xcd_u8).take(50).collect()),
+            (repeat(0xaa_u8).take(131).collect(),
              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec()),
-            (Vec::from_elem(131, 0xaa_u8),
+            (repeat(0xaa_u8).take(131).collect(),
              b"This is a test using a larger than block-size key and a \
                larger than block-size data. The key needs to be hashed \
                before being used by the HMAC algorithm.".to_vec())
diff --git a/src/crypto/pkey.rs b/src/crypto/pkey.rs
index bab7addc..2264e192 100644
--- a/src/crypto/pkey.rs
+++ b/src/crypto/pkey.rs
@@ -1,4 +1,5 @@
 use libc::{c_int, c_uint};
+use std::iter::repeat;
 use std::mem;
 use std::ptr;
 use bio::{MemBio};
@@ -6,7 +7,7 @@ use crypto::hash::HashType;
 use ffi;
 use ssl::error::{SslError, StreamError};
 
-#[deriving(Copy)]
+#[derive(Copy)]
 enum Parts {
     Neither,
     Public,
@@ -14,7 +15,7 @@ enum Parts {
 }
 
 /// Represents a role an asymmetric key might be appropriate for.
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum Role {
     Encrypt,
     Decrypt,
@@ -23,7 +24,7 @@ pub enum Role {
 }
 
 /// Type of encryption padding to use.
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum EncryptionPadding {
     OAEP,
     PKCS1v15
@@ -71,7 +72,7 @@ impl PKey {
             let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
             let len = f(rsa, ptr::null());
             if len < 0 as c_int { return vec!(); }
-            let mut s = Vec::from_elem(len as uint, 0u8);
+            let mut s = repeat(0u8).take(len as uint).collect::<Vec<_>>();
 
             let r = f(rsa, &s.as_mut_ptr());
 
@@ -209,7 +210,7 @@ impl PKey {
 
             assert!(s.len() < self.max_data());
 
-            let mut r = Vec::from_elem(len as uint + 1u, 0u8);
+            let mut r = repeat(0u8).take(len as uint + 1).collect::<Vec<_>>();
 
             let rv = ffi::RSA_public_encrypt(
                 s.len() as c_uint,
@@ -234,7 +235,7 @@ impl PKey {
 
             assert_eq!(s.len() as c_uint, ffi::RSA_size(rsa));
 
-            let mut r = Vec::from_elem(len as uint + 1u, 0u8);
+            let mut r = repeat(0u8).take(len as uint + 1).collect::<Vec<_>>();
 
             let rv = ffi::RSA_private_decrypt(
                 s.len() as c_uint,
@@ -279,7 +280,7 @@ impl PKey {
         unsafe {
             let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
             let mut len = ffi::RSA_size(rsa);
-            let mut r = Vec::from_elem(len as uint + 1u, 0u8);
+            let mut r = repeat(0u8).take(len as uint + 1).collect::<Vec<_>>();
 
             let rv = ffi::RSA_sign(
                 openssl_hash_nid(hash),
diff --git a/src/crypto/symm.rs b/src/crypto/symm.rs
index 61365f2e..9478bc4a 100644
--- a/src/crypto/symm.rs
+++ b/src/crypto/symm.rs
@@ -1,15 +1,16 @@
+use std::iter::repeat;
 use libc::{c_int};
 
 use ffi;
 
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum Mode {
     Encrypt,
     Decrypt,
 }
 
 #[allow(non_camel_case_types)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum Type {
     AES_128_ECB,
     AES_128_CBC,
@@ -109,7 +110,7 @@ impl Crypter {
      */
     pub fn update(&self, data: &[u8]) -> Vec<u8> {
         unsafe {
-            let mut res = Vec::from_elem(data.len() + self.blocksize, 0u8);
+            let mut res = repeat(0u8).take(data.len() + self.blocksize).collect::<Vec<_>>();
             let mut reslen = (data.len() + self.blocksize) as u32;
 
             ffi::EVP_CipherUpdate(
@@ -130,7 +131,7 @@ impl Crypter {
      */
     pub fn finalize(&self) -> Vec<u8> {
         unsafe {
-            let mut res = Vec::from_elem(self.blocksize, 0u8);
+            let mut res = repeat(0u8).take(self.blocksize).collect::<Vec<_>>();
             let mut reslen = self.blocksize as c_int;
 
             ffi::EVP_CipherFinal(self.ctx,