From 791ae852a269ca5bbdb3ce5d8b0effc527601140 Mon Sep 17 00:00:00 2001
From: Robert Kelly <robert.l.kelly3@gmail.com>
Date: Sun, 13 May 2018 18:14:10 -0400
Subject: [PATCH] removed old keygen

---
 src/signature.rs | 50 ++----------------------------------------------
 1 file changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/signature.rs b/src/signature.rs
index 73d31b2db..0bb704f80 100644
--- a/src/signature.rs
+++ b/src/signature.rs
@@ -69,45 +69,6 @@ impl GenKeys {
         KeyPair::generate_pkcs8(self).unwrap().to_vec()
     }
 
-    pub fn gen_n_keys(&self, n_keys: i64, tokens_per_user: i64) -> Vec<(Vec<u8>, i64)> {
-        let users: Vec<_> = (0..n_keys)
-            .into_iter()
-            .map(|_| {
-                let pkcs8 = self.new_key();
-                (pkcs8, tokens_per_user)
-            })
-            .collect();
-        users
-    }
-}
-
-impl SecureRandom for GenKeys {
-    fn fill(&self, dest: &mut [u8]) -> Result<(), Unspecified> {
-        let mut rng = self.generator.borrow_mut();
-        rng.fill_bytes(dest);
-        Ok(())
-    }
-}
-
-pub struct GenKeys2 {
-    // This is necessary because the rng needs to mutate its state to remain
-    // deterministic, and the fill trait requires an immuatble reference to self
-    generator: RefCell<ChaChaRng>,
-}
-
-impl GenKeys2 {
-    pub fn new(seed_values: &[u8]) -> GenKeys2 {
-        let seed: &[u8] = &seed_values[..];
-        let rng: ChaChaRng = SeedableRng::from_seed(unsafe { mem::transmute(seed) });
-        GenKeys2 {
-            generator: RefCell::new(rng),
-        }
-    }
-
-    pub fn new_key(&self) -> Vec<u8> {
-        KeyPair::generate_pkcs8(self).unwrap().to_vec()
-    }
-
     pub fn gen_n_seeds(&self, n_seeds: i64) -> Vec<[u8; 16]> {
         let mut rng = self.generator.borrow_mut();
 
@@ -126,7 +87,7 @@ impl GenKeys2 {
 
         let users: Vec<_> = keys.into_par_iter()
             .map(|seed| {
-                let new: GenKeys2 = GenKeys2::new(&seed[..]);
+                let new: GenKeys = GenKeys::new(&seed[..]);
                 let pkcs8 = KeyPair::generate_pkcs8(&new).unwrap().to_vec();
                 (pkcs8, tokens_per_user)
             })
@@ -135,7 +96,7 @@ impl GenKeys2 {
     }
 }
 
-impl SecureRandom for GenKeys2 {
+impl SecureRandom for GenKeys {
     fn fill(&self, dest: &mut [u8]) -> Result<(), Unspecified> {
         let mut rng = self.generator.borrow_mut();
         rng.fill_bytes(dest);
@@ -159,13 +120,6 @@ mod tests {
         b.iter(|| rnd.gen_n_keys(1000, 1));
     }
 
-    #[bench]
-    fn bench_gen_keys2(b: &mut Bencher) {
-        let seed: &[_] = &[1, 2, 3, 4];
-        let rnd = GenKeys2::new(seed);
-        b.iter(|| rnd.gen_n_keys(1000, 1));
-    }
-
     #[test]
     fn test_new_key_is_redundant() {
         let seed: &[_] = &[1, 2, 3, 4];