Code cleanup

pi-314159 · Jun 17, 2024 · 0ca8a3c · 0ca8a3c
1 parent d0d30b7
commit 0ca8a3c
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 80 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 PI
+Copyright (c) 2024 PI (github.com/pi-314159)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -1,6 +1,5 @@
 # Author:       pi-314159@GitHub
 # License:      MIT
-# Last Updated: 2024-06-10
 
 CXX ?= g++
 DEFAULT_FLAGS := -std=c++20 -O3 -Wall

diff --git a/README.md b/README.md
@@ -2,19 +2,15 @@ This is a TOTP (Time-Based One-Time Password) authenticator that adheres to [RFC
 
 ## Build
 
-Before building, ensure that you have OpenSSL library 3.0 or higher installed and that your compiler supports C++20. By default, the executable is located in the `build` folder.
+Before building, ensure that you have OpenSSL library installed and that your compiler supports C++20. By default, the executable is located in the `build` folder.
 
 ### Windows
 
-If you're on Windows, you can install OpenSSL using vcpkg. Follow these steps:
+By default, Visual Studio Release build will statically link dependencies. You can install OpenSSL using vcpkg. Follow these steps:
 
 1. Install OpenSSL using vcpkg:
     ```bat
-    vcpkg.exe install openssl:x64-windows
-    ```
-    or
-    ```bat
-    vcpkg.exe install openssl
+    vcpkg.exe install openssl:x64-windows-static
     ```
 
 2. Integrate vcpkg with Visual Studio:

diff --git a/VisualStudio/Authenticator.vcxproj b/VisualStudio/Authenticator.vcxproj
@@ -44,6 +44,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -52,6 +53,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,6 +83,9 @@
     <IntDir>$(SolutionDir)\..\tmp\</IntDir>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\src\include;</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <VcpkgUseStatic>true</VcpkgUseStatic>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -141,6 +146,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <StackReserveSize>8388608</StackReserveSize>
+      <AdditionalDependencies>AdvAPI32.Lib;Crypt32.Lib;User32.Lib;WS2_32.Lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/src/Authenticator.cpp b/src/Authenticator.cpp
@@ -1,12 +1,10 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #include <actions/add.h>
 #include <actions/generatetotp.h>
 #include <tools/crypto.h>
 #include <tools/file_io.h>
-#include <tools/generateiv.h>
 #include <tools/vectortostring.h>
 #include <tools/string.h>
 
@@ -18,7 +16,7 @@
 
 int main(int argc, char* argv[]) {
     std::cout << "=========================== PI Authenticator ===========================\n"
-        "= Last Updated:      2024-06-10                                        =\n"
+        "= Last Updated:      2024-06-17                                        =\n"
         "= License:           MIT                                               =\n"
         "= GitHub Repository: github.com/pi-314159/Authenticator                =\n"
         "========================================================================\n\n" << std::endl;
@@ -106,7 +104,7 @@ int main(int argc, char* argv[]) {
                                 tOTPInstance.period = std::stoul(lineElement);
                                 break;
                             case 3:
-                                tOTPInstance.alg = lineElement[0];
+                                tOTPInstance.alg = lineElement;
                                 break;
                             case 4:
                                 tOTPInstance.digits = std::stoi(lineElement);
@@ -140,7 +138,7 @@ int main(int argc, char* argv[]) {
     while (action[0] != 'q') {
         STARTLOOP:
         if (action[0] == 'g') {
-            std::cout << "OTP: " << ACTIONS::GenerateTOTP(tOTPObjects[selectedOTPIndex]) << "\n" << std::endl;
+            std::cout << "OTP: " << ACTIONS::GenerateTotp(tOTPObjects[selectedOTPIndex]) << "\n" << std::endl;
         }
         else if (action[0] == 'l') {
             if (tOTPObjectsSize > 0) {
@@ -159,15 +157,9 @@ int main(int argc, char* argv[]) {
             if (tOTPObjectsSize > 1) {
                 tOTPObjects.erase(tOTPObjects.begin() + selectedOTPIndex);
                 action[0] = 'l';
-                unsigned char* iV = new unsigned char[16];
-                TOOLS::GenerateIV(iV);
                 auto toWrite = std::make_unique<std::string>("OK" + TOOLS::VectorToString(tOTPObjects));
-                auto encryptedContents = std::make_unique_for_overwrite<std::string>();
-                unsigned long long int encryptedContentsSize = 0;
-                crypto->Aes(key, iV, *toWrite, *encryptedContents, encryptedContentsSize);
-                fileIo->WriteBinary(*encryptedContents, iV);
-                encryptedContents.reset(); toWrite.reset();
-                delete[] iV;
+                fileIo->WriteBinary(*toWrite, key);
+                toWrite.reset();
             }
             else {
                 tOTPObjects.clear();
@@ -181,15 +173,9 @@ int main(int argc, char* argv[]) {
             ACTIONS::Add(tOTPObjects);
             action[0] = 'l';
             ++tOTPObjectsSize;
-            unsigned char* iV = new unsigned char[16];
-            TOOLS::GenerateIV(iV);
             auto toWrite = std::make_unique<std::string>("OK" + TOOLS::VectorToString(tOTPObjects));
-            auto encryptedContents = std::make_unique_for_overwrite<std::string>();
-            unsigned long long int encryptedContentsSize = 0;
-            crypto->Aes(key, iV, *toWrite, *encryptedContents, encryptedContentsSize);
-            fileIo->WriteBinary(*encryptedContents, iV);
-            encryptedContents.reset(); toWrite.reset();
-            delete[] iV;
+            fileIo->WriteBinary(*toWrite, key);
+            toWrite.reset();
             std::cout << "Added.\n" << std::endl;
             goto STARTLOOP;
         }

diff --git a/src/actions/add.cpp b/src/actions/add.cpp
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #include <actions/add.h>
 #include <tools/string.h>
@@ -12,14 +11,14 @@ namespace ACTIONS {
     void Add(std::vector<tOTP_object>& tOTPObjects) {
         auto str = std::make_unique_for_overwrite<TOOLS::String>();
         std::string inputBuffer, tag, secret;
-        char alg = '1';
+        std::string alg = "sha1";
         unsigned int period;
         unsigned short digits;
         while (inputBuffer.empty()) {
             str->Input(inputBuffer, "Please enter the issuer (e.g., GitHub), then hit Enter TWICE to proceed:", true);
             str->FormatInput(inputBuffer, inputBuffer);
         }
-        tag = inputBuffer + "::";
+        tag = inputBuffer + ":";
         inputBuffer = "";
         while (inputBuffer.empty()) {
             str->Input(inputBuffer, "Please enter the account (e.g., [email protected]), \nthen hit Enter TWICE to proceed:", true);
@@ -44,11 +43,11 @@ namespace ACTIONS {
         }
         str->Input(inputBuffer, "Please select the hash algorithm:\n[1] SHA-1\n[2] SHA-256\n[3] SHA-384\n[5] SHA-512\nEnter your choice (default 1):");
         if (inputBuffer == "2") {
-            alg = '2';
+            alg = "sha256";
         } else if (inputBuffer == "3") {
-            alg = '3';
+            alg = "sha384";
         } else if (inputBuffer == "5") {
-            alg = '5';
+            alg = "sha512";
         }
         str->Input(inputBuffer, "Please enter the digits (between 6 - 10, default 6):");
         if (str->FormatInput(inputBuffer, digits, '2')) {

diff --git a/src/actions/generatetotp.cpp b/src/actions/generatetotp.cpp
@@ -1,17 +1,15 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #include <actions/generatetotp.h>
-
 #include <tools/base32decode.h>
 #include <tools/crypto.h>
 
 #include <chrono>
 #include <cmath>
 
 namespace ACTIONS {
-    std::string GenerateTOTP(tOTP_object& tOTP) {
+    std::string GenerateTotp(tOTP_object& tOTP) {
         auto secretSize = static_cast<int>(floor(tOTP.secret.size() / 1.6));
         unsigned char* decodedSecret = new unsigned char[secretSize];
         TOOLS::Base32Decode(tOTP.secret, decodedSecret);

diff --git a/src/include/actions/add.h b/src/include/actions/add.h
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef ACTIONS__ADD_H_
 #define ACTIONS__ADD_H_

diff --git a/src/include/actions/generatetotp.h b/src/include/actions/generatetotp.h
@@ -1,14 +1,13 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef ACTIONS__GENERATETOTP_H_
 #define ACTIONS__GENERATETOTP_H_
 
 #include <totp.h>
 
 namespace ACTIONS {
-    std::string GenerateTOTP(tOTP_object& tOTP);
+    std::string GenerateTotp(tOTP_object& tOTP);
 }
 
 #endif
diff --git a/src/include/tools/base32decode.h b/src/include/tools/base32decode.h
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef TOOLS__BASE32DECODE_H_
 #define TOOLS__BASE32DECODE_H_

diff --git a/src/include/tools/crypto.h b/src/include/tools/crypto.h
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef TOOLS__CRYPTO_H_
 #define TOOLS__CRYPTO_H_
@@ -10,7 +9,7 @@
 namespace TOOLS {
     class Crypto {
     public:
-        void CalculateHmac(char hashAlg, unsigned char* key, int& keySize, unsigned long long int msg, unsigned char* result, unsigned int* resultSize);
+        void CalculateHmac(std::string hashAlg, unsigned char* key, int& keySize, unsigned long long int msg, unsigned char* result, unsigned int* resultSize);
         void Aes(unsigned char* key, unsigned char* iv, std::string& input, std::string& output, unsigned long long int& outputSize, bool encrypt = true, unsigned short int bufferSize = 1024);
     };
 }

diff --git a/src/include/tools/file_io.h b/src/include/tools/file_io.h
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef TOOLS__FILE_IO_H_
 #define TOOLS__FILE_IO_H_
@@ -15,7 +14,7 @@ namespace TOOLS {
     public:
         File_Io(std::unique_ptr<std::string>& s);
         bool ReadBinary(std::string& binaryFileContent);
-        bool WriteBinary(std::string& binaryFileContent, unsigned char* iV, unsigned int iVSize = 16);
+        bool WriteBinary(std::string& binaryFileContent, unsigned char key[], unsigned int iVSize = 16);
         bool DeleteFile();
     };
 }

diff --git a/src/include/tools/generateiv.h b/src/include/tools/generateiv.h
@@ -1,12 +1,11 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef TOOLS__GENERATEIV_H_
 #define TOOLS__GENERATEIV_H_
 
 namespace TOOLS {
-    void GenerateIV(unsigned char* iV, unsigned int iVSize = 16);
+    void GenerateIv(unsigned char* iV, unsigned int iVSize = 16);
 }
 
 #endif
diff --git a/src/include/tools/string.h b/src/include/tools/string.h
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef TOOLS__STRING_H_
 #define TOOLS__STRING_H_

diff --git a/src/include/tools/vectortostring.h b/src/include/tools/vectortostring.h
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef TOOLS__VECTORTOSTRING_H_
 #define TOOLS__VECTORTOSTRING_H_

diff --git a/src/include/totp.h b/src/include/totp.h
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #ifndef TOTP_H_
 #define TOTP_H_
@@ -12,7 +11,7 @@ struct tOTP_object {
     std::string tag;
     std::string secret;
     unsigned int period;
-    char alg;
+    std::string alg;
     unsigned short digits;
 };
 

diff --git a/src/tools/base32decode.cpp b/src/tools/base32decode.cpp
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #include <tools/base32decode.h>
 

diff --git a/src/tools/crypto.cpp b/src/tools/crypto.cpp
@@ -1,6 +1,5 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
 #include <tools/crypto.h>
 
@@ -10,18 +9,15 @@
 #include <ranges>
 
 namespace TOOLS {
-    void Crypto::CalculateHmac(char hashAlg, unsigned char* key, int& keySize, unsigned long long int msg, unsigned char* result, unsigned int* resultSize) {
+    void Crypto::CalculateHmac(std::string hashAlg, unsigned char* key, int& keySize, unsigned long long int msg, unsigned char* result, unsigned int* resultSize) {
         auto hashAlgorithm = EVP_sha1();
-        switch (hashAlg) {
-        case '2':
+        if (hashAlg == "sha256") {
             hashAlgorithm = EVP_sha256();
-            break;
-        case '3':
+        } else if (hashAlg == "sha384") {
             hashAlgorithm = EVP_sha384();
-            break;
-        case '5':
+        }
+        else if (hashAlg == "sha512") {
             hashAlgorithm = EVP_sha512();
-            break;
         }
 
         unsigned char message[8] = {'0'};

diff --git a/src/tools/file_io.cpp b/src/tools/file_io.cpp
@@ -1,8 +1,9 @@
 // Author:       pi-314159@GitHub
 // License:      MIT
-// Last updated: 2024-06-10
 
+#include <tools/crypto.h>
 #include <tools/file_io.h>
+#include <tools/generateiv.h>
 
 #include <filesystem>
 #include <fstream>
@@ -19,22 +20,23 @@ namespace TOOLS {
         return true;
     }
 
-    bool File_Io::WriteBinary(std::string& binaryFileContent, unsigned char* iV, unsigned int iVSize) {
+    bool File_Io::WriteBinary(std::string& binaryFileContent, unsigned char key[], unsigned int iVSize) {
+        unsigned char* iV = new unsigned char[16];
+        GenerateIv(iV);
+        std::string encryptedContents;
+        unsigned long long int encryptedContentsSize = 0;
+        auto crypto = std::make_unique_for_overwrite<TOOLS::Crypto>();
+        crypto->Aes(key, iV, binaryFileContent, encryptedContents, encryptedContentsSize);
+        crypto.reset();
         std::ofstream writeBinaryFileHandle(filePath, std::ios::binary);
         writeBinaryFileHandle.write((char*)iV, iVSize);
-        writeBinaryFileHandle.write(binaryFileContent.c_str(), binaryFileContent.size());
+        writeBinaryFileHandle.write(encryptedContents.c_str(), encryptedContentsSize);
         writeBinaryFileHandle.close();
+        delete[] iV;
         return true;
     }
 
     bool File_Io::DeleteFile() {
-        bool ret = true;
-        try {
-            std::filesystem::remove(filePath);
-        }
-        catch (...) {
-            ret = false;
-        }
-        return ret;
+        return std::filesystem::remove(filePath);
     }
 }