@@ -19,3 +19,4 @@ format

 dual_control

 .idea

+core

@@ -1,7 +1,7 @@

 sudo: required

 dist: trusty

 install:

-  - sudo apt-get install libpam0g-dev

+  - sudo apt-get install libpam0g-dev libcrypto++-dev

 language: cpp

 notifications:

   email:

@@ -1,6 +1,7 @@

 CXXFLAGS += -fPIC -fno-stack-protector -std=c++14  -g

 CFLAGS += -fPIC -fno-stack-protector -g

-LDFLAGS = -lcryptopp -lpam

+LDFLAGS = -Wl,-Bstatic -lcrypto++ -Wl,-Bdynamic -lpam -Wl,--as-needed

+#LDFLAGS = -lcrypto++ -lpam -Wl,--as-needed

 INTEGRATION_OBJS = sys_syslog.o sys_fstream.o sys_unistd.o sys_pwd.o sys_pam.o \

                    sys_stdlib.o sys_time.o

@@ -40,14 +40,10 @@ installer init_installer()

     unistd unistd (unistd::create());

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

     stdlib stdlib (stdlib::get());

-    sys_time timer (sys_time::get());

+    sys_time time (sys_time::get());

     int code_digits = 6;

-    auto the_generator =

-        std::make_shared<totp_generator> (timer, "\x00", code_digits);

-    generator generator = std::bind (&totp_generator::generate_token,

-                                     the_generator);

-    installer installer (installer::create (tokens, unistd, directory,

-                                            generator));

+    auto the_generator = std::make_shared<totp_generator> (time, "\x00", code_digits);

+    installer installer (installer::create (tokens, unistd, directory, the_generator));

     return installer;

 }

@@ -12,6 +12,7 @@

 #include "generator.h"

 #include <iostream>

+namespace {

 int ipow (int base, int exp)

 {

     int result = 1;

@@ -47,7 +48,7 @@ time_t time_step (const time_t time, const int step)

     return time / step;

 }

-class impl : public token_generator_ifc

+class token_generator_impl : public token_generator_ifc

 {

 private:

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

@@ -91,24 +92,23 @@ private:

         return key;

     }

-    const sys_time &sys_time;

+    const sys_time &clock;

     unsigned int code_digits;

     const std::shared_ptr<CryptoPP::SecByteBlock> key;

 public:

-    impl (const class sys_time &sys_time,

+    token_generator_impl (const sys_time &clock,

           const std::string &key_c,

           const int code_digits) :

-        sys_time (sys_time), code_digits (code_digits),

+        clock (clock), code_digits (code_digits),

         key (std::make_shared<CryptoPP::SecByteBlock> (CryptoPP::SecByteBlock (

                     reinterpret_cast<const unsigned char *> (key_c.c_str()), key_c.size())))

     {}

     std::string generate_token () const override

     {

+        clock.time(nullptr);

         time_t foo = 111;

-        const CryptoPP::Integer &time = sys_time.time (&foo);

-        std::cout << "At the tone, the time is: " << foo << " or " << time << "\a"

-                  << std::endl;

+        const CryptoPP::Integer &time = clock.time (&foo);

         int time_step_size = 30;

         CryptoPP::Integer current_step = time_step (time.ConvertToLong(),

                                          time_step_size);

@@ -118,16 +118,13 @@ public:

         return is.str();

     }

 };

+}

 // Generator goes here....

 totp_generator::totp_generator (

-    const class sys_time

-    &sys_time,

+    const sys_time &clock,

     const std::string &key_c,

     const int code_digits) :

-    delegate_ (std::make_shared<impl> (sys_time,

-                                       key_c,

-                                       code_digits))

+    delegate_ (std::make_shared<token_generator_impl> (clock, key_c, code_digits))

 {}

-

@@ -54,7 +54,7 @@ public:

         return delegate_->generate_token();

     };

-    totp_generator (const class sys_time &sys_time,

+    totp_generator (const sys_time &clock,

                     const std::string &key_c,

                     const int code_digits);

 };

@@ -27,10 +27,11 @@ private:

     tokens tokens_;

     unistd unistd_;

     directory directory_;

-    generator generator_;

+    std::shared_ptr<totp_generator> generator_;

 public:

     impl (const tokens &tokens, const unistd &unistd,

-          const directory &directory, const generator &generator) :

+          const directory &directory,

+          const std::shared_ptr<totp_generator> generator) :

         tokens_ (tokens), unistd_ (unistd), directory_ (directory),

         generator_ (generator) {}

     std::string install_token() const override

@@ -50,7 +51,7 @@ public:

         }

         user user (found_user[0]);

-        std::string token (generator_());

+        std::string token (generator_->generate_token());

         tokens_.save (user, token);

         return token;

     }

@@ -59,7 +60,7 @@ public:

 }

 installer installer::create (const tokens &tokens, const unistd &unistd,

-                             const directory &directory, const generator &generator)

+                             const directory &directory, const std::shared_ptr<totp_generator> generator)

 {

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

                       generator));

@@ -44,7 +44,7 @@ public:

         return delegate_->install_token();

     }

     static installer create (const tokens &tokens, const unistd &unistd,

-                             const directory &directory, const generator &generator);

+                             const directory &directory, const std::shared_ptr<totp_generator> generator);

 };

 #endif