@@ -18,8 +18,6 @@

 #include "base32.h"

 namespace

 {

-using octet_vector = std::vector<uint8_t>;

-

 class hmac_failed_exception : public std::exception

 {};

@@ -119,16 +117,7 @@ public:

         clock (clock), code_digits (code_digits)

     {}

-    std::string generate_token (const std::string &key_string) const override

-    {

-        // std::cout << "KEY SIZE: " << key_string.size() << std::endl;

-        // std::vector<uint8_t> key = codec.decode(key_string);

-        // std::cout << "LENGTH: " << key.size() << " '" << key_string << "'" << std::endl;

-        std::vector<uint8_t> key (key_string.begin(), key_string.end());

-        return generate_token (key);

-    }

-

-    std::string generate_token (const std::vector<uint8_t> key) const

+    std::string generate_token (const octet_vector &key) const override

     {

         // Assuming time is > 0, integer division produces the result we want.

         const time_t &time_chunk = clock.time (nullptr) / 30;

@@ -25,11 +25,12 @@

 int ipow (int base, int exp);

 time_t time_step (const time_t time, const int step);

+using octet_vector = std::vector<uint8_t>;

 class token_generator_ifc

 {

 public:

-    virtual std::string generate_token (const std::string &key) const = 0;

+    virtual std::string generate_token (const octet_vector &key) const = 0;

 };

 class totp_generator

@@ -41,7 +42,7 @@ private:

     delegate delegate_;

 public:

-    std::string generate_token (const std::string &key) const

+    std::string generate_token (const octet_vector &key) const

     {

         return delegate_->generate_token (key);

     }

@@ -55,4 +56,3 @@ public:

 };

 #endif

-

@@ -81,7 +81,7 @@ int given_digits()

     auto generator = totp_generator (stdtime, 6);

     // when

-    std::string key { 0 };

+    octet_vector key { 0 };

     auto actual = generator.generate_token (key);

     // then

@@ -102,7 +102,7 @@ int modulated_source_modulates_tokens()

     auto generator = totp_generator (stdtime, 6);

     // when

-    std::string key ("\x00", 1);

+    octet_vector key { 0 };

     auto actual1 = generator.generate_token (key);

     auto actual2 = generator.generate_token (key);

@@ -119,7 +119,7 @@ int int_max()

     sys_time stdtime (test_stdtime);

     auto generator = totp_generator (stdtime, 6);

-    std::string key ("\x00", 1);

+    octet_vector key { 0 };

     // when

     auto actual = generator.generate_token (key);

@@ -137,7 +137,7 @@ int int_min()

     // given

     std::initializer_list<time_t> samples { INT_MIN };

     auto test_stdtime = std::make_shared<fake_time> (samples);

-    std::string key ("\x00", 1);

+    octet_vector key { 0 };

     sys_time stdtime (test_stdtime);

     auto generator = totp_generator (stdtime, 6);

@@ -164,7 +164,7 @@ int int_precomputed()

     sys_time stdtime (test_stdtime);

     // Fake the Key

-    std::string key = "\xff\x91\xebO\x04\xa4\xda$\xd2$a\x95Vs\xaf`";

+    octet_vector key {255, 145, 235, 79, 4, 164, 218, 36, 210, 36, 97, 149, 86, 115, 175, 96};

     auto generator = totp_generator (stdtime, 6);

     std::string expected = "258675";

@@ -191,4 +191,3 @@ int main (int argc, char *argv[])

 {

     return !run_tests();

 }

-

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

         std::string key_string = tokens_.ensure_key (user);

         // TODO: use vectors in generator input instead of strings to avoid this nonsense

         std::vector<uint8_t> key = base32().decode (key_string);

-        std::string decoded_key (key.begin(), key.end());

-        std::string token = generator_.generate_token (decoded_key);

+        std::string token = generator_.generate_token (key);

         return {key_string, token};

     }

@@ -64,4 +63,3 @@ installer installer::create (const tokens &tokens, const unistd &unistd,

     return installer (std::make_shared<impl> (tokens, unistd, directory,

                       generator));

 }

-

@@ -79,7 +79,7 @@ public:

         expected_token (expected_token)

     {}

-    std::string generate_token (const std::string &key) const override

+    std::string generate_token (const octet_vector &key) const override

     {

         return expected_token;

     }

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

         base32 codec;

         std::vector<uint8_t> key = codec.decode (line);

-        return generator_.generate_token (std::string (key.begin(), key.end()));

+        return generator_.generate_token (key);

     }

 private:

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

     return tokens (tokens::delegate

                    (new tokens_impl (fstreams, generator, rand)));

 }

-

@@ -128,7 +128,7 @@ public:

     fake_totp_generator (std::string expected_token = "<unspecified>") :

         expected_token (expected_token)

     {}

-    std::string generate_token (const std::string &key) const override

+    std::string generate_token (const octet_vector &key) const override

     {

         return expected_token;

     }

@@ -333,4 +333,3 @@ int main (int argc, char *argv[])

 {

     return !run_tests();

 }

-