summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/set3.rs5
-rw-r--r--tests/util.rs5
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/set3.rs b/tests/set3.rs
index a6c32bc..77b3371 100644
--- a/tests/set3.rs
+++ b/tests/set3.rs
@@ -1,7 +1,6 @@
extern crate matasano;
extern crate rustc_serialize as serialize;
extern crate rand;
-extern crate time;
use std::ascii::AsciiExt;
@@ -124,7 +123,7 @@ fn problem_21 () {
#[test]
fn problem_22 () {
// std::thread::sleep_ms(rand::thread_rng().gen_range(40, 1000) * 1000);
- let seed = time::now().to_timespec().sec as u32;
+ let seed = util::now();
let mut mt = matasano::MersenneTwister::from_seed(seed);
// std::thread::sleep_ms(rand::thread_rng().gen_range(40, 1000) * 1000);
let output: u32 = mt.gen();
@@ -161,7 +160,7 @@ fn problem_24 () {
#[test]
fn problem_24_part_2 () {
- let seed = time::now().to_timespec().sec as u32;
+ let seed = util::now();
let mut mt = matasano::MersenneTwister::from_seed(seed);
let token: Vec<u8> = mt.gen_iter().take(16).collect();
let got = matasano::recover_mt19937_key_from_time(&token[..]).unwrap();
diff --git a/tests/util.rs b/tests/util.rs
index bb41fb6..46ca46c 100644
--- a/tests/util.rs
+++ b/tests/util.rs
@@ -2,6 +2,7 @@
extern crate rand;
extern crate rustc_serialize as serialize;
+extern crate time;
use std::io::prelude::*;
use std::fs::File;
@@ -57,3 +58,7 @@ pub fn random_aes_128_key () -> [u8; 16] {
pub fn coinflip () -> bool {
self::rand::thread_rng().gen()
}
+
+pub fn now () -> u32 {
+ return self::time::now().to_timespec().sec as u32;
+}