@@ -37,17 +37,6 @@ class system init_system()

 installer init_installer()

 {

     fstreams fstreams (fstreams::create());

-

-    random_source foo (random_source::create (fstreams));

-    auto bytes = foo.get_random_bytes (16);

-    std::cout << "I'm random: ";

-

-    for (auto byte: bytes) {

-        std::cout << static_cast<unsigned int> (byte) << ", ";

-    }

-

-    std::cout << std::endl;

-

     pwd pwd (pwd::create());

     unistd unistd (unistd::create());

     directory directory (directory::create (unistd, pwd));

@@ -68,7 +57,10 @@ int main (int argc, char *argv[])

     class system system (init_system());

     installer tool (init_installer());

     auto generated_key_and_sample_token = tool.install_key();

-    std::cout << generated_key_and_sample_token.first << " " <<

-              generated_key_and_sample_token.second << std::endl;

+    std::cout << "         Key: " << generated_key_and_sample_token.first

+              << std::endl

+              << "Sample Token: " << generated_key_and_sample_token.second

+              << std::endl

+              << "Run again to get another token from the same key."

+              << std::endl;

 }

-

@@ -22,7 +22,7 @@ class impl : public random_source_ifc

 private:

     fstreams fstreams_;

 public:

-    impl (fstreams fstreams)

+    impl (const fstreams fstreams)

         : fstreams_ (fstreams)

     {}

     std::vector<uint8_t> get_random_bytes (int length) const override

@@ -43,8 +43,7 @@ public:

 const std::string random_source_ifc::file_path = "/dev/urandom";

-random_source random_source::create (fstreams &fstreams)

+random_source random_source::create (const fstreams &fstreams)

 {

     return random_source (random_source::delegate (new impl (fstreams)));

 };

-

@@ -46,8 +46,7 @@ public:

         return delegate_->get_random_bytes (length);

     }

-    static random_source create (fstreams &fstreams);

+    static random_source create (const fstreams &fstreams);

 };

 #endif

-

@@ -20,6 +20,7 @@

 #include "user.h"

 #include "base32.h"

 #include "sys_fstream.h"

+#include "random_source.h"

 namespace

 {

@@ -64,11 +65,13 @@ private:

     std::string generate_key() const

     {

         base32 codec;

+        random_source rand = random_source::create(fstreams_);

         // get randomness

-        std::vector<unsigned char> random_bytes (16);

+        int length = 10;

+        std::vector<uint8_t> random_bytes (rand.get_random_bytes(length));

         // base32encode it

         std::string key = codec.encode (random_bytes);

-        return "QWERQWERQWERQWER";

+        return key;

     }

     std::string read_key (const user &user) const

@@ -115,4 +118,3 @@ tokens tokens::create (const fstreams &fstreams,

     return tokens (tokens::delegate

                    (new tokens_impl (fstreams, generator)));

 }

-