Merge pull request #79 from ebfe/rust-deprecated

Rust updates

Author: cosmycoder

src/rust-crypto/bcrypt_pbkdf.rs

@@ -20,7 +20,7 @@ fn bcrypt_hash(hpass: &[u8], hsalt: &[u8], output: &mut [u8, ..32]) {
     }
 
     let mut buf = [0u32, ..8];
-    read_u32v_be(buf, bytes!("OxychromaticBlowfishSwatDynamite"));
+    read_u32v_be(buf, b"OxychromaticBlowfishSwatDynamite");
 
     for i in range_step(0u, 8, 2) {
         for _ in range(0, 64) {
@@ -166,76 +166,76 @@ mod test {
     #[test]
     fn test_openbsd_vectors() {
         struct Test{
-            password: &'static [u8],
-            salt: &'static [u8],
+            password: Vec<u8>,
+            salt: Vec<u8>,
             rounds: uint,
-            out: &'static [u8],
+            out: Vec<u8>,
         }
 
         let tests = vec!(
             Test{
-                password: bytes!("password"),
-                salt: bytes!("salt"),
+                password: Vec::from_slice(b"password"),
+                salt: Vec::from_slice(b"salt"),
                 rounds: 4,
-                out: bytes!(
+                out: vec![
                     0x5b, 0xbf, 0x0c, 0xc2, 0x93, 0x58, 0x7f, 0x1c, 0x36, 0x35, 0x55, 0x5c, 0x27, 0x79, 0x65, 0x98,
-                    0xd4, 0x7e, 0x57, 0x90, 0x71, 0xbf, 0x42, 0x7e, 0x9d, 0x8f, 0xbe, 0x84, 0x2a, 0xba, 0x34, 0xd9),
+                    0xd4, 0x7e, 0x57, 0x90, 0x71, 0xbf, 0x42, 0x7e, 0x9d, 0x8f, 0xbe, 0x84, 0x2a, 0xba, 0x34, 0xd9],
             }, Test{
-                password: bytes!("password"),
-                salt: bytes!{0},
+                password: Vec::from_slice(b"password"),
+                salt: vec![0],
                 rounds: 4,
-                out: bytes!(0xc1, 0x2b, 0x56, 0x62, 0x35, 0xee, 0xe0, 0x4c, 0x21, 0x25, 0x98, 0x97, 0x0a, 0x57, 0x9a, 0x67),
+                out: vec![0xc1, 0x2b, 0x56, 0x62, 0x35, 0xee, 0xe0, 0x4c, 0x21, 0x25, 0x98, 0x97, 0x0a, 0x57, 0x9a, 0x67],
             }, Test{
-                password: bytes!{0},
-                salt: bytes!("salt"),
+                password: vec![0],
+                salt: Vec::from_slice(b"salt"),
                 rounds: 4,
-                out: bytes!(0x60, 0x51, 0xbe, 0x18, 0xc2, 0xf4, 0xf8, 0x2c, 0xbf, 0x0e, 0xfe, 0xe5, 0x47, 0x1b, 0x4b, 0xb9),
+                out: vec![0x60, 0x51, 0xbe, 0x18, 0xc2, 0xf4, 0xf8, 0x2c, 0xbf, 0x0e, 0xfe, 0xe5, 0x47, 0x1b, 0x4b, 0xb9],
             }, Test{
-                password: bytes!("password\x00"),
-                salt: bytes!("salt\x00"),
+                password: Vec::from_slice(b"password\x00"),
+                salt: Vec::from_slice(b"salt\x00"),
                 rounds: 4,
-                out: bytes!(
+                out: vec![
                     0x74, 0x10, 0xe4, 0x4c, 0xf4, 0xfa, 0x07, 0xbf, 0xaa, 0xc8, 0xa9, 0x28, 0xb1, 0x72, 0x7f, 0xac,
-                    0x00, 0x13, 0x75, 0xe7, 0xbf, 0x73, 0x84, 0x37, 0x0f, 0x48, 0xef, 0xd1, 0x21, 0x74, 0x30, 0x50),
+                    0x00, 0x13, 0x75, 0xe7, 0xbf, 0x73, 0x84, 0x37, 0x0f, 0x48, 0xef, 0xd1, 0x21, 0x74, 0x30, 0x50],
             }, Test{
-                password: bytes!("pass\x00wor"),
-                salt: bytes!("sa\x00l"),
+                password: Vec::from_slice(b"pass\x00wor"),
+                salt: Vec::from_slice(b"sa\x00l"),
                 rounds: 4,
-                out: bytes!(0xc2, 0xbf, 0xfd, 0x9d, 0xb3, 0x8f, 0x65, 0x69, 0xef, 0xef, 0x43, 0x72, 0xf4, 0xde, 0x83, 0xc0),
+                out: vec![0xc2, 0xbf, 0xfd, 0x9d, 0xb3, 0x8f, 0x65, 0x69, 0xef, 0xef, 0x43, 0x72, 0xf4, 0xde, 0x83, 0xc0],
             }, Test{
-                password: bytes!("pass\x00word"),
-                salt: bytes!("sa\x00lt"),
+                password: Vec::from_slice(b"pass\x00word"),
+                salt: Vec::from_slice(b"sa\x00lt"),
                 rounds: 4,
-                out: bytes!(0x4b, 0xa4, 0xac, 0x39, 0x25, 0xc0, 0xe8, 0xd7, 0xf0, 0xcd, 0xb6, 0xbb, 0x16, 0x84, 0xa5, 0x6f),
+                out: vec![0x4b, 0xa4, 0xac, 0x39, 0x25, 0xc0, 0xe8, 0xd7, 0xf0, 0xcd, 0xb6, 0xbb, 0x16, 0x84, 0xa5, 0x6f],
             }, Test{
-                password: bytes!("password"),
-                salt: bytes!("salt"),
+                password: Vec::from_slice(b"password"),
+                salt: Vec::from_slice(b"salt"),
                 rounds: 8,
-                out: bytes!(
+                out: vec![
                     0xe1, 0x36, 0x7e, 0xc5, 0x15, 0x1a, 0x33, 0xfa, 0xac, 0x4c, 0xc1, 0xc1, 0x44, 0xcd, 0x23, 0xfa,
                     0x15, 0xd5, 0x54, 0x84, 0x93, 0xec, 0xc9, 0x9b, 0x9b, 0x5d, 0x9c, 0x0d, 0x3b, 0x27, 0xbe, 0xc7,
                     0x62, 0x27, 0xea, 0x66, 0x08, 0x8b, 0x84, 0x9b, 0x20, 0xab, 0x7a, 0xa4, 0x78, 0x01, 0x02, 0x46,
-                    0xe7, 0x4b, 0xba, 0x51, 0x72, 0x3f, 0xef, 0xa9, 0xf9, 0x47, 0x4d, 0x65, 0x08, 0x84, 0x5e, 0x8d),
+                    0xe7, 0x4b, 0xba, 0x51, 0x72, 0x3f, 0xef, 0xa9, 0xf9, 0x47, 0x4d, 0x65, 0x08, 0x84, 0x5e, 0x8d],
             }, Test{
-                password: bytes!("password"),
-                salt: bytes!("salt"),
+                password: Vec::from_slice(b"password"),
+                salt: Vec::from_slice(b"salt"),
                 rounds: 42,
-                out: bytes!(0x83, 0x3c, 0xf0, 0xdc, 0xf5, 0x6d, 0xb6, 0x56, 0x08, 0xe8, 0xf0, 0xdc, 0x0c, 0xe8, 0x82, 0xbd),
+                out: vec![0x83, 0x3c, 0xf0, 0xdc, 0xf5, 0x6d, 0xb6, 0x56, 0x08, 0xe8, 0xf0, 0xdc, 0x0c, 0xe8, 0x82, 0xbd],
             }, Test{
-                password: bytes!("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."),
-                salt: bytes!("salis\x00"),
+                password: Vec::from_slice(b"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."),
+                salt: Vec::from_slice(b"salis\x00"),
                 rounds: 8,
-                out: bytes!(0x10, 0x97, 0x8b, 0x07, 0x25, 0x3d, 0xf5, 0x7f, 0x71, 0xa1, 0x62, 0xeb, 0x0e, 0x8a, 0xd3, 0x0a),
+                out: vec![0x10, 0x97, 0x8b, 0x07, 0x25, 0x3d, 0xf5, 0x7f, 0x71, 0xa1, 0x62, 0xeb, 0x0e, 0x8a, 0xd3, 0x0a],
             }, Test{
-                password: bytes!(0x0d, 0xb3, 0xac, 0x94, 0xb3, 0xee, 0x53, 0x28, 0x4f, 0x4a, 0x22, 0x89, 0x3b, 0x3c, 0x24, 0xae),
-                salt: bytes!(0x3a, 0x62, 0xf0, 0xf0, 0xdb, 0xce, 0xf8, 0x23, 0xcf, 0xcc, 0x85, 0x48, 0x56, 0xea, 0x10, 0x28),
+                password: vec![0x0d, 0xb3, 0xac, 0x94, 0xb3, 0xee, 0x53, 0x28, 0x4f, 0x4a, 0x22, 0x89, 0x3b, 0x3c, 0x24, 0xae],
+                salt: vec![0x3a, 0x62, 0xf0, 0xf0, 0xdb, 0xce, 0xf8, 0x23, 0xcf, 0xcc, 0x85, 0x48, 0x56, 0xea, 0x10, 0x28],
                 rounds: 8,
-                out: bytes!(0x20, 0x44, 0x38, 0x17, 0x5e, 0xee, 0x7c, 0xe1, 0x36, 0xc9, 0x1b, 0x49, 0xa6, 0x79, 0x23, 0xff),
+                out: vec![0x20, 0x44, 0x38, 0x17, 0x5e, 0xee, 0x7c, 0xe1, 0x36, 0xc9, 0x1b, 0x49, 0xa6, 0x79, 0x23, 0xff],
             }, Test{
-                password: bytes!(0x0d, 0xb3, 0xac, 0x94, 0xb3, 0xee, 0x53, 0x28, 0x4f, 0x4a, 0x22, 0x89, 0x3b, 0x3c, 0x24, 0xae),
-                salt: bytes!(0x3a, 0x62, 0xf0, 0xf0, 0xdb, 0xce, 0xf8, 0x23, 0xcf, 0xcc, 0x85, 0x48, 0x56, 0xea, 0x10, 0x28),
+                password: vec![0x0d, 0xb3, 0xac, 0x94, 0xb3, 0xee, 0x53, 0x28, 0x4f, 0x4a, 0x22, 0x89, 0x3b, 0x3c, 0x24, 0xae],
+                salt: vec![0x3a, 0x62, 0xf0, 0xf0, 0xdb, 0xce, 0xf8, 0x23, 0xcf, 0xcc, 0x85, 0x48, 0x56, 0xea, 0x10, 0x28],
                 rounds: 8,
-                out: bytes!(
+                out: vec![
                     0x20, 0x54, 0xb9, 0xff, 0xf3, 0x4e, 0x37, 0x21, 0x44, 0x03, 0x34, 0x74, 0x68, 0x28, 0xe9, 0xed,
                     0x38, 0xde, 0x4b, 0x72, 0xe0, 0xa6, 0x9a, 0xdc, 0x17, 0x0a, 0x13, 0xb5, 0xe8, 0xd6, 0x46, 0x38,
                     0x5e, 0xa4, 0x03, 0x4a, 0xe6, 0xd2, 0x66, 0x00, 0xee, 0x23, 0x32, 0xc5, 0xed, 0x40, 0xad, 0x55,
@@ -251,14 +251,14 @@ mod test {
                     0x3f, 0x54, 0x8d, 0x5e, 0xeb, 0xa4, 0x21, 0x13, 0x97, 0xe2, 0xfb, 0x06, 0x2e, 0x52, 0x6e, 0x1d,
                     0x68, 0xf4, 0x6a, 0x4c, 0xe2, 0x56, 0x18, 0x5b, 0x4b, 0xad, 0xc2, 0x68, 0x5f, 0xbe, 0x78, 0xe1,
                     0xc7, 0x65, 0x7b, 0x59, 0xf8, 0x3a, 0xb9, 0xab, 0x80, 0xcf, 0x93, 0x18, 0xd6, 0xad, 0xd1, 0xf5,
-                    0x93, 0x3f, 0x12, 0xd6, 0xf3, 0x61, 0x82, 0xc8, 0xe8, 0x11, 0x5f, 0x68, 0x03, 0x0a, 0x12, 0x44),
+                    0x93, 0x3f, 0x12, 0xd6, 0xf3, 0x61, 0x82, 0xc8, 0xe8, 0x11, 0x5f, 0x68, 0x03, 0x0a, 0x12, 0x44],
             },
         );
 
         for t in tests.iter() {
             let mut out = Vec::from_elem(t.out.len(), 0u8);
-            bcrypt_pbkdf(t.password, t.salt, t.rounds, out.as_mut_slice());
-            assert_eq!(out.as_slice(), t.out.as_slice());
+            bcrypt_pbkdf(t.password.as_slice(), t.salt.as_slice(), t.rounds, out.as_mut_slice());
+            assert_eq!(out, t.out);
         }
     }
 }

src/rust-crypto/chacha20.rs

@@ -36,8 +36,8 @@ impl ChaCha20 {
     fn expand(key: &[u8], nonce: &[u8]) -> [u32, ..16] {
         let mut state = [0u32, ..16];
         let constant = match key.len() {
-            16 => bytes!("expand 16-byte k"),
-            32 => bytes!("expand 32-byte k"),
+            16 => b"expand 16-byte k",
+            32 => b"expand 32-byte k",
             _  => unreachable!(),
         };
 

src/rust-crypto/cryptoutil.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use std;
-use std::num::{One, Zero, CheckedAdd};
+use std::num::{One, Zero, Int, CheckedAdd};
 use std::slice::bytes::{MutableByteVector, copy_memory};
 
 use buffer::{ReadBuffer, WriteBuffer, BufferResult, BufferUnderflow, BufferOverflow};
@@ -19,48 +19,44 @@ use symmetriccipher::{SynchronousStreamCipher, SymmetricCipherError};
 /// format.
 pub fn write_u64_be(dst: &mut[u8], input: u64) {
     use std::mem::transmute;
-    use std::mem::to_be64;
     assert!(dst.len() == 8);
     unsafe {
         let x: *mut u64 = transmute(dst.unsafe_mut_ref(0));
-        *x = to_be64(input);
+        *x = input.to_be();
     }
 }
 
 /// Write a u32 into a vector, which must be 4 bytes long. The value is written in big-endian
 /// format.
 pub fn write_u32_be(dst: &mut[u8], input: u32) {
     use std::mem::transmute;
-    use std::mem::to_be32;
     assert!(dst.len() == 4);
     unsafe {
         let x: *mut u32 = transmute(dst.unsafe_mut_ref(0));
-        *x = to_be32(input);
+        *x = input.to_be();
     }
 }
 
 /// Write a u32 into a vector, which must be 4 bytes long. The value is written in little-endian
 /// format.
 pub fn write_u32_le(dst: &mut[u8], input: u32) {
     use std::mem::transmute;
-    use std::mem::to_le32;
     assert!(dst.len() == 4);
     unsafe {
         let x: *mut u32 = transmute(dst.unsafe_mut_ref(0));
-        *x = to_le32(input);
+        *x = input.to_le();
     }
 }
 
 /// Read a vector of bytes into a vector of u64s. The values are read in big-endian format.
 pub fn read_u64v_be(dst: &mut[u64], input: &[u8]) {
     use std::mem::transmute;
-    use std::mem::to_be64;
     assert!(dst.len() * 8 == input.len());
     unsafe {
         let mut x: *mut u64 = transmute(dst.unsafe_mut_ref(0));
         let mut y: *u64 = transmute(input.unsafe_ref(0));
         for _ in range(0, dst.len()) {
-            *x = to_be64(*y);
+            *x = (*y).to_be();
             x = x.offset(1);
             y = y.offset(1);
         }
@@ -70,13 +66,12 @@ pub fn read_u64v_be(dst: &mut[u64], input: &[u8]) {
 /// Read a vector of bytes into a vector of u32s. The values are read in big-endian format.
 pub fn read_u32v_be(dst: &mut[u32], input: &[u8]) {
     use std::mem::transmute;
-    use std::mem::to_be32;
     assert!(dst.len() * 4 == input.len());
     unsafe {
         let mut x: *mut u32 = transmute(dst.unsafe_mut_ref(0));
         let mut y: *u32 = transmute(input.unsafe_ref(0));
         for _ in range(0, dst.len()) {
-            *x = to_be32(*y);
+            *x = (*y).to_be();
             x = x.offset(1);
             y = y.offset(1);
         }
@@ -86,13 +81,12 @@ pub fn read_u32v_be(dst: &mut[u32], input: &[u8]) {
 /// Read a vector of bytes into a vector of u32s. The values are read in little-endian format.
 pub fn read_u32v_le(dst: &mut[u32], input: &[u8]) {
     use std::mem::transmute;
-    use std::mem::to_le32;
     assert!(dst.len() * 4 == input.len());
     unsafe {
         let mut x: *mut u32 = transmute(dst.unsafe_mut_ref(0));
         let mut y: *u32 = transmute(input.unsafe_ref(0));
         for _ in range(0, dst.len()) {
-            *x = to_le32(*y);
+            *x = (*y).to_le();
             x = x.offset(1);
             y = y.offset(1);
         }
@@ -102,22 +96,20 @@ pub fn read_u32v_le(dst: &mut[u32], input: &[u8]) {
 /// Read the value of a vector of bytes as a u32 value in little-endian format.
 pub fn read_u32_le(input: &[u8]) -> u32 {
     use std::mem::transmute;
-    use std::mem::to_le32;
     assert!(input.len() == 4);
     unsafe {
         let tmp: *u32 = transmute(input.unsafe_ref(0));
-        return to_le32(*tmp);
+        return (*tmp).to_le();
     }
 }
 
 /// Read the value of a vector of bytes as a u32 value in big-endian format.
 pub fn read_u32_be(input: &[u8]) -> u32 {
     use std::mem::transmute;
-    use std::mem::to_be32;
     assert!(input.len() == 4);
     unsafe {
         let tmp: *u32 = transmute(input.unsafe_ref(0));
-        return to_be32(*tmp);
+        return (*tmp).to_be();
     }
 }
 

src/rust-crypto/poly1305.rs

@@ -335,7 +335,7 @@ mod test {
     #[test]
     fn test_tls_vectors() {
         // from http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-04
-        let key = bytes!("this is 32-byte key for Poly1305");
+        let key = b"this is 32-byte key for Poly1305";
         let msg = [0u8, ..32];
         let expected = [
             0x49, 0xec, 0x78, 0x09, 0x0e, 0x48, 0x1e, 0xc6,
@@ -345,7 +345,7 @@ mod test {
         poly1305(key, msg, mac.as_mut_slice());
         assert_eq!(mac.as_slice(), expected.as_slice());
 
-        let msg = bytes!("Hello world!");
+        let msg = b"Hello world!";
         let expected= [
             0xa6, 0xf7, 0x45, 0x00, 0x8f, 0x81, 0xc9, 0x16,
             0xa2, 0x0d, 0xcc, 0x74, 0xee, 0xf2, 0xb2, 0xf0,