1 files changed, 14 insertions, 15 deletions

diff --git a/crypto/pkcs5.rs b/crypto/pkcs5.rs
index 2d1bfd34..06fc1bb9 100644
--- a/crypto/pkcs5.rs
+++ b/crypto/pkcs5.rs
@@ -1,5 +1,4 @@
 use libc::c_int;
-use std::slice;
 
 #[link(name = "crypto")]
 extern {
@@ -10,12 +9,12 @@ extern {
 }
 
 /// Derives a key from a password and salt using the PBKDF2-HMAC-SHA1 algorithm.
-pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint, keylen: uint) -> ~[u8] {
+pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint, keylen: uint) -> Vec<u8> {
     unsafe {
         assert!(iter >= 1);
         assert!(keylen >= 1);
 
-        let mut out = slice::with_capacity(keylen);
+        let mut out = Vec::with_capacity(keylen);
 
         let r = PKCS5_PBKDF2_HMAC_SHA1(
                 pass.as_ptr(), pass.len() as c_int,
@@ -44,11 +43,11 @@ mod tests {
                 1u,
                 20u
             ),
-            ~[
+            vec!(
                 0x0c_u8, 0x60_u8, 0xc8_u8, 0x0f_u8, 0x96_u8, 0x1f_u8, 0x0e_u8,
                 0x71_u8, 0xf3_u8, 0xa9_u8, 0xb5_u8, 0x24_u8, 0xaf_u8, 0x60_u8,
                 0x12_u8, 0x06_u8, 0x2f_u8, 0xe0_u8, 0x37_u8, 0xa6_u8
-            ]
+            )
         );
 
         assert_eq!(
@@ -58,11 +57,11 @@ mod tests {
                 2u,
                 20u
             ),
-            ~[
+            vec!(
                 0xea_u8, 0x6c_u8, 0x01_u8, 0x4d_u8, 0xc7_u8, 0x2d_u8, 0x6f_u8,
                 0x8c_u8, 0xcd_u8, 0x1e_u8, 0xd9_u8, 0x2a_u8, 0xce_u8, 0x1d_u8,
                 0x41_u8, 0xf0_u8, 0xd8_u8, 0xde_u8, 0x89_u8, 0x57_u8
-            ]
+            )
         );
 
         assert_eq!(
@@ -72,11 +71,11 @@ mod tests {
                 4096u,
                 20u
             ),
-            ~[
+            vec!(
                 0x4b_u8, 0x00_u8, 0x79_u8, 0x01_u8, 0xb7_u8, 0x65_u8, 0x48_u8,
                 0x9a_u8, 0xbe_u8, 0xad_u8, 0x49_u8, 0xd9_u8, 0x26_u8, 0xf7_u8,
                 0x21_u8, 0xd0_u8, 0x65_u8, 0xa4_u8, 0x29_u8, 0xc1_u8
-            ]
+            )
         );
 
         assert_eq!(
@@ -86,11 +85,11 @@ mod tests {
                 16777216u,
                 20u
             ),
-            ~[
+            vec!(
                 0xee_u8, 0xfe_u8, 0x3d_u8, 0x61_u8, 0xcd_u8, 0x4d_u8, 0xa4_u8,
                 0xe4_u8, 0xe9_u8, 0x94_u8, 0x5b_u8, 0x3d_u8, 0x6b_u8, 0xa2_u8,
                 0x15_u8, 0x8c_u8, 0x26_u8, 0x34_u8, 0xe9_u8, 0x84_u8
-            ]
+            )
         );
 
         assert_eq!(
@@ -100,12 +99,12 @@ mod tests {
                 4096u,
                 25u
             ),
-            ~[
+            vec!(
                 0x3d_u8, 0x2e_u8, 0xec_u8, 0x4f_u8, 0xe4_u8, 0x1c_u8, 0x84_u8,
                 0x9b_u8, 0x80_u8, 0xc8_u8, 0xd8_u8, 0x36_u8, 0x62_u8, 0xc0_u8,
                 0xe4_u8, 0x4a_u8, 0x8b_u8, 0x29_u8, 0x1a_u8, 0x96_u8, 0x4c_u8,
                 0xf2_u8, 0xf0_u8, 0x70_u8, 0x38_u8
-            ]
+            )
         );
 
         assert_eq!(
@@ -115,11 +114,11 @@ mod tests {
                 4096u,
                 16u
             ),
-            ~[
+            vec!(
                 0x56_u8, 0xfa_u8, 0x6a_u8, 0xa7_u8, 0x55_u8, 0x48_u8, 0x09_u8,
                 0x9d_u8, 0xcc_u8, 0x37_u8, 0xd7_u8, 0xf0_u8, 0x34_u8, 0x25_u8,
                 0xe0_u8, 0xc3_u8
-            ]
+            )
         );
     }
 }