v1.7.0 patch

Author: ArthurF23

Headers/Encryption/Compression/compressor.cpp

@@ -121,6 +121,9 @@ namespace COMPRESSION {
     string str;
 
     //First compression
+    //Say you have 2 bytes 0100001100111100
+    //That would be reduced to 010412021402
+    //01 is the same, then 04 means repeat 0 four times in decompression, 12 = 11 etc....
     for (int i = 0, increment = 0; i < input.length(); i++) {
       for (increment = 1;; increment++) {
         if (input[i] != input[i+increment] || increment == 9) {break;};

Headers/Encryption/encryption.cpp

@@ -178,7 +178,7 @@ namespace encryption {
     int i = 0;  
     //The first four of w [] are input keys  
     while(i < AESwords_in_key) {  
-        w[i] = _4Bytes2Word(AESKEY::key[4*i], AESKEY::key[4*i+1], AESKEY::key[4*i+2], AESKEY::key[4*i+3]);  
+        w[i] = _4Bytes2Word(AES::KEY::key[4*i], AES::KEY::key[4*i+1], AES::KEY::key[4*i+2], AES::KEY::key[4*i+3]);  
         ++i;  
     };
 
@@ -343,7 +343,7 @@ namespace encryption {
       for (int i = 0; i < bitsInByte; i++) {
         bin[i] = getRandomNum(0, 1);
       };
-      AESKEY::key[x] = bin;
+      AES::KEY::key[x] = bin;
     };
   };
 
@@ -355,7 +355,7 @@ namespace encryption {
       }
     else {
       for (int y = 0, n=0; y < mtx_size; y++, n+=bitsInByte) {
-        AESKEY::key[y] = CONVERSIONS::binStr_to_byte(dummykey.substr(n, n+bitsInByte));
+        AES::KEY::key[y] = CONVERSIONS::binStr_to_byte(dummykey.substr(n, n+bitsInByte));
       };
     };
     KeyExpansion(AES::global_expanded_key);
@@ -426,6 +426,7 @@ namespace encryption {
   /////////Pass through encrypt & decrypt functions//////
   /////////that input and output strings/////////////////
   ///////////////////////////////////////////////////////
+  AESbyte AES::KEY::key[mtx_size];
 
   /////////////
   ///Encrypt///

Headers/Encryption/encryption.h

@@ -12,7 +12,7 @@ constexpr unsigned short GLOBAL_MTX_SIZE = 4*4;
 namespace encryption {
 
   namespace VERSION {
-    static string ver = "v1.6.3";
+    static string ver = "v1.6.4";
     //Major, Minor, Patch
     //for major or minor, change patch to 0
   }
@@ -23,12 +23,6 @@ namespace encryption {
     //This is THE key, made like this so you can just pre set the key and it's used throught the header seamlessly orbyou can prompt the user for a key and generate a key easily or anything with KEY::key
     static unsigned int key = DEFAULT_KEY_NUM;
   }
-  namespace AESKEY {
-    static AESbyte key[GLOBAL_MTX_SIZE] =  {0x2b, 0x7e, 0x15, 0x16,   
-    0x28, 0xae, 0xd2, 0xa6,   
-    0xab, 0xf7, 0x15, 0x88,   
-    0x09, 0xcf, 0x4f, 0x3c};
-  }
   class VIGENERE_KEY {
     public:
     static string key;
@@ -266,6 +260,10 @@ namespace encryption {
       };
 
       public:
+      class KEY {
+        public:
+        static AESbyte key[GLOBAL_MTX_SIZE];
+      };
       enum OPTIONS {
         doGenerateKey = 0b00000000, 
         noGenerateKey = 0b00000001,

ReadMe.md

@@ -1,15 +1,9 @@
 ## Thank you for using my header!
 
-### v1.6.3
+### v1.7.0
 
 ### What's new?
-###### v1.6.0
-Added binary compression to `encryptFile()`. So when `encrypt()` outputs a binary string, it gets encrypted using lossless compression. It has a ratio of about 3:1 on the bee movie script which is what I use to test large files.
-
-###### v1.6.3
-Compression is now on all AES outputs 
-
-Removed bloat.
+Patched the AES key as the generated key was not being set to the key. Location has changed to `AES::KEY::key`. If you were using the previous version, `AESKEY::key` simply add `::` between `AES` and `KEY`.
 
 ## Basic Encryption
 The program has the key which is located through `encryption::KEY::key`, you will need to set this before using the `encryption::encdec::decrypt()` function, since that function grabs from the namespace to use it and the only thing you pass to that function is the string. You must set the key before you call that function. It's not a problem for the `encrypt()` function since it generates a key each time its called. The generated key is the same varible `encryption::KEY::key`. Anytime you need to grab the key or set it, it is there, it will be nowhere else.

main

@@ -36,8 +36,8 @@ void aesExample() {
 
   //Output key
   cout << "Key: ";
-  for(int i=0; i<sizeof(AESKEY::key)/sizeof(AESKEY::key[0]); ++i) {
-    cout << AESKEY::key[i] << " ";
+  for(int i=0; i<sizeof(AES::KEY::key)/sizeof(AES::KEY::key[0]); ++i) {
+    cout << AES::KEY::key[i] << " ";
   };
   cout << endl;
 
@@ -105,8 +105,8 @@ void wholeFileEncryptionExample() {
   AES::aes_init(AES::OPTIONS::doGenerateKey);
 
   cout << "Generated key: ";
-  for(int i=0; i<sizeof(AESKEY::key)/sizeof(AESKEY::key[0]); ++i) {
-    cout << AESKEY::key[i] << " ";
+  for(int i=0; i<sizeof(AES::KEY::key)/sizeof(AES::KEY::key[0]); ++i) {
+    cout << AES::KEY::key[i] << " ";
   };
   cout << endl << endl << endl;
 

main.cpp

@@ -1 +1 @@
-xTQ,"}`N,aC_}|}a,jWaV"\Tl
T^TnELzAWMB^TlTlA,_VpTjE(,jVJr'€"}F<y=,ly,l.j.^,aAWM,"}WJ]€<!:}MGJPABN~~DNF<\A#(WJM:}azxzx`lBN#_B^Va#2;
+LB^}@J}r'j'€JM:}L,}j+AzA,]j+.(zAW(HLz='Q.aWJ_y:}p.<yTlaVlz,jVa`aUSJO.aC_\|_:}aFJP=DM#/aXa`€lxDL=A]!."]yBO~)€<\.J}^`LC_:Lzx|1;