@@ -66,14 +66,6 @@ private:

     const std::string key;

 private:

-    unsigned long truncate (const std::string &mac) const

-    {

-        uint8_t offset = static_cast<uint8_t > (mac[19]) & static_cast<uint8_t>

-                         (0x0f);

-        std::string  offsetBytes = mac.substr (offset, 4);

-        return bytesToInt (offsetBytes) & 0x7fffffff;

-    }

-

     std::string zero_fill (unsigned long result, int digits) const

     {

         std::ostringstream result_stream;

@@ -81,13 +73,23 @@ private:

         return result_stream.str();

     }

+    unsigned long truncate (const std::string &mac) const

+    {

+        uint8_t offset = static_cast<uint8_t > (mac[19]) & static_cast<uint8_t> (0x0f);

+

+        std::string  offsetBytes = mac.substr (offset, 4);

+

+        return bytesToInt (offsetBytes) & 0x7fffffff;

+    }

+

     std::string hotp (const std::string &key, const unsigned char *data,

                       size_t data_size, const int digits=6) const

     {

-        unsigned char *digest = HMAC (EVP_sha1(), key.c_str(), key.size(), data,

-                                      data_size, NULL, NULL);

-        std::string digest_s = std::string (reinterpret_cast<const char *> (digest),

-                                            20);

+        // TODO: see if I can use sha256/etc. with google auth...

+        unsigned char *digest = HMAC (EVP_sha1(), key.c_str(), key.size(), data, data_size, NULL, NULL);

+

+        std::string digest_s = std::string (reinterpret_cast<const char *> (digest), 20); //TODO: use vectors

+

         unsigned long result = truncate (digest_s) % ipow (10,digits);

         return zero_fill (result, digits);

@@ -29,7 +29,6 @@ class token_generator_ifc

 {

 public:

     virtual std::string generate_token () const = 0;

-

 };

 class totp_generator

@@ -49,6 +48,7 @@ public:

     totp_generator (delegate delegate_) :

         delegate_ (delegate_)

     {}

+

     totp_generator (const sys_time &clock,

                     const std::string &key_c,

                     const int code_digits);

@@ -70,7 +70,7 @@ public:

     }

 };

-int six_digits()

+int given_digits()

 {

     // given

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

@@ -162,7 +162,6 @@ int int_precomputed()

     // given

     // The token for key 76I6WTYEUTNCJUREMGKVM45PMA and time '2017/01/01 00:00:00' is 258675

     time_t theTime = 1483257600;

-    /// TODO: int -> time_t

     std::initializer_list<time_t> samples { theTime }; //

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

@@ -184,7 +183,7 @@ int int_precomputed()

 int run_tests()

 {

-    test (six_digits);

+    test (given_digits);

     test (modulated_source_modulates_tokens);

     test (int_max);

     test (int_min);

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

 {

     return !run_tests();

 }

-