Makefile

@@ -59,7 +59,7 @@ TEST_LOGGER=./src/logger/lib/test/main.c
 LIBS_LOGGER=$(LIB_CORE)
 LIB_LOGGER=-l$(PROJECT_NAME)-logger
 
-LIBS_LIB_CHAT=$(LIB_CORE) -lpthread -lgmp
+LIBS_LIB_CHAT=$(LIB_CORE) -lpthread
 LIB_CHAT=-l$(PROJECT_NAME)-chat
 LIB_CHAT_CONFIG=$(LIB_CHAT)-config
 LIBS_CHAT=$(LIB_CHAT) $(LIBS_LIB_CHAT) $(LIB_CHAT_CONFIG)

configure.sh

@@ -25,13 +25,13 @@ if [[ $(id -u) != "0" ]] && [[ $1 != "force" ]]; then
 fi
 
 COMMON="gcc make tmux curl"
-ARCH_GENTOO_COMMON="$COMMON json-c libgit2 gmp"
+ARCH_GENTOO_COMMON="$COMMON json-c libgit2"
 
 # Get COMMAND
 if [[ $DISTRO == "Arch" ]]; then
     COMMAND="pacman -S --needed --noconfirm $ARCH_GENTOO_COMMON"
 elif [[ $DISTRO == "Ubuntu" ]] || [[ $DISTRO == "Debian" ]]; then
-    COMMAND="apt install -y $COMMON libjson-c-dev libcurl4-nss-dev libgit2-dev libgmp-dev"
+    COMMAND="apt install -y $COMMON libjson-c-dev libcurl4-nss-dev libgit2-dev"
 elif [[ $DISTRO == "Gentoo" ]]; then
     COMMAND="emerge -vn $ARCH_GENTOO_COMMON"
 
@@ -41,18 +41,9 @@ elif [[ $DISTRO == "Gentoo" ]]; then
     echo "LDPATH=/usr/lib/libwhy2-chat.so" > /etc/env.d/99why2-chat
     echo "LDPATH=/usr/lib/libwhy2-chat-config.so" > /etc/env.d/99why2-chat-config
     env-update && source /etc/profile
-else # 'Unsupported' distro
+else
-    IFS=' ' read -r -a dependency_array <<< "$ARCH_GENTOO_COMMON" # Split into dependency_array
+    # 'Unsupported' distro
-
+    echo "It seems you are using unsupported distribution... Don't worry, just install 'gcc', 'json-c', 'curl', 'libgit2', 'tmux' and 'make' and you'll be fine."
-    echo -e "It seems you are using unsupported distribution...\nDon't worry, just install these dependencies:\n"
-
-    for dependency in "${dependency_array[@]}" # Iter
-    do
-        echo "$dependency"
-    done
-
-    echo -e "\nand you'll be fine."
-
     exit
 fi
 

include/chat/config.h

@@ -23,20 +23,17 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 extern "C" {
 #endif
 
-#include <why2/flags.h> //damn i really hate including headers in headers
-
 //CONFIG MACROS
+#define WHY2_CONFIG_DIR "/home/{USER}/.config"
+#define WHY2_CHAT_CONFIG_DIR WHY2_CONFIG_DIR "/WHY2"
 #define WHY2_CHAT_CONFIG_URL "https://raw.githubusercontent.com/ENGO150/WHY2/development/src/chat/config/"
 #define WHY2_CHAT_CONFIG_SERVER "server.toml"
 #define WHY2_CHAT_CONFIG_CLIENT "client.toml"
-#define WHY2_CHAT_CONFIG_SERVER_USERS "server_users.toml" //LOGIN INFO CONFIG
 
 void why2_chat_init_server_config(void); //CHECK IF SERVER CONFIG EXISTS, CREATE IT
 void why2_chat_init_client_config(void); //Dementia is a term used to describe a group of symptoms affecting memory, thinking and social abilities. In people who have dementia, the symptoms interfere with their daily lives. Dementia isn't one specific disease. Several diseases can cause dementia. ...
 
 char *why2_toml_read(const char* path, const char* key); //READ key FROM path TOML FILE
-void why2_toml_write(const char *path, const char *key, const char *value); //WRITE value AS key INTO path TOML FILE
-why2_bool why2_toml_contains(const char *path, const char *key); //CHECK IF path CONTAINS key
 void why2_toml_read_free(char* s); //DEALLOCATE THE READ VALUE
 
 char *why2_chat_server_config(char *key); //why2_toml_read BUT YOU DO NOT HAVE TO INCLUDE path

include/chat/crypto.h

@@ -1,51 +0,0 @@
-/*
-This is part of WHY2
-Copyright (C) 2022 Václav Šmejkal
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#ifndef WHY2_CHAT_CRYPTO_H
-#define WHY2_CHAT_CRYPTO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <why2/chat/config.h>
-
-//MACROS
-#define WHY2_CHAT_KEY_BITS 4096 //BITS..
-#define WHY2_CHAT_PRIME_ITERS 100 //NUMBER OF ITERATIONS WHEN CHECKING PRIME NUMBER
-#define WHY2_CHAT_RSA_EXPONENT "H33" //DEFAULT e IN BASE WHY2_CHAT_KEY_BASE
-
-#define WHY2_CHAT_KEY_LOCATION WHY2_CONFIG_DIR "/keys" //KEYS LOCATION
-#define WHY2_CHAT_PUB_KEY "pub"
-#define WHY2_CHAT_PRI_KEY "pri"
-#define WHY2_CHAT_KEY_BASE 62 //BASE IN THE GENERATED KEYS ARE STORED IN WHY2_CHAT_KEY_LOCATION
-
-void why2_chat_init_keys(void); //INIT (POSSIBLY GENERATE) RSA KEYS
-void why2_chat_deallocate_keys(void); //DEALLOCATE :) (NO SLUR HERE)
-
-char *why2_get_chat_modulus(void); //GET THE RSA MODULUS
-char *why2_get_chat_d(void); //GET THE RSA d
-
-char *why2_chat_rsa_pub_encrypt(char *to_encrypt); //RSA ENCRYPT USING PUBLIC KEY
-char *why2_chat_rsa_pri_decrypt(char *to_decrypt); //RSA DECRYPT USING PRIVATE KEY
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

include/chat/flags.h

@@ -32,35 +32,16 @@ extern "C" {
 
 #define WHY2_INVALID_POINTER (void*) 0xffffffffffffffff
 
-//(SERVER -> CLIENT) CODES
+//CODES
-#define WHY2_CHAT_CODE_ACCEPT_MESSAGES "code_000" //TELL CLIENT THEY CAN SEND MESSAGES
+#define WHY2_CHAT_CODE_ACCEPT_MESSAGES "code_000"
-#define WHY2_CHAT_CODE_PICK_USERNAME "code_001" //TELL CLIENT TO PICK USERNAME
+#define WHY2_CHAT_CODE_PICK_USERNAME "code_001"
-#define WHY2_CHAT_CODE_SERVER_SIDE_QUIT_COMMUNICATION "code_002" //TELL CLIENT TO END COMMUNICATION (just so they don't get segfault on server-side disconnect)
+#define WHY2_CHAT_CODE_SERVER_SIDE_QUIT_COMMUNICATION "code_002"
-#define WHY2_CHAT_CODE_INVALID_USERNAME "code_003" //haha
+#define WHY2_CHAT_CODE_INVALID_COMMAND "code_003"
-#define WHY2_CHAT_CODE_LIST_SERVER "code_004" //SAME AS WHY2_CHAT_CODE_LIST BUT BACK TO THE CLIENT
+#define WHY2_CHAT_CODE_INVALID_USERNAME "code_004"
-#define WHY2_CHAT_CODE_VERSION_SERVER "code_005" //SAME AS WHY2_CHAT_CODE_VERSION BUT BACK TO THE CLIENT
-#define WHY2_CHAT_CODE_PM_SERVER "code_006" //SAME AS WHY2_CHAT_CODE_PM BUT BACK TO THE CLIENT
-
-//(CLIENT -> SERVER) CODES
-#define WHY2_CHAT_CODE_EXIT "code_999" //TELL SERVER YOU ARE ENDING COMMUNICATION
-#define WHY2_CHAT_CODE_LIST "code_998" //TELL SERVER TO GIVE YOU ALL CONNECTED USERS
-#define WHY2_CHAT_CODE_PM "code_997" //TELL SERVER TO SEND MESSAGE ONLY TO SPECIFIC ID
-#define WHY2_CHAT_CODE_VERSION "code_996" //TELL SERVER TO GIVE YOU ITS VERSION
-
-//COMMANDS
-#define WHY2_CHAT_COMMAND_PREFIX "!" //the little thingy you write before the command names to make the program recognise them boy. You know? Like in minecraft you use /kill... Also, are you dumb?
-#define WHY2_CHAT_COMMAND_EXIT "exit" //QUIT THE PROGRAM CMD
-#define WHY2_CHAT_COMMAND_HELP "help" //PRINT ALL COMMANDS
-#define WHY2_CHAT_COMMAND_LIST "list" //LIST ALL CONNECTIONS
-#define WHY2_CHAT_COMMAND_PM "pm" //PRIVATE MESSAGES
-#define WHY2_CHAT_COMMAND_VERSION "version" //COMPARE CLIENT VERSION AND SERVER VERSION
 
 //SHORTCUTS CAUSE I'M LAZY BITCH
 #define WHY2_CHAT_CODE_SSQC WHY2_CHAT_CODE_SERVER_SIDE_QUIT_COMMUNICATION
 
-char *why2_chat_client_get_server_exit_cmd(); //GETTER AND SETTER FOR !exit FROM SERVER
-void why2_chat_client_set_server_exit_cmd(char *cmd);
-
 #ifdef __cplusplus
 }
 #endif

include/chat/misc.h

@@ -32,7 +32,6 @@ void why2_clean_connections(void); //CLOSE EVERY CONNECTION
 void why2_clean_threads(void); //CLOSE EVERY RUNNING MESSAGE THREAD
 void *why2_listen_server(void *socket); //LISTEN FOR OTHER's USERS MESSAGES
 void *why2_getline_thread(WHY2_UNUSED void* arg); //START getline IN SEPARATE THREAD
-void why2_trim_string(char **s); //REMOVES SPACES FROM END AND START OF *s
 
 #ifdef __cplusplus
 }

include/decrypter.h

@@ -25,7 +25,7 @@ extern "C" {
 
 #include <why2/flags.h>
 
-why2_output_flags why2_decrypt_text(char *text, char *key_new); //TEXT from WILL BE DECRYPTED WITH KEY AND RETURNED
+why2_output_flags why2_decrypt_text(char *text, char *keyNew); //TEXT from WILL BE DECRYPTED WITH KEY AND RETURNED
 
 #ifdef __cplusplus
 }

include/encrypter.h

@@ -25,7 +25,7 @@ extern "C" {
 
 #include <why2/flags.h>
 
-why2_output_flags why2_encrypt_text(char *text, char *key_new); //TEXT from WILL BE ENCRYPTED WITH KEY AND RETURNED
+why2_output_flags why2_encrypt_text(char *text, char *keyNew); //TEXT from WILL BE ENCRYPTED WITH KEY AND RETURNED
 
 #ifdef __cplusplus
 }

include/flags.h

@@ -37,21 +37,14 @@ enum WHY2_EXIT_CODES //exit codes you fucking idiot
 //THESE ARE 'HISTORIC' VERSION FOR GENERATING tkch, SO YOU CAN DECRYPT OLD TEXT
 enum WHY2_TEXT_KEY_CHAIN_VERSIONS
 {
-    WHY2_v1, //FIRST VERSION. Replaced on May 28th 17:45:26 2022 UTC in commit 0d64f4fa7c37f0b57914db902258e279a71c7f9a.
+    WHY2_v1, //FIRST VERSION. Replaced on May 28th 17:45:26 2022 UTC in commit 0d64f4fa7c37f0b57914db902258e279a71c7f9a. GOOD OLD TIMES. OR NOT. IT REMINDS ME OF HER. this shit hurts, man
     WHY2_v2, //SECOND VERSION. Replaced on July 11th 17:12:41 2022 UTC in commit 0f01cde0f1e1a9210f4eef7b949e6d247072d3a6.
     WHY2_v3 //THIRD VERSION. THE LATEST ONE
 };
 
-enum WHY2_OUTPUT_FORMAT
-{
-    WHY2_OUTPUT_TEXT,
-    WHY2_OUTPUT_BYTE
-};
-
 #define WHY2_VERSION "v5.0" //WHY2_VERSION OF CURRENT BUILD     > DO NOT TOUCH THIS <
 #define WHY2_VERSIONS_URL "https://raw.githubusercontent.com/ENGO150/WHY2/release/versions.json" //URL FOR GETTING versions.json
-#define WHY2_CONFIG_DIR "/home/{USER}/.config/WHY2"
+#define WHY2_VERSIONS_NAME "/tmp/why2-versions.json" //do I have to explain this?
-#define WHY2_VERSIONS_NAME WHY2_CONFIG_DIR "/.versions.json" //do I have to explain this?
 
 #define WHY2_UPDATE_URL "https://github.com/ENGO150/WHY2.git" // REPOSITORY URL FOR UPDATES (YOU DON'T SAY)
 #define WHY2_UPDATE_NAME "/tmp/why2-update" // fuck you
@@ -78,7 +71,6 @@ typedef struct
     why2_bool no_output; //BOOLEAN FOR NOT PRINTING OUTPUT WHEN ENCRYPTING/DECRYPTING
     why2_bool update; //BOOLEAN FOR UPDATING YOUR WHY WHY2_VERSION IF OLD IS USED
     enum WHY2_TEXT_KEY_CHAIN_VERSIONS version; //VERSION OF tkch
-    enum WHY2_OUTPUT_FORMAT format; //VERSION OF tkch
 } why2_input_flags;
 
 typedef struct

include/llist.h

@@ -43,7 +43,6 @@ void why2_list_push(why2_list_t *list, void *value, unsigned long size); //PUSH
 void why2_list_remove(why2_list_t *list, why2_node_t *node); //REMOVE ELEMENT
 void why2_list_remove_back(why2_list_t *list); //REMOVE LAST ELEMENT
 why2_node_t *why2_list_find(why2_list_t *list, void *value); //FIND ELEMENT IN LIST
-unsigned long why2_list_get_size(why2_list_t *list); //GET SIZE
 
 #ifdef __cplusplus
 }

include/memory.h

@@ -23,8 +23,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 extern "C" {
 #endif
 
-#include <why2/flags.h>
-
 void *why2_malloc(unsigned long size);
 void *why2_calloc(unsigned long element, unsigned long size);
 void *why2_realloc(void *pointer, unsigned long size);
@@ -39,8 +37,6 @@ void why2_deallocate(void *pointer);
 
 void why2_clean_memory(char *identifier); //identifier SPECIFIES WHICH NODES TO DEALLOCATE | THIS IS BASICALLY GARBAGE COLLECTOR | PASS why2_get_default_memory_identifier() FOR DEALLOCATING EVERYTHING
 
-why2_bool why2_allocated(void *pointer); //CHECKS IF pointer WAS ALLOCATED USING WHY2-MEM
-
 #ifdef __cplusplus
 }
 #endif

include/misc.h

@@ -30,7 +30,6 @@ extern "C" {
 void why2_generate_text_key_chain(char *key, int *text_key_chain, int text_key_chain_size); //GENERATES ARRAY FOR ENCRYPTION/DECRYPTION
 char *why2_generate_key(int key_length); //GENERATE ENCRYPTION KEY
 void why2_deallocate_output(why2_output_flags flags); //DEALLOCATES flags
-void why2_directory(void); //GENERATE WHY2_CONFIG_DIR
 enum WHY2_EXIT_CODES why2_check_version(void); //THIS FUNCTION CHECKS IF LATEST WHY2_VERSION OF WHY2 IS USED
 enum WHY2_EXIT_CODES why2_check_key(char *key); //CHECKS IF KEY IS VALID
 enum WHY2_EXIT_CODES why2_check_text(char *text); //CHECKS IF TEXT IS VALID
@@ -40,7 +39,6 @@ unsigned long why2_count_repeated_key_size(char *text, char *key); //COUNT repea
 unsigned long why2_compare_time_micro(struct timeval startTime, struct timeval finishTime); //COMPARE TIMES IN MICROSECONDS
 void why2_die(char *exit_message); //PRINTS exit_message ERROR AND EXITS WITH CODE 1
 char *why2_replace(char *string, char *old, char *new); //REPLACES old IN string WITH new
-unsigned short why2_byte_format_length(char *s); //GET LENGTH OF s OF WHY2_OUTPUT_BYTE FORMAT
 
 #ifdef __cplusplus
 }

include/why2.h

@@ -44,7 +44,6 @@ extern "C" {
 
 //CHAT
 #include <why2/chat/config.h>
-#include <why2/chat/crypto.h>
 #include <why2/chat/flags.h>
 #include <why2/chat/misc.h>
 

src/chat/config.c

@@ -39,18 +39,24 @@ enum CONFIG_TYPES
 
 void init_config(char *filename)
 {
+    struct stat st;
+    char *buffer = why2_replace(WHY2_CONFIG_DIR, "{USER}", getenv("USER"));
+
     //CREATE USER CONFIG FOLDER [THIS SHOULDN'T HAPPEN ON CLIENT, BUT IT'S NEEDED ON FRESH SERVERS]
-    why2_directory();
+    if (stat(buffer, &st) == -1)
+    {
+        mkdir(buffer, 0700);
+    }
 
     //GET THE CONFIG TYPE
-    char *buffer = why2_malloc(strlen(WHY2_CONFIG_DIR) + strlen(filename) + 2);
+    buffer = why2_realloc(buffer, strlen(WHY2_CHAT_CONFIG_DIR) + strlen(filename) + 2);
-    sprintf(buffer, "%s/%s", WHY2_CONFIG_DIR, filename);
+    sprintf(buffer, "%s/%s", WHY2_CHAT_CONFIG_DIR, filename);
 
     char *path = why2_replace(buffer, "{USER}", getenv("USER"));
 
     if (access(path, R_OK) != 0) //CONFIG DOESN'T EXIST
     {
-        char *config_dir = why2_replace(WHY2_CONFIG_DIR, "{USER}", getenv("USER"));
+        char *config_dir = why2_replace(WHY2_CHAT_CONFIG_DIR, "{USER}", getenv("USER"));
 
         //CREATE CONFIG DIRECTORY
         mkdir(config_dir, 0700);
@@ -69,13 +75,11 @@ void init_config(char *filename)
 
         //CLEANUP
         curl_easy_cleanup(curl);
+        why2_deallocate(buffer);
+        why2_deallocate(path);
         why2_deallocate(config_dir);
         why2_deallocate(file_buffer);
     }
-
-    //DEALLOCATION
-    why2_deallocate(path);
-    why2_deallocate(buffer);
 }
 
 char *config(char *key, enum CONFIG_TYPES type)
@@ -85,11 +89,11 @@ char *config(char *key, enum CONFIG_TYPES type)
     switch (type) //GET path
     {
         case CLIENT:
-            path = why2_replace(WHY2_CONFIG_DIR "/" WHY2_CHAT_CONFIG_CLIENT, "{USER}", getenv("USER"));
+            path = why2_replace(WHY2_CHAT_CONFIG_DIR "/" WHY2_CHAT_CONFIG_CLIENT, "{USER}", getenv("USER"));
             break;
 
         case SERVER:
-            path = why2_replace(WHY2_CONFIG_DIR "/" WHY2_CHAT_CONFIG_SERVER, "{USER}", getenv("USER"));
+            path = why2_replace(WHY2_CHAT_CONFIG_DIR "/" WHY2_CHAT_CONFIG_SERVER, "{USER}", getenv("USER"));
             break;
 
         default:
@@ -110,26 +114,6 @@ char *config(char *key, enum CONFIG_TYPES type)
 void why2_chat_init_server_config(void)
 {
     init_config(WHY2_CHAT_CONFIG_SERVER);
-
-    //CHECK FOR USER CONFIG
-    char *user_pick_username = why2_chat_server_config("user_pick_username");
-    char *config_path = why2_replace(WHY2_CONFIG_DIR "/" WHY2_CHAT_CONFIG_SERVER_USERS, "{USER}", getenv("USER"));
-
-    if (strcmp(user_pick_username, "true") == 0 && access(config_path, R_OK) != 0)
-    {
-        //CREATE THE CONFIG
-        FILE *config_file = why2_fopen(config_path, "w");
-
-        //WRITE SOMETHING POSITIVE TO THE CONFIG :) (i love you, ignore my aggressive ass)
-        fwrite("#haha no users registered, what a loser lol", 1, 43, config_file);
-
-        //CLEANUP
-        why2_deallocate(config_file);
-    }
-
-    //DEALLOCATION
-    why2_toml_read_free(user_pick_username);
-    why2_deallocate(config_path);
 }
 
 void why2_chat_init_client_config(void)

src/chat/config/Cargo.toml

@@ -24,4 +24,4 @@ name = "why2_chat_config"
 crate-type = ["cdylib"]
 
 [dependencies]
-toml = "*"
+toml = "0.8.8"

src/chat/config/server.toml

@@ -14,8 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-user_pick_username = true # User will be prompted for their username on connect or will end up with default_username
+user_pick_username = true # User will be prompted for his username on connect or will end up with default_username
-server_name = "WHY2 Server" # Name of the server
 server_username = "server" # Username server will use
 default_username = "anon" # If user_pick_username is set to false, this will be used as client username
 
@@ -24,5 +23,3 @@ communication_time = 300 # Seconds waiting for client message before stopping co
 max_username_length = 20 # Maximal username length
 min_username_length = 4 # Minimal username length
 max_username_tries = 3 # Times asking client for username (if client tries to use invalid username)
-
-max_message_length = 100 # Maximal message length

src/chat/config/src/lib.rs

@@ -18,13 +18,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use std::
 {
+    fs::read_to_string,
     os::raw::c_char,
 
-    fs::
-    {
-        read_to_string,
-        write,
-    },
     ffi::
     {
         CString,
@@ -32,12 +28,10 @@ use std::
     },
 };
 
-use toml::Value;
-
 #[no_mangle]
 pub extern "C" fn why2_toml_read(path: *const c_char, key: *const c_char) -> *mut c_char
 {
-    //CONVERT C STRINGS TO RUST STRINGS
+    //CONVERT C STRINGS TO
     let path_r = unsafe { CStr::from_ptr(path).to_string_lossy().into_owned() };
     let key_r = unsafe { CStr::from_ptr(key).to_string_lossy().into_owned() };
 
@@ -67,96 +61,6 @@ pub extern "C" fn why2_toml_read(path: *const c_char, key: *const c_char) -> *mu
     CString::new(value).unwrap().into_raw()
 }
 
-#[no_mangle]
-pub extern "C" fn why2_toml_write(path: *const c_char, key: *const c_char, value: *const c_char)
-{
-    //CONVERT C STRINGS TO RUST STRINGS
-    let path_r = unsafe { CStr::from_ptr(path).to_string_lossy().into_owned() };
-    let key_r = unsafe { CStr::from_ptr(key).to_string_lossy().into_owned() };
-    let value_r = unsafe { CStr::from_ptr(value).to_string_lossy().into_owned() };
-
-    //GET FILE CONTENT
-    let file_raw = match read_to_string(&path_r)
-    {
-        Ok(raw) => raw,
-        Err(e) =>
-        {
-            eprintln!("Could not read TOML config: {}\n{}", path_r, e);
-            return;
-        },
-    };
-
-    //PARSE FILE
-    let mut data: Value = match toml::from_str(&file_raw)
-    {
-        Ok(data) => data,
-        Err(e) =>
-        {
-            eprintln!("Could not parse TOML config: {}\n{}", path_r, e);
-            return;
-        },
-    };
-
-    //INSERT VALUE (OR UPDATE)
-    if let Some(table) = data.as_table_mut()
-    {
-        table.insert(key_r, Value::String(value_r));
-    } else
-    {
-        eprintln!("Failed to get TOML table from file: {}", path_r);
-        return;
-    }
-
-    //CONVERT NEW DATA TO STRING
-    let updated_data = match toml::to_string(&data)
-    {
-        Ok(data) => data,
-        Err(e) =>
-        {
-            eprintln!("Failed to convert TOML data to string: {}\n{}", path_r, e);
-            return;
-        },
-    };
-
-    //WRITE NEW DATA
-    if let Err(e) = write(&path_r, updated_data)
-    {
-        eprintln!("Could not write to TOML config: {}\n{}", path_r, e);
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn why2_toml_contains(path: *const c_char, key: *const c_char) -> bool
-{
-    //CONVERT C STRINGS TO RUST STRINGS
-    let path_r = unsafe { CStr::from_ptr(path).to_string_lossy().into_owned() };
-    let key_r = unsafe { CStr::from_ptr(key).to_string_lossy().into_owned() };
-
-    //GET FILE CONTENT
-    let file_raw = match read_to_string(&path_r)
-    {
-        Ok(raw) => raw,
-        Err(e) =>
-        {
-            eprintln!("Could not read TOML config: {}\n{}", path_r, e);
-            return false;
-        },
-    };
-
-    //PARSE FILE
-    let data: Value = match toml::from_str(&file_raw)
-    {
-        Ok(data) => data,
-        Err(e) =>
-        {
-            eprintln!("Could not parse TOML config: {}\n{}", path_r, e);
-            return false;
-        },
-    };
-
-    data.get(&key_r).is_some()
-}
-
 #[no_mangle]
 pub extern "C" fn why2_toml_read_free(s: *mut c_char) //BECAUSE THIS IS RUST MODULE I HAVE TO CREATE A DEALLOCATING FUNCTION
 {

src/chat/crypto.c

@@ -1,205 +0,0 @@
-/*
-This is part of WHY2
-Copyright (C) 2022 Václav Šmejkal
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <why2/chat/crypto.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/random.h>
-
-#include <why2/memory.h>
-#include <why2/misc.h>
-
-#include <gmp.h>
-
-//DO NOT TOUCH THESE PLS :3
-char *rsa_modulus = NULL; //THE RSA MODULUS
-char *rsa_d = NULL; //THE RSA d
-
-//LOCAL
-void generate_prime(mpz_t x)
-{
-    //RANDOM
-    gmp_randstate_t state;
-    gmp_randinit_default(state);
-    unsigned long random_buffer; //SEED
-
-    do
-    {
-        if (getrandom(&random_buffer, sizeof(unsigned long), GRND_NONBLOCK) == -1) why2_die("getrandom fn failed!");
-
-        //GENERATE RANDOM PRIME USING random_buffer SEED
-        gmp_randseed_ui(state, random_buffer);
-        mpz_urandomb(x, state, WHY2_CHAT_KEY_BITS);
-        mpz_nextprime(x, x);
-    } while (mpz_probab_prime_p(x, WHY2_CHAT_PRIME_ITERS) == 0); //CHECK FOR PRIME PROBABILITY
-
-    //DEALLOCATION
-    gmp_randclear(state);
-}
-
-void read_file(FILE *file, char **output)
-{
-    //VARIABLES
-    int buffer_size;
-    char *buffer;
-
-    //GET LENGTH
-    fseek(file, 0, SEEK_END);
-    buffer_size = ftell(file);
-    rewind(file);
-
-    //READ
-    buffer = why2_calloc(buffer_size + 1, sizeof(char));
-    if (fread(buffer, buffer_size, 1, file) != 1) why2_die("Reading keyfile failed!");
-    buffer[buffer_size] = '\0';
-
-    //ASSIGN OUTPUT
-    *output = buffer;
-}
-
-char *exp_mod(char *to_exp, char *exponent)
-{
-    //VARIABLES
-    char *output;
-    mpz_t m, c, n, e;
-    mpz_init(c);
-
-    //GET ALL STUFF
-    mpz_init_set_str(m, to_exp, 10);
-    mpz_init_set_str(n, why2_get_chat_modulus(), WHY2_CHAT_KEY_BASE);
-    mpz_init_set_str(e, exponent, WHY2_CHAT_KEY_BASE);
-
-    //ENCRYPT MESSAGE
-    mpz_powm(c, m, e, n);
-
-    output = why2_malloc(mpz_sizeinbase(c, 10) + 2); //ALLOCATE OUTPUT
-    mpz_get_str(output, 10, c); //GET OUTPUT
-
-    //DEALLOCATION
-    mpz_clears(m, c, n, e, NULL);
-
-    return output;
-}
-
-//GLOBAL
-void why2_chat_init_keys(void)
-{
-    //KEY FILES
-    FILE *public; //TECHNICALLY, PUBLIC KEY CONTAINS ONLY THE MODULUS AND PRIVATE CONTAINS ONLY THE d
-    FILE *private;
-
-    //GET PATH TO KEY DIR
-    char *path = why2_replace(WHY2_CHAT_KEY_LOCATION, "{USER}", getenv("USER"));
-
-    //ALLOCATE THE KEY PATHS
-    char *public_path = why2_malloc(strlen(path) + strlen(WHY2_CHAT_PUB_KEY) + 3);
-    char *private_path = why2_malloc(strlen(path) + strlen(WHY2_CHAT_PRI_KEY) + 3);
-
-    //GET THE ACTUAL KEY PATHS
-    sprintf(public_path, "%s/%s%c", path, WHY2_CHAT_PUB_KEY, '\0');
-    sprintf(private_path, "%s/%s%c", path, WHY2_CHAT_PRI_KEY, '\0');
-
-    //CHECK IF KEYS EXIST
-    if (access(path, R_OK) != 0)
-    {
-        mkdir(path, 0700);
-
-        //SOME USER OUTPUT
-        printf("You are probably running WHY2-Chat for the first time now.\nGenerating RSA keys...\n");
-
-        //VARIABLES
-        mpz_t p, q, e, d, n, phi_n, buffer_1, buffer_2;
-        mpz_inits(p, q, e, d, n, phi_n, buffer_1, buffer_2, NULL);
-
-        //GENERATE PRIMES
-        generate_prime(p);
-        generate_prime(q);
-
-        //SET e
-        mpz_set_str(e, WHY2_CHAT_RSA_EXPONENT, 10);
-
-        //GET n
-        mpz_mul(n, p, q);
-
-        //GET phi
-        mpz_sub_ui(buffer_1, p, 1);
-        mpz_sub_ui(buffer_2, q, 1);
-        mpz_mul(phi_n, buffer_1, buffer_2);
-
-        //COUNT d
-        mpz_invert(d, e, phi_n);
-
-        printf("Saving keys...\n");
-
-        //WRITE THE KEYS INTO KEY-FILES
-        public = why2_fopen(public_path, "w+");
-        private = why2_fopen(private_path, "w+");
-
-        mpz_out_str(public, WHY2_CHAT_KEY_BASE, n);
-        mpz_out_str(private, WHY2_CHAT_KEY_BASE, d);
-
-        //KEYGEN DEALLOCATION
-        mpz_clears(p, q, e, d, n, phi_n, buffer_1, buffer_2, NULL);
-    } else
-    {
-        //OPEN FILES
-        public = why2_fopen(public_path, "r");
-        private = why2_fopen(private_path, "r");
-
-        //READ THE KEYS
-        read_file(public, &rsa_modulus);
-        read_file(private, &rsa_d);
-    }
-
-    //DEALLOCATION
-    why2_deallocate(path);
-    why2_deallocate(public_path);
-    why2_deallocate(private_path);
-    why2_deallocate(public);
-    why2_deallocate(private);
-}
-
-void why2_chat_deallocate_keys(void)
-{
-    why2_deallocate(rsa_modulus);
-    why2_deallocate(rsa_d);
-}
-
-char *why2_get_chat_modulus(void)
-{
-    return rsa_modulus;
-}
-
-char *why2_get_chat_d(void)
-{
-    return rsa_d;
-}
-
-char *why2_chat_rsa_pub_encrypt(char *to_encrypt)
-{
-    return exp_mod(to_encrypt, WHY2_CHAT_RSA_EXPONENT);
-}
-
-char *why2_chat_rsa_pri_decrypt(char *to_decrypt)
-{
-    return exp_mod(to_decrypt, why2_get_chat_d());
-}

src/chat/main/client.c

@@ -19,7 +19,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <signal.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -27,87 +26,23 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <pthread.h>
 
 #include <why2/chat/config.h>
-#include <why2/chat/crypto.h>
 #include <why2/chat/flags.h>
 #include <why2/chat/misc.h>
 
-#include <why2/flags.h>
 #include <why2/memory.h>
 #include <why2/misc.h>
 
-why2_bool exited = 0; //USER ALREADY REQUESTED EXIT
-int listen_socket; //THE SERVER SOCKET
-
-void exit_client(WHY2_UNUSED int i) //guess what
-{
-    if (exited) return;
-    exited = 1;
-
-    why2_send_socket(WHY2_CHAT_CODE_EXIT, NULL, listen_socket);
-}
-
-why2_bool command(char *input, char *command, char **arg)
-{
-    why2_bool returning = 0;
-
-    //GET THE COMMANDS
-    char *full_cmd = why2_malloc(strlen(WHY2_CHAT_COMMAND_PREFIX) + strlen(WHY2_CHAT_COMMAND_EXIT) + 2);
-    sprintf(full_cmd, WHY2_CHAT_COMMAND_PREFIX "%s", command);
-
-    //CLEAR arg
-    why2_deallocate(*arg); //DEALLOCATION (why2_deallocate fn checks for NULL, don't you worry)
-    *arg = NULL;
-
-    if (strncmp(input, full_cmd, strlen(full_cmd)) == 0) //COMMAND WAS EXECUTED
-    {
-        if (strlen(full_cmd) == strlen(input) - 1) //COMMAND DOESN'T HAVE ARGS
-        {
-            returning = 1;
-        } else if (strlen(input) - 2 > strlen(full_cmd) && input[strlen(full_cmd)] == ' ') //COMMAND CONTAINS ARGS
-        {
-            returning = 1;
-
-            //GET THE ARGS
-            *arg = why2_malloc(strlen(input) - strlen(full_cmd) - 1); //ALLOCATE
-            for (unsigned long i = strlen(full_cmd) + 1; i < strlen(input) - 1; i++)
-            {
-                (*arg)[i - (strlen(full_cmd) + 1)] = input[i];
-            }
-
-            (*arg)[strlen(input) - strlen(full_cmd) - 2] = '\0'; //NULL TERM
-
-            why2_trim_string(arg);
-        }
-    }
-
-    //DEALLOCATE BUFFERS
-    why2_deallocate(full_cmd);
-
-    return returning;
-}
-
-void invalid(char *type)
-{
-    printf("\nInvalid %s! Use \"" WHY2_CHAT_COMMAND_PREFIX WHY2_CHAT_COMMAND_HELP "\" for list of commands.\n\n>>> ", type);
-    fflush(stdout);
-}
-
 int main(void)
 {
-    signal(SIGINT, exit_client); //HANDLE ^C
+    why2_chat_init_client_config();
 
-    why2_check_version(); //CHECK FOR UPDATES
+    int listen_socket = socket(AF_INET, SOCK_STREAM, 0); //CREATE SERVER SOCKET
-    why2_chat_init_client_config(); //CREATE client.toml CONFIGURATION
-    why2_chat_init_keys(); //CREATE RSA KEYS
-
-    listen_socket = socket(AF_INET, SOCK_STREAM, 0); //CREATE SERVER SOCKET
     char *line = NULL;
     void *return_line = NULL;
     size_t line_length = 0;
     pthread_t thread_buffer;
     pthread_t thread_getline;
     why2_bool ssqc = 0;
-    char *cmd_arg = NULL;
 
     //DEFINE SERVER ADDRESS
     struct sockaddr_in server_addr;
@@ -166,115 +101,29 @@ int main(void)
         }
 
         line = (char*) return_line;
-        why2_trim_string(&line);
-
-        if (line == NULL) line = strdup("");
 
         printf(WHY2_CLEAR_AND_GO_UP);
 
         //TODO: Remove accents
 
-        if (strncmp(line, WHY2_CHAT_COMMAND_PREFIX, strlen(WHY2_CHAT_COMMAND_PREFIX)) == 0) //OPTIMIZE COMMANDS
+        why2_send_socket(line, NULL, listen_socket); //NULL IS SENT BECAUSE IT IS USELESS TO SEND USER FROM CLIENT - SERVER WON'T USE IT
+
+        if (strcmp(line, "!exit\n") == 0) //USER REQUESTED PROGRAM EXIT
         {
-            //COMMANDS
+            printf("Exiting...\n");
-            if (command(line, WHY2_CHAT_COMMAND_EXIT, &cmd_arg)) //USER REQUESTED PROGRAM EXIT
+            break;
-            {
-                printf("Exiting...\n");
-                exit_client(0);
-            } else if (command(line, WHY2_CHAT_COMMAND_HELP, &cmd_arg)) //HELP CMD
-            {
-                printf
-                (
-                    "\nCommands:\n---------\n%s\n\n>>> ",
-
-                    WHY2_CHAT_COMMAND_PREFIX WHY2_CHAT_COMMAND_HELP "\t\tPrints out all the commands. :)\n"
-                    WHY2_CHAT_COMMAND_PREFIX WHY2_CHAT_COMMAND_PM " <ID> <MSG>\tSends private message to user.\n"
-                    WHY2_CHAT_COMMAND_PREFIX WHY2_CHAT_COMMAND_LIST "\t\tLists all users and their IDs.\n"
-                    WHY2_CHAT_COMMAND_PREFIX WHY2_CHAT_COMMAND_VERSION "\tCheck server version.\n"
-                    WHY2_CHAT_COMMAND_PREFIX WHY2_CHAT_COMMAND_EXIT "\t\tExits the program."
-                );
-
-                fflush(stdout);
-            } else if (command(line, WHY2_CHAT_COMMAND_PM, &cmd_arg))
-            {
-                char *id; //PM RECEIVER
-                WHY2_UNUSED char *msg; //something racial
-
-                //CHECK ARGS VALIDITY
-                why2_bool valid_param = cmd_arg != NULL && strlen(cmd_arg) >= 3;
-                if (valid_param)
-                {
-                    valid_param = 0;
-                    for (unsigned long i = 1; i < strlen(cmd_arg); i++)
-                    {
-                        if (cmd_arg[i] == ' ')
-                        {
-                            valid_param = 1;
-
-                            //EXTRACT FIRST ARG (ID)
-                            id = why2_malloc(i + 1);
-                            for (unsigned long j = 0; j < i; j++)
-                            {
-                                id[j] = cmd_arg[j];
-                            }
-                            id[i] = '\0';
-
-                            if (atoi(id) <= 0) //INVALID ID PASSED
-                            {
-                                valid_param = 0;
-                                why2_deallocate(id);
-                                break;
-                            }
-
-                            //EXTRACT MESSAGE
-                            msg = cmd_arg + i + 1;
-                            break;
-                        }
-                    }
-                }
-
-                if (!valid_param) //INVALID ARGS
-                {
-                    invalid("usage");
-                    continue;
-                }
-
-                //BUILD MESSAGE TO SEND TO SERVER
-                char *final_message = why2_malloc(strlen(WHY2_CHAT_CODE_PM) + strlen(id) + strlen(msg) + 3);
-                sprintf(final_message, WHY2_CHAT_CODE_PM ";%s;%s%c", id, msg, '\0');
-
-                why2_send_socket(final_message, NULL, listen_socket); //SEND
-
-                //DEALLOCATION
-                why2_deallocate(id);
-                why2_deallocate(final_message);
-            } else if (command(line, WHY2_CHAT_COMMAND_LIST, &cmd_arg)) //LIST CMD
-            {
-                why2_send_socket(WHY2_CHAT_CODE_LIST, NULL, listen_socket);
-            } else if (command(line, WHY2_CHAT_COMMAND_VERSION, &cmd_arg)) //VERSION CMD
-            {
-                why2_send_socket(WHY2_CHAT_CODE_VERSION, NULL, listen_socket);
-            } else
-            {
-                invalid("command");
-            }
-        } else
-        {
-            why2_send_socket(line, NULL, listen_socket); //NULL IS SENT BECAUSE IT IS USELESS TO SEND USER FROM CLIENT - SERVER WON'T USE IT
-            free(line);
         }
+
+        free(return_line);
     }
 
     //DEALLOCATION
     if (!ssqc)
     {
         pthread_cancel(thread_buffer);
-        free(line);
+        free(return_line);
     }
 
-    why2_deallocate(cmd_arg);
-    why2_chat_deallocate_keys(); //DEALLOCATE GETTERS FOR KEYS
-
     why2_clean_memory(""); //RUN GARBAGE COLLECTOR
 
     return 0;

src/chat/main/server.c

@@ -34,8 +34,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 int main(void)
 {
-    why2_check_version(); //CHECK FOR UPDATES
+    why2_chat_init_server_config();
-    why2_chat_init_server_config(); //CREATE server.toml CONFIGURATION
 
     int listen_socket = socket(AF_INET, SOCK_STREAM, 0); //CREATE SERVER SOCKET
     pthread_t thread;
@@ -64,7 +63,7 @@ int main(void)
     {
         if (getline(&line_buffer, &line_length_buffer, stdin) == -1) why2_die("Reading input failed.");
 
-        if (strcmp(line_buffer, WHY2_CHAT_COMMAND_PREFIX WHY2_CHAT_COMMAND_EXIT "\n") == 0) //USER REQUESTED PROGRAM EXIT
+        if (strcmp(line_buffer, "!exit\n") == 0) //USER REQUESTED PROGRAM EXIT
         {
             printf("Exiting...\n");
             break;

src/chat/misc.c

@@ -23,7 +23,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <string.h>
 #include <ctype.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <unistd.h>
 
 #include <pthread.h>
@@ -45,7 +44,6 @@ typedef struct _connection_node
     int connection;
     pthread_t thread;
     char *username;
-    unsigned long id;
 } connection_node_t; //SINGLE LINKED LIST
 
 why2_list_t connection_list = WHY2_LIST_EMPTY;
@@ -63,6 +61,8 @@ char *get_string_from_json_string(char *json, char *string)
 {
     struct json_object *json_obj = json_tokener_parse(json);
 
+    if (json_obj == NULL) return NULL; //INVALID SYNTAX WAS SENT BY SOME FUCKING SCRIPT KIDDIE
+
     char *returning = why2_strdup(get_string_from_json(json_obj, string));
 
     //DEALLOCATION
@@ -105,6 +105,8 @@ void send_to_all(char *json)
     char *message = get_string_from_json(json_obj, "message");
     char *username = get_string_from_json(json_obj, "username");
 
+    if (json_obj == NULL) return; //EXIT IF INVALID SYNTAX WAS SENT
+
     while (node_buffer -> next != NULL) //SEND TO ALL CONNECTIONS
     {
         node_buffer = node_buffer -> next;
@@ -140,23 +142,6 @@ void add_brackets(char **json)
     *json = output;
 }
 
-why2_bool is_ascii(char c)
-{
-    return 33 <= c && c <= 126;
-}
-
-void remove_non_ascii(char **text)
-{
-    //REMOVE NON ASCII CHARS
-    int j = 0;
-    for (int i = 0; (*text)[i] != '\0'; i++)
-    {
-        if (is_ascii((*text)[i])) (*text)[i] = (*text)[j++] = (*text)[i];
-    }
-
-    (*text)[j] = '\0';
-}
-
 char *read_socket_raw(int socket)
 {
     if (socket == -1)
@@ -165,62 +150,32 @@ char *read_socket_raw(int socket)
         return NULL;
     }
 
-    char *content_buffer = NULL;
+    unsigned short content_size = 0;
-    int content_size;
+    char *content_buffer = why2_calloc(3, sizeof(char));
-    char *wait_buffer = why2_malloc(2); //TEMP
+    //GET LENGTH
-
+    if (recv(socket, content_buffer, 2, 0) != 2)
-    //WAIT TILl RECEIVED MSG (ik it sucks but i can't think of better solution; anyways, this is way more convenient than infinite loop that makes my computer go wroom wroom)
-    recv(socket, wait_buffer, 1, MSG_PEEK);
-    why2_deallocate(wait_buffer);
-
-    do
     {
-        //FIND THE SENT SIZE
+        fprintf(stderr, "Getting message length failed!\n");
-        content_size = 0;
+        return NULL;
-        if (ioctl(socket, FIONREAD, &content_size) < 0 || content_size <= 0) continue;
+    }
 
-        //ALLOCATE
+    content_size = (unsigned short) (((unsigned) content_buffer[1] << 8) | content_buffer[0]);
-        content_buffer = why2_malloc(content_size + 1);
 
-        //READ JSON MESSAGE
+    why2_deallocate(content_buffer);
-        if (recv(socket, content_buffer, content_size, MSG_PEEK) != content_size) //READ THE MESSAGE BY CHARACTERS
+
+    //ALLOCATE
+    content_buffer = why2_calloc(content_size + 1, sizeof(char));
+
+    //READ JSON MESSAGE
+    for (int i = 0; strncmp(content_buffer + strlen(content_buffer) - 2, "\"}", 2) != 0; i++)
+    {
+        if (recv(socket, content_buffer + i, 1, 0) != 1) //READ THE MESSAGE BY CHARACTERS
         {
             fprintf(stderr, "Socket probably read wrongly!\n");
         }
-
-        why2_deallocate(content_buffer); //CLEANUP
-    } while (content_buffer == NULL || strncmp(content_buffer + (content_size - 2), "\"}", 2) != 0);
-
-    //ACTUALLY READ
-    content_buffer = why2_calloc(content_size + 1, sizeof(char)); //ALLOCATE
-
-    int i;
-    for (i = 0; i < content_size; i++)
-    {
-        //READ
-        if (recv(socket, content_buffer + i, 1, 0) != 1) //READ BY CHARS
-        {
-            fprintf(stderr, "Socket probably read wrongly!\n");
-        }
-
-        //REMOVE NON-ASCII
-        if (!is_ascii(content_buffer[i])) i--; //(REWRITE THE CURRENT CHAR)
     }
 
-    content_buffer[i] = '\0'; //NULL TERM
+    content_buffer[content_size - 1] = '\0';
-
-    //VALIDATE JSON FORMAT
-    struct json_object *json = json_tokener_parse(content_buffer);
-    if (json == NULL)
-    {
-        //RESET content_buffer
-        why2_deallocate(content_buffer);
-        content_buffer = NULL;
-    } else
-    {
-        //DEALLOCATION
-        json_object_put(json);
-    }
 
     return content_buffer;
 }
@@ -343,25 +298,6 @@ why2_node_t *find_connection(int connection)
     return buffer;
 }
 
-why2_node_t *find_connection_by_id(unsigned long id)
-{
-    why2_node_t *head = connection_list.head;
-    if (head == NULL) return NULL; //EMPTY LIST
-
-    why2_node_t *buffer = head;
-
-    while (buffer -> next != NULL)
-    {
-        if ((*(connection_node_t*) buffer -> value).id == id) return buffer;
-
-        buffer = buffer -> next;
-    }
-
-    if (id != (*(connection_node_t*) buffer -> value).id) buffer = NULL; //PREVENT FROM RETURNING INVALID NODE
-
-    return buffer;
-}
-
 char *read_user(int connection, void **raw_ptr)
 {
     //VARIABLES
@@ -421,7 +357,13 @@ void send_socket(char *text, char *username, int socket, why2_bool welcome)
     remove_json_syntax_characters(text_copy);
 
     //REMOVE NON ASCII CHARS
-    remove_non_ascii(&text_copy);
+    int j = 0;
+    for (int i = 0; text_copy[i] != '\0'; i++)
+    {
+        if ((20 <= text_copy[i] && text_copy[i] <= 126)) text_copy[i] = text_copy[j++] = text_copy[i];
+    }
+
+    text_copy[j] = '\0';
 
     //ADD OBJECTS
     json_object_object_add(json, "message", json_object_new_string(text_copy));
@@ -433,19 +375,16 @@ void send_socket(char *text, char *username, int socket, why2_bool welcome)
         char *max_uname = why2_chat_server_config("max_username_length");
         char *min_uname = why2_chat_server_config("min_username_length");
         char *max_tries = why2_chat_server_config("max_username_tries");
-        char *server_name = why2_chat_server_config("server_name");
 
         //ADD THE INFO OBJS
         json_object_object_add(json, "max_uname", json_object_new_string(max_uname));
         json_object_object_add(json, "min_uname", json_object_new_string(min_uname));
         json_object_object_add(json, "max_tries", json_object_new_string(max_tries));
-        json_object_object_add(json, "server_name", json_object_new_string(server_name));
 
         //DEALLOCATION
         why2_toml_read_free(max_uname);
         why2_toml_read_free(min_uname);
         why2_toml_read_free(max_tries);
-        why2_toml_read_free(server_name);
     }
 
     //GENERATE JSON STRING
@@ -458,10 +397,23 @@ void send_socket(char *text, char *username, int socket, why2_bool welcome)
     why2_deallocate(text_copy);
     json_object_put(json);
 
+    unsigned short text_length = (unsigned short) strlen(output) + 2;
+    char *final = why2_calloc(text_length, sizeof(char));
+
+    //SPLIT LENGTH INTO TWO CHARS
+    final[0] = (unsigned) text_length & 0xff;
+    final[1] = (unsigned) text_length >> 8;
+
+    for (int i = 2; i < text_length; i++) //APPEND
+    {
+        final[i] = output[i - 2];
+    }
+
     //SEND
-    send(socket, output, strlen(output), 0);
+    send(socket, final, text_length, 0);
 
     //DEALLOCATION
+    why2_deallocate(final);
     why2_deallocate(output);
 }
 
@@ -477,29 +429,6 @@ void send_welcome_packet(int connection)
     send_welcome_socket_deallocate(WHY2_CHAT_CODE_ACCEPT_MESSAGES, why2_chat_server_config("server_username"), connection);
 }
 
-unsigned long get_latest_id()
-{
-    unsigned long returning = 1;
-    why2_node_t *buffer = connection_list.head;
-    connection_node_t value_buffer;
-
-    while (buffer != NULL)
-    {
-        value_buffer = *(connection_node_t*) buffer -> value;
-
-        if (value_buffer.id == returning)
-        {
-            returning++;
-            buffer = connection_list.head;
-        } else
-        {
-            buffer = buffer -> next;
-        }
-    }
-
-    return returning;
-}
-
 //GLOBAL
 void why2_send_socket(char *text, char *username, int socket)
 {
@@ -512,7 +441,7 @@ void *why2_communicate_thread(void *arg)
 
     printf("User connected.\t\t%d\n", connection);
 
-    send_welcome_packet(connection); //TELL USER ALL THE INFO THEY NEED
+    send_welcome_packet(connection); //TELL USER HE ALL THE INFO HE NEEDS
 
     //GET USERNAME
     char *config_username = why2_chat_server_config("user_pick_username");
@@ -542,7 +471,7 @@ void *why2_communicate_thread(void *arg)
         while (invalid_username)
         {
             why2_deallocate(username);
-            if (usernames_n++ == server_config_int("max_username_tries")) //ASKED CLIENT WAY TOO FUCKING MANY TIMES FOR USERNAME, KICK THEM
+            if (usernames_n++ == server_config_int("max_username_tries")) //ASKED CLIENT WAY TOO FUCKING MANY TIMES FOR USERNAME, KICK HIM
             {
                 exiting = 1;
                 goto deallocation;
@@ -586,7 +515,7 @@ void *why2_communicate_thread(void *arg)
 
             if (invalid_username)
             {
-                send_socket_deallocate(WHY2_CHAT_CODE_INVALID_USERNAME, why2_chat_server_config("server_username"), connection); //TELL THE USER THEY ARE DUMB AS FUCK
+                send_socket_deallocate(WHY2_CHAT_CODE_INVALID_USERNAME, why2_chat_server_config("server_username"), connection); //TELL THE USER HE IS DUMB AS FUCK
                 continue;
             }
 
@@ -600,8 +529,7 @@ void *why2_communicate_thread(void *arg)
     {
         connection,
         pthread_self(),
-        why2_strdup(username),
+        why2_strdup(username)
-        get_latest_id()
     };
 
     why2_list_push(&connection_list, &node, sizeof(node)); //ADD TO LIST
@@ -645,149 +573,38 @@ void *why2_communicate_thread(void *arg)
 
         decoded_buffer = get_string_from_json_string(raw, "message"); //DECODE
 
-        //TRIM MESSAGE
+        if (decoded_buffer == NULL) //idk sometimes this happen, idk why
-        why2_trim_string(&decoded_buffer);
-
-        if (decoded_buffer != NULL && strlen(decoded_buffer) != 0)
         {
-            if (strncmp(decoded_buffer, "code", 4) == 0) //CODES FROM CLIENT
+            force_exiting = 1; //force exit <3
+        } else
+        {
+            if (strlen(decoded_buffer) != 0)
             {
-                if (strcmp(decoded_buffer, WHY2_CHAT_CODE_EXIT) == 0) //USER REQUESTED EXIT
+                if (decoded_buffer[0] == '!') //COMMANDS
                 {
-                    exiting = 1;
+                    if (strcmp(decoded_buffer, "!exit") == 0) //USER REQUESTED EXIT
-                } else if (strcmp(decoded_buffer, WHY2_CHAT_CODE_LIST) == 0) //USER REQUESTED LIST OF USERS
-                {
-                    why2_node_t *head = connection_list.head;
-                    if (head == NULL) goto deallocation; //TODO: Send no users code
-
-                    //BUFFERS
-                    why2_node_t *buffer = head;
-                    connection_node_t value_buffer;
-                    unsigned long alloc_size = 0;
-                    char *append_buffer;
-
-                    //COUNT REQUIRED MESSAGE ALLOCATION SIZE
-                    do
                     {
-                        value_buffer = *(connection_node_t*) buffer -> value;
+                        exiting = 1;
-                        alloc_size += strlen(value_buffer.username) + why2_count_int_length(value_buffer.id) + 2;
+                    } else
-
-                        buffer = buffer -> next; //ITER
-                    } while (buffer != NULL);
-
-                    char *message = why2_calloc(strlen(WHY2_CHAT_CODE_LIST_SERVER) + alloc_size + 2, sizeof(char));
-                    buffer = head; //RESET
-
-                    sprintf(message, WHY2_CHAT_CODE_LIST_SERVER); //SET CODE
-
-                    //FILL THE message
-                    do
                     {
-                        value_buffer = *(connection_node_t*) buffer -> value;
+                        send_socket_deallocate(WHY2_CHAT_CODE_INVALID_COMMAND, why2_chat_server_config("server_username"), connection); //INFORM USER THAT HE'S DUMB
-
-                        append_buffer = why2_malloc(strlen(value_buffer.username) + why2_count_int_length(value_buffer.id) + 3); //ALLOCATE THE BUFFER
-                        sprintf(append_buffer, ";%s;%ld", value_buffer.username, value_buffer.id); //FILL THE BUFFER
-
-                        strcat(message, append_buffer); //JOIN THE BUFFER TO OUTPUT message
-
-                        why2_deallocate(append_buffer); //DEALLOCATION
-                        buffer = buffer -> next; //ITER
-                    } while (buffer != NULL);
-
-                    strcat(message, ";");
-
-                    //SEND
-                    send_socket_deallocate(message, why2_chat_server_config("server_username"), connection);
-
-                    //DEALLOCATION
-                    why2_deallocate(message);
-                } else if (strcmp(decoded_buffer, WHY2_CHAT_CODE_VERSION) == 0)
-                {
-                    //GET VERSION STRING FROM THE VERSIONS JSON
-                    char *message = why2_malloc(strlen(WHY2_CHAT_CODE_VERSION_SERVER) + strlen(WHY2_VERSION) + 2); //ALLOCATE MESSAGE FOR CLIENT
-
-                    sprintf(message, WHY2_CHAT_CODE_VERSION_SERVER ";%s%c", WHY2_VERSION, '\0'); //CREATE THE MESSAGE
-
-                    //SEND
-                    send_socket_deallocate(message, why2_chat_server_config("server_username"), connection);
-
-                    //DEALLOCATION
-                    why2_deallocate(message);
-                } else if (strncmp(decoded_buffer, WHY2_CHAT_CODE_PM, strlen(WHY2_CHAT_CODE_PM)) == 0) //PM
-                {
-                    char *input = decoded_buffer + strlen(WHY2_CHAT_CODE_PM) + 1;
-
-                    char *id = NULL; //RECEIVER
-                    char *msg;
-
-                    //CHECK ARGS VALIDITY
-                    why2_bool valid_param = strlen(input) >= 3;
-                    if (valid_param)
-                    {
-                        valid_param = 0;
-                        for (unsigned long i = 1; i < strlen(input); i++)
-                        {
-                            if (input[i] == ';')
-                            {
-                                valid_param = 1;
-
-                                //EXTRACT FIRST ARG (ID)
-                                id = why2_malloc(i + 1);
-                                for (unsigned long j = 0; j < i; j++)
-                                {
-                                    id[j] = input[j];
-                                }
-                                id[i] = '\0';
-
-                                //EXTRACT MESSAGE
-                                msg = input + i + 1;
-                                break;
-                            }
-                        }
                     }
 
-                    //FIND CONNECTION
+                    //IGNORE MESSAGES BEGINNING WITH '!'
-                    why2_node_t *pm_connection = id == NULL ? NULL : find_connection_by_id(atoi(id));
+                } else
-                    if (pm_connection == NULL) valid_param = 0;
-
-                    if (valid_param) //IGNORE INVALID ARGS
-                    {
-                        connection_node_t pm_connection_node = *(connection_node_t*) pm_connection -> value;
-
-                        //ALLOCATE MESSAGE TO SEND TO RECEIVER
-                        char *private_msg = why2_malloc(strlen(WHY2_CHAT_CODE_PM_SERVER) + strlen(node.username) + strlen(pm_connection_node.username) + strlen(msg) + 6);
-
-                        //CONSTRUCT DA MESSAGE
-                        sprintf(private_msg, WHY2_CHAT_CODE_PM_SERVER ";%s;%s;%s;%c", node.username, pm_connection_node.username, msg, '\0');
-
-                        //USER IS SENDING THE MESSAGE TO HIMSELF
-                        why2_bool self_pm = pm_connection_node.connection == connection;
-
-                        //SEND YOU DUMB FUCK
-                        send_socket_deallocate(private_msg, why2_chat_server_config("server_username"), pm_connection_node.connection); //RECIPIENT
-                        if (!self_pm) send_socket_deallocate(private_msg, why2_chat_server_config("server_username"), connection); //AUTHOR
-
-                        why2_deallocate(private_msg);
-                    }
-
-                    //DEALLOCATION
-                    why2_deallocate(id);
-                }
-
-                //IGNORE INVALID CODES, THE USER JUST GOT THEIR LOBOTOMY DONE
-            } else if (strncmp(decoded_buffer, WHY2_CHAT_COMMAND_PREFIX, strlen(WHY2_CHAT_COMMAND_PREFIX)) != 0) //IGNORE MESSAGES BEGINNING WITH '!'
-            {
-                //REBUILD MESSAGE WITH USERNAME
-                json_object_object_add(json, "message", json_object_new_string(decoded_buffer));
-                json_object_object_add(json, "username", json_object_new_string(get_username(connection)));
-
-                json_object_object_foreach(json, key, value) //GENERATE JSON STRING
                 {
-                    append(&raw_output, key, (char*) json_object_get_string(value));
+                    //REBUILD MESSAGE WITH USERNAME
-                }
+                    json_object_object_add(json, "message", json_object_new_string(decoded_buffer));
-                add_brackets(&raw_output);
+                    json_object_object_add(json, "username", json_object_new_string(get_username(connection)));
 
-                send_to_all(raw_output); //e
+                    json_object_object_foreach(json, key, value) //GENERATE JSON STRING
+                    {
+                        append(&raw_output, key, (char*) json_object_get_string(value));
+                    }
+                    add_brackets(&raw_output);
+
+                    send_to_all(raw_output); //e
+                }
             }
         }
 
@@ -890,7 +707,6 @@ void *why2_listen_server(void *socket)
     int max_uname = -1;
     int min_uname = -1;
     int max_tries = -1;
-    char *server_name = NULL;
 
     printf(">>> ");
     fflush(stdout);
@@ -914,11 +730,7 @@ void *why2_listen_server(void *socket)
             max_uname = get_int_from_json_string(read, "max_uname");
             min_uname = get_int_from_json_string(read, "min_uname");
             max_tries = get_int_from_json_string(read, "max_tries");
-            server_name = get_string_from_json_string(read, "server_name");
 
-            printf(WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP "Successfully connected to %s.\n\n\n", server_name); //WELCOME
-
-            why2_deallocate(server_name);
             continuing = 1;
         }
 
@@ -941,85 +753,10 @@ void *why2_listen_server(void *socket)
 
                 printf("%s%sEnter username (a-Z, 0-9; %d-%d characters):\n", asking_username++ > 0 ? WHY2_CLEAR_AND_GO_UP : "", WHY2_CLEAR_AND_GO_UP, min_uname, max_uname);
                 fflush(stdout);
-            } else if (strncmp(message, WHY2_CHAT_CODE_LIST_SERVER, strlen(WHY2_CHAT_CODE_LIST_SERVER)) == 0) //LIST USERS
+            } else if (strcmp(message, WHY2_CHAT_CODE_INVALID_COMMAND) == 0) //INVALID CMD
             {
-                why2_bool printing_id = 0;
+                printf("\nInvalid command!\n\n");
-
-                printf("\nList:\n-----\n");
-
-                //ITER TROUGH LIST OF USERS FROM SERVER
-                for (unsigned long i = strlen(WHY2_CHAT_CODE_LIST_SERVER) + 1; i < strlen(message); i++)
-                {
-                    if (message[i] == ';')
-                    {
-                        printf((printing_id = !printing_id) ? " (" : ")\n");
-                        continue;
-                    }
-
-                    printf("%c", message[i]);
-                }
-
-                printf("\n");
                 fflush(stdout);
-            } else if (strncmp(message, WHY2_CHAT_CODE_VERSION_SERVER, strlen(WHY2_CHAT_CODE_VERSION_SERVER)) == 0)
-            {
-                char *server_version = message + strlen(WHY2_CHAT_CODE_VERSION_SERVER) + 1;
-
-                //INFO
-                printf("\nServer Version: %s\nClient Version: %s\n\n", server_version, WHY2_VERSION);
-
-                //SERVER IS OUTDATED
-                if (atoi(server_version + 1) < atoi(WHY2_VERSION + 1))
-                {
-                    printf("Server is outdated. Some new features may not work correctly.\n\n");
-                }
-            } else if (strncmp(message, WHY2_CHAT_CODE_PM_SERVER, strlen(WHY2_CHAT_CODE_PM_SERVER)) == 0)
-            {
-                printf(WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP); //do not fucking ask me how the fucking formatting fucking works, i dont fucking know
-
-                char *received_pm = message + strlen(WHY2_CHAT_CODE_PM_SERVER) + 1;
-
-                //DECODED MESSAGE, AUTHOR AND RECIPIENT; 0 = AUTHOR, 1 = RECIPIENT, 2 = MESSAGE
-                char **pm_info = why2_calloc(3, sizeof(char*));
-
-                unsigned long i_buffer = 0;
-                unsigned long n_buffer = 0;
-
-                //DECODE
-                for (unsigned long i = 0; i < strlen(received_pm); i++)
-                {
-                    if (received_pm[i] == ';') //FUTURE ME, THIS IS PRETTY MUCH split FUNCTION IMPLEMENTATION
-                    {
-                        //ALLOCATE INFO
-                        pm_info[n_buffer] = why2_malloc((i - i_buffer) + 1);
-
-                        //COPY INFO
-                        for (unsigned long j = i_buffer; j < i; j++)
-                        {
-                            pm_info[n_buffer][j - i_buffer] = received_pm[j];
-                        }
-                        pm_info[n_buffer][i - i_buffer] = '\0';
-
-                        i_buffer = i + 1;
-                        n_buffer++;
-                    }
-                }
-
-                //OUTPUT
-                if (strcmp(pm_info[0], pm_info[1]) != 0 || strlen(pm_info[0]) != 13)
-                {
-                    printf("\n\n%s(%s -> %s): %s\n\n", WHY2_CLEAR_AND_GO_UP, pm_info[0], pm_info[1], pm_info[2]);
-                } else
-                {
-                    printf("\n\n%s(schizophrenia): %s\n\n", WHY2_CLEAR_AND_GO_UP, pm_info[2]); //:))
-                }
-
-                //DEALLOCATION
-                for (int i = 0; i < 3; i++)
-                {
-                    why2_deallocate(pm_info[i]);
-                }
-                why2_deallocate(pm_info);
             }
         } else if (!continuing)
         {
@@ -1062,68 +799,3 @@ void *why2_getline_thread(WHY2_UNUSED void* arg)
 
     return line;
 }
-
-void why2_trim_string(char **s)
-{
-    //GET CORRECT ALLOCATION FNS
-    void* (*allocate)(unsigned long);
-    void (*deallocate)(void*);
-
-    if (why2_allocated(*s))
-    {
-        allocate = why2_malloc;
-        deallocate = why2_deallocate;
-    } else
-    {
-        allocate = malloc;
-        deallocate = free;
-    }
-
-    //BUFFERS
-    unsigned long start_spaces = 0;
-    unsigned long end_spaces = 0;
-    unsigned long actual_length;
-
-    //COUNT start_spaces (HOW MANY SPACES ARE IN THE START)
-    for (unsigned long i = 0; i < strlen(*s); i++)
-    {
-        if ((*s)[i] != ' ') break;
-        start_spaces++;
-    }
-
-    //COUNT end_spaces
-    for (long long i = (long long) strlen(*s) - 1; i >= 0; i--)
-    {
-        if ((*s)[i] != ' ') break;
-        end_spaces++;
-    }
-
-    //USER'S HEAD HAS FELL ON THE SPACEBAR
-    if (start_spaces + end_spaces > strlen(*s))
-    {
-        deallocate(*s);
-        *s = NULL;
-
-        return;
-    }
-
-    //COUNT actual_length
-    actual_length = strlen(*s) - (end_spaces + start_spaces);
-
-    if (actual_length == strlen(*s)) return; //NO SPACES TO REMOVE
-
-    char *st = allocate(actual_length + 2); //TRIMMED s
-
-    for (unsigned long i = start_spaces; i < (start_spaces + actual_length); i++)
-    {
-        st[i - start_spaces] = (*s)[i];
-    }
-
-    st[actual_length] = '\0';
-
-    //DEALLOCATE UNTRIMMED s
-    deallocate(*s);
-
-    //SET NEW s
-    *s = st;
-}

src/core/app/main.c

@@ -23,7 +23,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 int main(void)
 {
     //SET FLAGS
-    why2_set_flags((why2_input_flags) { 1, 1, 0, WHY2_v3, WHY2_OUTPUT_TEXT });
+    why2_set_flags((why2_input_flags) { 1, 1, 0, WHY2_v3 });
 
     //RUN ENCRYPTION WITH WHY2_TEXT_TO_ENCRYPT, GENERATE NEW KEY AND DO NOT CHECK FOR ACTIVE WHY2_VERSION & PREVENT ANY OUTPUT
     why2_output_flags encryptedText = why2_encrypt_text(WHY2_TEXT_TO_ENCRYPT, NULL);

src/core/lib/decrypter.c

@@ -27,179 +27,129 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <why2/memory.h>
 #include <why2/misc.h>
 
-why2_output_flags why2_decrypt_text(char *text, char *key_new)
+why2_output_flags why2_decrypt_text(char *text, char *keyNew)
 {
     //CHECK VARIABLE
-    unsigned char check_exit_code;
+    unsigned char checkExitCode;
 
     //TIME VARIABLES
-    struct timeval start_time;
+    struct timeval startTime;
-    struct timeval finish_time;
+    struct timeval finishTime;
-    gettimeofday(&start_time, NULL);
+    gettimeofday(&startTime, NULL);
 
     //CHECK FOR ACTIVE WHY2_VERSION
-    if ((check_exit_code = why2_check_version()) != WHY2_SUCCESS)
+    if ((checkExitCode = why2_check_version()) != WHY2_SUCCESS)
     {
-        return why2_no_output(check_exit_code);
+        return why2_no_output(checkExitCode);
     }
 
     //CHECK FOR INVALID text
-    if ((check_exit_code = why2_check_text(text)) != WHY2_SUCCESS)
+    if ((checkExitCode = why2_check_text(text)) != WHY2_SUCCESS)
     {
-        return why2_no_output(check_exit_code);
+        return why2_no_output(checkExitCode);
     }
 
     //CHECK FOR INVALID key
-    if ((check_exit_code = why2_check_key(key_new)) != WHY2_SUCCESS)
+    if ((checkExitCode = why2_check_key(keyNew)) != WHY2_SUCCESS)
     {
-        return why2_no_output(check_exit_code);
+        return why2_no_output(checkExitCode);
     }
 
     //REDEFINE keyLength
-    why2_set_key_length(strlen(key_new));
+    why2_set_key_length(strlen(keyNew));
 
     //VARIABLES
-    char *returning_text;
+    char *returningText;
-    int number_buffer = 0;
+    int numberBuffer = 1;
-    int used_text_deallocation_buffer = 0;
+    int usedTextDeallocationBuffer = 0;
-    char *text_buffer = NULL;
+    char *textBuffer = NULL;
-    int text_key_chainLength;
+    int textKeyChainLength;
-    int *text_key_chain;
+    int *textKeyChain;
-    char *key = why2_strdup(key_new); //COPY key_new TO key
+    char *key = why2_strdup(keyNew); //COPY keyNew TO key
-    int *encrypted_text_key_chain;
+    int *encryptedTextKeyChain;
-    char *used_text = NULL; //COPY text TO used_text
+    char *used_text = why2_strdup(text); //COPY text TO used_text
 
-    if (why2_get_flags().format == WHY2_OUTPUT_BYTE)
+    //GET LENGTH OF returningText AND textKeyChain
-    {
-        //REBUILD THE BYTE FORMAT AS TEXT FORMAT
-        int *encrypted_input = why2_malloc(sizeof(int) * why2_byte_format_length(text));
-        char *text_copy = why2_strdup(text);
-
-        //GET ENCRYPTED NUMBERS
-        for (unsigned short i = 0; i < why2_byte_format_length(text_copy); i++)
-        {
-            for (unsigned short j = 2 + (i * 2); j <= 3 + (i * 2); j++)
-            {
-                //ENSURE THERE IS NO \0 (REVERSED)
-                if (text_copy[j] == -128) text_copy[j] = 0;
-            }
-
-            //PUT TOGETHER
-            encrypted_input[i] = (text_copy[3 + (i * 2)] << 7) | text_copy[2 + (i * 2)];
-
-            //ALSO COUNT REQUIRED SIZE
-            number_buffer += why2_count_int_length(encrypted_input[i]);
-        }
-        number_buffer += why2_byte_format_length(text_copy); //ADD THE SEPARATORS (I didn't remove one cause 1 index will be empty at used_text end)
-
-        used_text = why2_calloc(number_buffer, sizeof(char));
-
-        for (unsigned short i = 0; i < why2_byte_format_length(text_copy); i++)
-        {
-            number_buffer = why2_count_int_length(encrypted_input[i]);
-            text_buffer = why2_realloc(text_buffer, number_buffer + 1);
-
-            sprintf(text_buffer, "%d", encrypted_input[i]);
-            strcat(used_text, text_buffer);
-
-            if (i != why2_byte_format_length(text_copy) - 1)
-            {
-                used_text[strlen(used_text)] = why2_get_encryption_separator();
-            }
-        }
-
-        //DEALLOCATION
-        why2_deallocate(encrypted_input);
-        why2_deallocate(text_buffer);
-        why2_deallocate(text_copy);
-    } else if (why2_get_flags().format == WHY2_OUTPUT_TEXT)
-    {
-        used_text = why2_strdup(text);
-    }
-
-    number_buffer = 1;
-
-    //GET LENGTH OF returning_text AND text_key_chain
     for (int i = 0; i < (int) strlen(used_text); i++)
     {
-        if (used_text[i] == why2_get_encryption_separator()) number_buffer++;
+        if (used_text[i] == why2_get_encryption_separator()) numberBuffer++;
     }
 
-    //SET LENGTH (number_buffer)
+    //SET LENGTH (numberBuffer)
-    returning_text = why2_calloc(number_buffer + 1, sizeof(char));
+    returningText = why2_calloc(numberBuffer + 1, sizeof(char));
-    text_key_chain = why2_malloc(sizeof(int) * number_buffer);
+    textKeyChain = why2_malloc(sizeof(int) * numberBuffer);
-    encrypted_text_key_chain = why2_malloc(sizeof(int) * number_buffer);
+    encryptedTextKeyChain = why2_malloc(sizeof(int) * numberBuffer);
-    text_key_chainLength = number_buffer;
+    textKeyChainLength = numberBuffer;
 
-    //LOAD text_key_chain
+    //LOAD textKeyChain
-    why2_generate_text_key_chain(key, text_key_chain, number_buffer);
+    why2_generate_text_key_chain(key, textKeyChain, numberBuffer);
 
-    //LOAD encrypted_text_key_chain
+    //LOAD encryptedTextKeyChain
-    for (int i = 0; i < text_key_chainLength; i++)
+    for (int i = 0; i < textKeyChainLength; i++)
     {
-        number_buffer = 0;
+        numberBuffer = 0;
 
         //GET LENGTH OF EACH CHARACTER
         for (int j = 0; j < (int) strlen(used_text); j++)
         {
             if (used_text[j] == why2_get_encryption_separator()) break;
 
-            number_buffer++;
+            numberBuffer++;
         }
 
-        text_buffer = why2_realloc(text_buffer, number_buffer + 1);
+        textBuffer = why2_realloc(textBuffer, numberBuffer + 1);
 
-        //CLEAN (POSSIBLY EXISTING) JUNK in text_buffer
+        //CLEAN (POSSIBLY EXISTING) JUNK in textBuffer
-        for (int j = 0; j <= number_buffer; j++)
+        for (int j = 0; j <= numberBuffer; j++)
         {
-            text_buffer[j] = '\0';
+            textBuffer[j] = '\0';
         }
 
-        //LOAD text_buffer
+        //LOAD textBuffer
         for (int j = 0; j < (int) strlen(used_text); j++)
         {
-            text_buffer[j] = used_text[j];
+            textBuffer[j] = used_text[j];
 
-            if (number_buffer == j) break;
+            if (numberBuffer == j) break;
         }
 
-        encrypted_text_key_chain[i] = atoi(text_buffer);
+        encryptedTextKeyChain[i] = atoi(textBuffer);
 
-        used_text += number_buffer + 1;
+        used_text += numberBuffer + 1;
-        used_text_deallocation_buffer += number_buffer + 1;
+        usedTextDeallocationBuffer += numberBuffer + 1;
     }
 
     //DECRYPT TEXT
-    for (int i = 0; i < text_key_chainLength; i++)
+    for (int i = 0; i < textKeyChainLength; i++)
     {
-        text_key_chain[i] = why2_get_encryption_operation()(text_key_chain[i], encrypted_text_key_chain[i]);
+        textKeyChain[i] = why2_get_encryption_operation()(textKeyChain[i], encryptedTextKeyChain[i]);
     }
 
-    //LOAD returning_text
+    //LOAD returningText
-    for (int i = 0; i < text_key_chainLength; i++)
+    for (int i = 0; i < textKeyChainLength; i++)
     {
-        returning_text[i] = text_key_chain[i];
+        returningText[i] = textKeyChain[i];
     }
 
     //GET FINISH TIME
-    gettimeofday(&finish_time, NULL);
+    gettimeofday(&finishTime, NULL);
 
     //LOAD output
     why2_output_flags output =
     {
-        returning_text, //DECRYPTED TEXT
+        returningText, //DECRYPTED TEXT
         key, //USED KEY
-        why2_count_unused_key_size(returning_text, key), // NUMBER OF WHY2_UNUSED CHARS IN KEY
+        why2_count_unused_key_size(returningText, key), // NUMBER OF WHY2_UNUSED CHARS IN KEY
-        why2_count_repeated_key_size(returning_text, key), //NUMBER OF REPEATED CHARS IN KEY
+        why2_count_repeated_key_size(returningText, key), //NUMBER OF REPEATED CHARS IN KEY
-        why2_compare_time_micro(start_time, finish_time), // ELAPSED TIME
+        why2_compare_time_micro(startTime, finishTime), // ELAPSED TIME
         WHY2_SUCCESS //EXIT CODE
     };
 
     //DEALLOCATION
-    why2_deallocate(text_key_chain);
+    why2_deallocate(textKeyChain);
-    why2_deallocate(encrypted_text_key_chain);
+    why2_deallocate(encryptedTextKeyChain);
-    why2_deallocate(text_buffer);
+    why2_deallocate(textBuffer);
-    why2_deallocate(used_text - used_text_deallocation_buffer);
+    why2_deallocate(used_text - usedTextDeallocationBuffer);
 
     return output;
 }

src/core/lib/encrypter.c

@@ -26,47 +26,47 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <why2/memory.h>
 #include <why2/misc.h>
 
-why2_output_flags why2_encrypt_text(char *text, char *key_new)
+why2_output_flags why2_encrypt_text(char *text, char *keyNew)
 {
     //CHECK VARIABLE
-    unsigned char check_exit_code;
+    unsigned char checkExitCode;
 
     //TIME VARIABLES
-    struct timeval start_time;
+    struct timeval startTime;
-    struct timeval finish_time;
+    struct timeval finishTime;
-    gettimeofday(&start_time, NULL);
+    gettimeofday(&startTime, NULL);
 
     //CHECK FOR ACTIVE WHY2_VERSION
-    if ((check_exit_code = why2_check_version()) != WHY2_SUCCESS)
+    if ((checkExitCode = why2_check_version()) != WHY2_SUCCESS)
     {
-        return why2_no_output(check_exit_code);
+        return why2_no_output(checkExitCode);
     }
 
     //CHECK FOR INVALID text
-    if ((check_exit_code = why2_check_text(text)) != WHY2_SUCCESS)
+    if ((checkExitCode = why2_check_text(text)) != WHY2_SUCCESS)
     {
-        return why2_no_output(check_exit_code);
+        return why2_no_output(checkExitCode);
     }
 
     why2_set_memory_identifier("core_decrypt");
 
     //VARIABLES
     char *key = NULL;
-    char *returning_text = NULL;
+    char *returningText;
-    char *text_buffer = NULL;
+    char *textBuffer = NULL;
-    int *text_key_chain = why2_malloc(sizeof(int) * strlen(text));
+    int *textKeyChain = why2_malloc(sizeof(int) * strlen(text));
-    int number_buffer = 0;
+    int numberBuffer = 0;
 
-    if (key_new != NULL)
+    if (keyNew != NULL)
     {
         //CHECK FOR INVALID key
-        if ((check_exit_code = why2_check_key(key_new)) != WHY2_SUCCESS)
+        if ((checkExitCode = why2_check_key(keyNew)) != WHY2_SUCCESS)
         {
             why2_clean_memory("core_decrypt");
-            return why2_no_output(check_exit_code);
+            return why2_no_output(checkExitCode);
         }
 
-        key = why2_strdup(key_new);
+        key = why2_strdup(keyNew);
 
         //REDEFINE keyLength
         why2_set_key_length(strlen(key));
@@ -75,85 +75,58 @@ why2_output_flags why2_encrypt_text(char *text, char *key_new)
         key = why2_generate_key(why2_get_key_length());
     }
 
-    //LOAD text_key_chain
+    //LOAD textKeyChain
-    why2_generate_text_key_chain(key, text_key_chain, strlen(text));
+    why2_generate_text_key_chain(key, textKeyChain, strlen(text));
 
     //ACTUALLY ENCRYPT TEXT
     for (int i = 0; i < (int) strlen(text); i++)
     {
-        text_key_chain[i] = why2_get_encryption_operation()(text_key_chain[i], (int) text[i]);
+        textKeyChain[i] = why2_get_encryption_operation()(textKeyChain[i], (int) text[i]);
     }
 
-    //OUTPUT FORMATS
+    //COUNT REQUIRED SIZE FOR returningText
-    if (why2_get_flags().format == WHY2_OUTPUT_TEXT) //NORMAL 420.-69 FORMAT
+    for (int i = 0; i < (int) strlen(text); i++)
     {
-        //COUNT REQUIRED SIZE FOR returning_text
+        numberBuffer += why2_count_int_length(textKeyChain[i]);
-        for (int i = 0; i < (int) strlen(text); i++)
+    }
-        {
-            number_buffer += why2_count_int_length(text_key_chain[i]);
-        }
 
-        //ALLOCATE returning_text (WITH THE SEPARATORS)
+    //ALLOCATE returningText (WITH THE SEPARATORS)
-        returning_text = why2_calloc(number_buffer + strlen(text), sizeof(char));
+    returningText = why2_calloc(numberBuffer + strlen(text), sizeof(char));
 
-        //LOAD returning_text
+    //LOAD returningText
-        for (int i = 0; i < (int) strlen(text); i++)
+    for (int i = 0; i < (int) strlen(text); i++)
-        {
-            number_buffer = sizeof(int) * why2_count_int_length(text_key_chain[i]);
-
-            text_buffer = why2_realloc(text_buffer, number_buffer);
-
-            sprintf(text_buffer, "%d", text_key_chain[i]);
-
-            strcat(returning_text, text_buffer);
-
-            if (i != (int) strlen(text) - 1)
-            {
-                returning_text[strlen(returning_text)] = why2_get_encryption_separator();
-            }
-        }
-    } else if (why2_get_flags().format == WHY2_OUTPUT_BYTE) //FUCKED BUT SHORT(ER) OUTPUT
     {
-        number_buffer = (strlen(text) + 1) * 2; //EACH CHARACTER WILL BE SPLIT INTO TWO CHARS AND FIRST TWO WILL BE LENGTH OF text
+        numberBuffer = sizeof(int) * why2_count_int_length(textKeyChain[i]);
 
-        returning_text = why2_calloc(number_buffer + 1, sizeof(char)); //ALLOCATE
+        textBuffer = why2_realloc(textBuffer, numberBuffer);
 
-        //SET LENGTH
+        sprintf(textBuffer, "%d", textKeyChain[i]);
-        returning_text[0] = (strlen(text) & 0x7f) + 1; //+1 BECAUSE WE DON'T WANT \0
-        returning_text[1] = (strlen(text) >> 7) + 1;
 
-        //PUT THE text_key_chain INTO returning_text DIRECTLY
+        strcat(returningText, textBuffer);
-        for (unsigned long i = 0; i < strlen(text); i++)
+
+        if (i != (int) strlen(text) - 1)
         {
-            //BUILD returning_text
+            returningText[strlen(returningText)] = why2_get_encryption_separator();
-            returning_text[2 + (i * 2)] = text_key_chain[i] & 0x7f;
-            returning_text[3 + (i * 2)] = (text_key_chain[i] >> 7) | ((text_key_chain[i] < 0) ? 0x80 : 0);
-
-            for (unsigned long j = 2 + (i * 2); j <= 3 + (i * 2); j++)
-            {
-                //ENSURE THERE IS NO \0
-                if (returning_text[j] == 0) returning_text[j] = -128;
-            }
         }
     }
 
     //GET FINISH TIME
-    gettimeofday(&finish_time, NULL);
+    gettimeofday(&finishTime, NULL);
 
     //LOAD output
     why2_output_flags output =
     {
-        returning_text, //ENCRYPTED TEXT
+        returningText, //ENCRYPTED TEXT
         key, //GENERATED/USED KEY
         why2_count_unused_key_size(text, key), // NUMBER OF WHY2_UNUSED CHARS IN KEY
         why2_count_repeated_key_size(text, key), //NUMBER OF REPEATED CHARS IN KEY
-        why2_compare_time_micro(start_time, finish_time), // ELAPSED TIME
+        why2_compare_time_micro(startTime, finishTime), // ELAPSED TIME
         WHY2_SUCCESS //EXIT CODE
     };
 
     //DEALLOCATION
-    why2_deallocate(text_key_chain);
+    why2_deallocate(textKeyChain);
-    why2_deallocate(text_buffer);
+    why2_deallocate(textBuffer);
 
     why2_reset_memory_identifier();
 

src/core/lib/flags.c

@@ -25,7 +25,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <why2/memory.h>
 
 //CONSTS (this is just local)
-#define DEFAULT_FLAGS (why2_input_flags) { 0, 0, 0, WHY2_v3, WHY2_OUTPUT_TEXT }
+#define DEFAULT_FLAGS (why2_input_flags) { 0, 0, 0, WHY2_v3}
 #define DEFAULT_MEMORY_IDENTIFIER ""
 
 int encryptionOperation(int text, int encryptedText);

src/core/lib/test/main.c

@@ -44,8 +44,7 @@ int main(void)
         0, //SKIP CHECK
         0, //NO OUTPUT
         0, //UPDATE
-        WHY2_v3, //LATEST VERSION
+        WHY2_v3 //LATEST VERSION
-        WHY2_OUTPUT_TEXT //READABLE TEXT OUTPUT
     };
 
     //SET FLAGS

src/core/lib/utils/llist.c

@@ -39,15 +39,11 @@ void why2_list_push(why2_list_t *list, void *value, unsigned long size)
         buffer = new_node;
     } else
     {
-        why2_node_t *buffer_2 = buffer;
-
         while (buffer -> next != NULL) buffer = buffer -> next; //GET TO THE END OF LIST
 
         buffer -> next = new_node; //LINK
-        buffer = buffer_2; //GO BACK TO THE START OF THE LLIST
     }
 
-    //APPEND THE new_node TO THE END OF list
     list -> head = buffer;
 }
 
@@ -134,21 +130,3 @@ why2_node_t *why2_list_find(why2_list_t *list, void *value)
 
     return buffer;
 }
-
-unsigned long why2_list_get_size(why2_list_t *list)
-{
-    unsigned long n = 0; //RETURNING SIZE
-
-    why2_node_t *head = list -> head;
-    if (head == NULL) return n; //EMPTY LIST
-
-    why2_node_t *buffer = head;
-
-    do
-    {
-        n++;
-        buffer = buffer -> next; //ITER
-    } while (buffer != NULL);
-
-    return n;
-}

src/core/lib/utils/memory.c

@@ -191,8 +191,6 @@ void *why2_opendir(char *name)
 
 void why2_deallocate(void *pointer)
 {
-    if (pointer == NULL) return; //DEALLOCATING NULL
-
     //VARIABLES
     node_t *node = get_node(pointer);
 
@@ -241,8 +239,3 @@ void why2_clean_memory(char *identifier)
 
     why2_reset_memory_identifier(); //THIS WILL CAUSE SEGFAULT IF YOU DIDN'T USE why2_set_memory_identifier
 }
-
-why2_bool why2_allocated(void *pointer)
-{
-    return get_node(pointer) != NULL;
-}

src/core/lib/utils/misc.c

@@ -24,7 +24,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/random.h>
+#include <sys/time.h>
 #include <ftw.h>
 
 #include <curl/curl.h>
@@ -34,6 +34,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <why2/flags.h>
 #include <why2/memory.h>
 
+why2_bool seedSet = 0; //DO NOT FUCKING TOUCH THIS!!!
+
 int multiply_cb(int a, int b) { return a * b; }
 int subtract_cb(int a, int b) { return a - b; }
 int sum_cb(int a, int b) { return a + b; }
@@ -52,41 +54,22 @@ int removeDirectory(char *path)
     return nftw(path, unlink_cb, 64, FTW_DEPTH | FTW_PHYS);
 }
 
-void why2_directory(void)
+enum WHY2_EXIT_CODES why2_check_version(void) //! CRASHES WHEN CALLED FROM CHAT STUFF
-{
-    struct stat st;
-    char *buffer = why2_replace(WHY2_CONFIG_DIR, "{USER}", getenv("USER"));
-
-    //CREATE USER CONFIG FOLDER
-    if (stat(buffer, &st) == -1)
-    {
-        mkdir(buffer, 0700);
-    }
-
-    //DEALLOCATION
-    why2_deallocate(buffer);
-}
-
-enum WHY2_EXIT_CODES why2_check_version(void)
 {
     if (why2_get_flags().no_check) return WHY2_SUCCESS;
 
     why2_set_memory_identifier("core_version_check");
-    why2_directory(); //MAKE SURE WHY2 DIR EXISTS
 
     //FILE-CHECK VARIABLES
-    int not_found_buffer = 0;
+    int notFoundBuffer = 0;
-
-    //GET VERSION FILE
-    char *version_file = why2_replace(WHY2_VERSIONS_NAME, "{USER}", getenv("USER"));
 
     //CURL VARIABLES
     CURL *curl = curl_easy_init();
-    FILE *file_buffer = why2_fopen(version_file, "w+");
+    FILE *fileBuffer = why2_fopen(WHY2_VERSIONS_NAME, "w+");
 
     //GET versions.json
     curl_easy_setopt(curl, CURLOPT_URL, WHY2_VERSIONS_URL);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, file_buffer);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, fileBuffer);
     curl_easy_setopt(curl, CURLOPT_TIMEOUT, WHY2_CURL_TIMEOUT);
 
     //DOWNLOAD versions.json
@@ -94,41 +77,41 @@ enum WHY2_EXIT_CODES why2_check_version(void)
 
     //CLEANUP
     curl_easy_cleanup(curl);
-    why2_deallocate(file_buffer);
+    why2_deallocate(fileBuffer);
 
-    while (access(version_file, R_OK) != 0)
+    while (access(WHY2_VERSIONS_NAME, R_OK) != 0)
     {
-        not_found_buffer++;
+        notFoundBuffer++;
 
-        if (not_found_buffer == WHY2_NOT_FOUND_TRIES)
+        if (notFoundBuffer == WHY2_NOT_FOUND_TRIES)
         {
-            if (!why2_get_flags().no_output) fprintf(stderr, "%s'%s' not found! Exiting...\n", WHY2_CLEAR_SCREEN, version_file);
+            if (!why2_get_flags().no_output) fprintf(stderr, "%s'%s' not found! Exiting...\n", WHY2_CLEAR_SCREEN, WHY2_VERSIONS_NAME);
 
             why2_clean_memory("core_version_check");
             return WHY2_DOWNLOAD_FAILED;
         }
 
-        if (!why2_get_flags().no_output) printf("%s'%s' not found (%dx)! Trying again in a second.\n", WHY2_CLEAR_SCREEN, version_file, not_found_buffer);
+        if (!why2_get_flags().no_output) printf("%s'%s' not found (%dx)! Trying again in a second.\n", WHY2_CLEAR_SCREEN, WHY2_VERSIONS_NAME, notFoundBuffer);
         sleep(1);
     }
 
     //JSON VARIABLES
 	char *buffer;
-    long buffer_size;
+	struct json_object *parsedJson;
-	struct json_object *parsed_json;
 	struct json_object *active;
+    int bufferSize;
 
     //COUNT LENGTH OF buffer AND STORE IT IN bufferSize
-    file_buffer = why2_fopen(version_file, "r");
+    fileBuffer = why2_fopen(WHY2_VERSIONS_NAME, "r");
-    fseek(file_buffer, 0, SEEK_END);
+    fseek(fileBuffer, 0, SEEK_END);
-    buffer_size = ftell(file_buffer);
+    bufferSize = ftell(fileBuffer);
-    rewind(file_buffer); //REWIND file_buffer (NO SHIT)
+    rewind(fileBuffer); //REWIND fileBuffer (NO SHIT)
 
     //SET LENGTH OF buffer
-    buffer = why2_calloc(buffer_size + 1, sizeof(char));
+    buffer = why2_calloc(bufferSize + 1, sizeof(char));
 
     //LOAD jsonFile
-    if (fread(buffer, buffer_size, 1, file_buffer) != 1)
+    if (fread(buffer, bufferSize, 1, fileBuffer) != 1)
     {
         if (!why2_get_flags().no_output) fprintf(stderr, "Reading file failed!\n");
 
@@ -137,7 +120,7 @@ enum WHY2_EXIT_CODES why2_check_version(void)
         // return WHY2_DOWNLOAD_FAILED;
     }
 
-    buffer[buffer_size] = '\0';
+    buffer[bufferSize] = '\0';
 
     //CHECK FOR TEXT IN buffer
     if (strcmp(buffer, "") == 0)
@@ -152,11 +135,11 @@ enum WHY2_EXIT_CODES why2_check_version(void)
     }
 
     //CLEANUP
-	why2_deallocate(file_buffer);
+	why2_deallocate(fileBuffer);
 
     //GET
-	parsed_json = json_tokener_parse(buffer); //yes, ik, i could use json_object_from_file, but I need to check for internet somehow
+	parsedJson = json_tokener_parse(buffer); //yes, ik, i could use json_object_from_file, but I need to check for internet somehow
-	json_object_object_get_ex(parsed_json, "active", &active);
+	json_object_object_get_ex(parsedJson, "active", &active);
 
     if (strcmp(WHY2_VERSION, json_object_get_string(active)) != 0)
     {
@@ -175,8 +158,8 @@ enum WHY2_EXIT_CODES why2_check_version(void)
             //VARIABLES
             git_repository *repo = NULL;
             int exit_code;
-            char *install_command;
+            char *installCommand;
-            int install_code;
+            int installCode;
 
             //MESSAGE
             if (!why2_get_flags().no_output) printf("Your WHY2 version is outdated!\nUpdating...\t[BETA]\n\n");
@@ -202,18 +185,18 @@ enum WHY2_EXIT_CODES why2_check_version(void)
                 return WHY2_WHY2_UPDATE_FAILED;
             }
 
-            //COUNT install_command LENGTH & ALLOCATE IT
+            //COUNT installCommand LENGTH & ALLOCATE IT
-            install_command = why2_replace(WHY2_UPDATE_COMMAND, "{DIR}", WHY2_UPDATE_NAME);
+            installCommand = why2_replace(WHY2_UPDATE_COMMAND, "{DIR}", WHY2_UPDATE_NAME);
 
-            install_code = system(install_command); //INSTALL
+            installCode = system(installCommand); //INSTALL
 
             //REMOVE versions.json - OTHERWISE WILL CAUSE SEGFAULT IN NEXT RUN
-            remove(version_file);
+            remove(WHY2_VERSIONS_NAME);
 
-            why2_deallocate(install_command);
+            why2_deallocate(installCommand);
 
             //CHECK FOR ERRORS
-            if (install_code != 0)
+            if (installCode != 0)
             {
                 if (!why2_get_flags().no_output) fprintf(stderr, "Updating failed! (installing)\n");
 
@@ -223,34 +206,34 @@ enum WHY2_EXIT_CODES why2_check_version(void)
         } else
         {
             //COUNT WHY2_VERSIONS BEHIND
-            int versions_index = -1;
+            int versionsIndex = -1;
-            int versions_buffer = 0;
+            int versionsBuffer = 0;
 
             struct json_object *deprecated;
-            json_object_object_get_ex(parsed_json, "deprecated", &deprecated);
+            json_object_object_get_ex(parsedJson, "deprecated", &deprecated);
 
-            //COUNT versions_index
+            //COUNT versionsIndex
             for (int i = 0; i < (int) json_object_array_length(deprecated); i++)
             {
                 //IT'S A MATCH, BABY :D
                 if (strcmp(json_object_get_string(json_object_array_get_idx(deprecated, i)), WHY2_VERSION) == 0)
                 {
-                    versions_index = i;
+                    versionsIndex = i;
 
                     break;
                 }
             }
 
             //versions.json DOESN'T CONTAIN WHY2_VERSION (THIS WILL NOT HAPPEN IF YOU WILL NOT EDIT IT)
-            if (versions_index == -1)
+            if (versionsIndex == -1)
             {
                 if (!why2_get_flags().no_output) printf("Version %s not found! Check your flags.\n\n", WHY2_VERSION);
             } else
             {
-                //COUNT versions_buffer
+                //COUNT versionsBuffer
-                versions_buffer = json_object_array_length(deprecated) - versions_index;
+                versionsBuffer = json_object_array_length(deprecated) - versionsIndex;
 
-                if (!why2_get_flags().no_output) fprintf(stderr, "This release could be unsafe! You're %d versions behind! (%s/%s)\n\n", versions_buffer, WHY2_VERSION, json_object_get_string(active));
+                if (!why2_get_flags().no_output) fprintf(stderr, "This release could be unsafe! You're %d versions behind! (%s/%s)\n\n", versionsBuffer, WHY2_VERSION, json_object_get_string(active));
 
                 //WAIT FOR 5 SECONDS
                 sleep(5);
@@ -259,9 +242,8 @@ enum WHY2_EXIT_CODES why2_check_version(void)
     }
 
     //DEALLOCATION
-    json_object_put(parsed_json); //THIS FREES EVERY json_object - AT LEAST JSON-C'S DOCUMENTATION SAYS THAT
+    json_object_put(parsedJson); //THIS FREES EVERY json_object - AT LEAST JSON-C'S DOCUMENTATION SAYS THAT
     why2_deallocate(buffer);
-    why2_deallocate(version_file);
 
     why2_reset_memory_identifier();
 
@@ -411,30 +393,54 @@ unsigned long why2_compare_time_micro(struct timeval startTime, struct timeval f
 
 char *why2_generate_key(int key_length)
 {
-    int number_buffer;
+    int numberBuffer;
-    unsigned int random_buffer;
     char *key;
 
+    if (!seedSet)
+    {
+        why2_set_memory_identifier("core_key_generation_random");
+
+        //TRY TO MAKE RANDOM GENERATION REALLY "RANDOM"
+        FILE *fileBuffer;
+
+        fileBuffer = why2_fopen("/dev/urandom", "r");
+
+        if (fread(&numberBuffer, sizeof(numberBuffer), 1, fileBuffer) != 1)
+        {
+            if (!why2_get_flags().no_output) fprintf(stderr, "Reading file failed!\n");
+
+            why2_clean_memory("core_key_generation_random");
+            return NULL;
+        }
+
+        numberBuffer = abs(numberBuffer); //MAKE numberBuffer POSITIVE
+        srand(numberBuffer);
+
+        why2_deallocate(fileBuffer);
+
+        seedSet = 1;
+
+        why2_reset_memory_identifier();
+    }
+
     key = why2_malloc(key_length + 1);
 
     for (int i = 0; i < key_length; i++)
     {
-        //GET RANDOM NUMBER
-        if (getrandom(&random_buffer, sizeof(unsigned int), GRND_NONBLOCK) == -1) why2_die("getrandom fn failed!");
-
         //SET numberBuffer TO RANDOM NUMBER BETWEEN 0 AND 52
-        number_buffer = (random_buffer % 52) + 1;
+        numberBuffer = (rand() % 52) + 1;
 
         //GET CHAR FROM numberBuffer
-        if (number_buffer > 26)
+        if (numberBuffer > 26)
         {
-            number_buffer += 70;
+            numberBuffer += 70;
-        } else
+        }
+        else
         {
-            number_buffer += 64;
+            numberBuffer += 64;
         }
 
-        key[i] = (char) number_buffer;
+        key[i] = (char) numberBuffer;
     }
 
     key[key_length] = '\0';
@@ -486,8 +492,3 @@ char *why2_replace(char *string, char *old, char *new) //CODE FROM: https://www.
     result[i] = '\0';
     return result;
 }
-
-unsigned short why2_byte_format_length(char *s)
-{
-    return ((s[1] - 1) << 7) | (s[0] - 1); //ADD THE FIRST TWO INDEXES TOGETHER TO GET LENGTH
-}

src/logger/app/main.c

@@ -16,8 +16,7 @@ int main(void)
             1,
             1,
             0,
-            WHY2_v3,
+            WHY2_v3
-            WHY2_OUTPUT_TEXT
         }
     );
 

src/logger/lib/logger.c

@@ -132,7 +132,7 @@ void why2_write_log(int loggerFile, char *logMessage)
     why2_log_flags flags = why2_get_log_flags();
 
     //SET ENCRYPTER FLAGS
-    if (!why2_get_flags_changed()) why2_set_flags((why2_input_flags) { 0, 1, 0, WHY2_v3, WHY2_OUTPUT_TEXT });
+    if (!why2_get_flags_changed()) why2_set_flags((why2_input_flags) { 0, 1, 0, WHY2_v3 });
 
     if (flags.key != NULL) //ENCRYPT TEXT IF KEY WAS CHANGED
     {