Minor changes for code clean-up

Author: behzadmehmood

libs/libdecrypt/src/decryption.cpp

@@ -103,7 +103,7 @@ EVP_PKEY *Decryption::loadPrivateKey(const std::string& privateKeyString) {
 /**
  * @brief 
  * 
- * @param encoded he base64-encoded input string.
+ * @param encoded The base64-encoded input string.
  * @return std::vector<unsigned char> The decoded dynamic array of characters.
  */
 std::vector<unsigned char> Decryption::base64Decode(const std::string& encoded) {

libs/libencrypt/CMakeLists.txt

@@ -4,6 +4,9 @@ project(libencrypt)
 find_package(PkgConfig REQUIRED)
 pkg_search_module(OPENSSL REQUIRED openssl)
 
+set(SESSION_KEY_SIZE 16)
+add_definitions(-DSESSION_KEY_SIZE=${SESSION_KEY_SIZE})
+
 if(OPENSSL_FOUND)
     include_directories(${OPENSSL_INCLUDE_DIRS})
     message(STATUS "Using OpenSSL ${OPENSSL_VERSION}")

libs/libencrypt/src/encryption.cpp

@@ -1,5 +1,11 @@
 #include "encryption.h"
 
+#ifdef SESSION_KEY_SIZE
+unsigned sessionKeySize = SESSION_KEY_SIZE;
+#else
+unsigned sessionKeySize = 16;
+#endif
+
 /**
  * @brief Generates random session key
  * 
@@ -183,7 +189,7 @@ bool Encryption::encryptFile(const std::string& publicKeyFile, std::string& file
 
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
-    unsigned char sessionKey[16];
+    unsigned char sessionKey[sessionKeySize];
     generateSessionKey(sessionKey, sizeof(sessionKey));
 
     //load public key
@@ -214,7 +220,7 @@ bool Encryption::encryptFile(const std::string& publicKeyFile, std::string& file
     unsigned char iv[EVP_MAX_IV_LENGTH];
     if (RAND_bytes(iv, sizeof(iv)) != 1) {
         std::cerr << "Error generating IV." << std::endl;
-        return -1;
+        return false;
     }
 
     // Encrypt file contents

libs/libpugiutil/src/pugixml_loc.cpp

@@ -47,9 +47,6 @@ void loc_data::build_loc_data() {
 }
 
 void loc_data::build_loc_data_from_string(char* filename_val, size_t buffersize) {
-    //std::ptrdiff_t offset = 0;
-    //char buffer[1024];
-    //std::size_t size;
     for (std::size_t i = 0; i < buffersize; ++i) {
         if (filename_val[i] == '\0')
             break;