Add files via upload

Author: NikosDls

aes.c

@@ -565,6 +565,32 @@ unsigned int gfMul(unsigned int a, unsigned int b){
 	return r;
 }
 
+// this function converts string to unsigned int array 4x4
+void convertStringToBlock(char string[BYTES+1], unsigned int block[][BLOCK_SIZE]){
+	int i, j;	// counter for loops
+	
+	for(i = 0; i < BLOCK_SIZE; i++){
+		for(j = 0; j < BLOCK_SIZE; j++){
+			block[j][i] = string[BLOCK_SIZE * i + j]; 
+		}
+	}
+	
+return;
+}
+
+// this function converts unsigned int array 4x4 to string
+void convertBlockToString(unsigned int block[][BLOCK_SIZE], char string[BYTES+1]){
+	int i, j;	// counter for loops
+	
+	for(i = 0; i < BLOCK_SIZE; i++){
+		for(j = 0; j < BLOCK_SIZE; j++){
+			string[BLOCK_SIZE * i + j] = block[j][i]; 
+		}
+	}
+	
+return;
+}
+
 // this function prints the array
 void printArray(unsigned int array[][BLOCK_SIZE]){
 	int i, j;	// counters for the loops

aes.h

@@ -27,6 +27,8 @@ int hexCharToDec(char);
 void get2Bytes(unsigned int, unsigned int *, unsigned int *);
 void getRoundKey(unsigned int [], unsigned int [][BLOCK_SIZE], int);
 unsigned int gfMul(unsigned int, unsigned int);
+void convertStringToBlock(char [], unsigned int [][BLOCK_SIZE]);
+void convertBlockToString(unsigned int [][BLOCK_SIZE], char []);
 
 void printArray(unsigned int [][BLOCK_SIZE]);
 

main.c

@@ -8,7 +8,7 @@ int main(){
 	unsigned char plainText[BYTES+1];	// plaintext	
 	unsigned char cipherText[BYTES+1];	// ciphertext
 	unsigned char key[BYTES+1];			// encryption key
-	unsigned char output[BYTES+1];		// strign to prints the results
+	unsigned char output[BYTES+1];		// string to prints the results
 
 	int answer;		// user answer
 
@@ -38,8 +38,8 @@ int main(){
 			readInput(key);
 
 			// convert plaintext and key to 4x4 blocks
-			convertStringTo4x4Block(plainText, state4x4);
-			convertStringTo4x4Block(key, key4x4);
+			convertStringToBlock(plainText, state4x4);
+			convertStringToBlock(key, key4x4);
 
 			// we calculate all round keys 1-10
 			key_schedule(w, key4x4);
@@ -48,7 +48,7 @@ int main(){
 			encryption(state4x4, w);
 
 			// print the output to user as string
-			convert4x4BlockToString(state4x4, output);
+			convertBlockToString(state4x4, output);
 			output[BYTES] = '\0';
 			printf("Ciphertext: %s", output);
 			break;
@@ -63,8 +63,8 @@ int main(){
 			readInput(key);
 
 			// convert ciphertext and key to 4x4 blocks
-			convertStringTo4x4Block(cipherText, state4x4);
-			convertStringTo4x4Block(key, key4x4);
+			convertStringToBlock(cipherText, state4x4);
+			convertStringToBlock(key, key4x4);
 
 			// we calculate all round keys 1-10
 			key_schedule(w, key4x4);
@@ -73,7 +73,7 @@ int main(){
 			decryption(state4x4, w);
 
 			// print the output to user as string
-			convert4x4BlockToString(state4x4, output);
+			convertBlockToString(state4x4, output);
 			output[BYTES] = '\0';
 			printf("Plaintext: %s", output);
 			break;
@@ -88,18 +88,18 @@ int main(){
 			readInput(key);
 
 			// convert plaintext and key to 4x4 blocks
-			convertStringTo4x4Block(plainText, state4x4);
-			convertStringTo4x4Block(key, key4x4);
+			convertStringToBlock(plainText, state4x4);
+			convertStringToBlock(key, key4x4);
 
 			// we calculate all round keys 1-10
 			key_schedule(w, key4x4);
 
-			printf("ENCRYPTION\n");
+			printf("\nENCRYPTION\n");
 			// encrypt the plaintext
 			encryption(state4x4, w);
 
 			// print the output to user as string
-			convert4x4BlockToString(state4x4, output);
+			convertBlockToString(state4x4, output);
 			output[BYTES] = '\0';
 			printf("Ciphertext: %s\n", output);
 			printf("END OF ENCRYPTION\n");
@@ -109,7 +109,7 @@ int main(){
 			decryption(state4x4, w);
 
 			// print the output to user as string
-			convert4x4BlockToString(state4x4, output);
+			convertBlockToString(state4x4, output);
 			output[BYTES] = '\0';
 			printf("Plaintext: %s\n", output);
 			printf("END OF DECRYPTION\n");

read.c

@@ -4,8 +4,6 @@
 #include "aes.h"
 
 void readInput(char []);
-void convertStringTo4x4Block(char [], unsigned int [][BLOCK_SIZE]);
-void convert4x4BlockToString(unsigned int [][BLOCK_SIZE], char []);
 
 // this function reads the user input
 void readInput(char input[BYTES+1]){
@@ -25,29 +23,3 @@ void readInput(char input[BYTES+1]){
 
 return;
 }
-
-// this function converts string to unsigned int array 4x4
-void convertStringTo4x4Block(char string[BYTES+1], unsigned int block[][BLOCK_SIZE]){
-	int i, j;	// counter for loops
-	
-	for(i = 0; i < BLOCK_SIZE; i++){
-		for(j = 0; j < BLOCK_SIZE; j++){
-			block[j][i] = string[BLOCK_SIZE * i + j]; 
-		}
-	}
-	
-return;
-}
-
-// this function converts unsigned int array 4x4 to string
-void convert4x4BlockToString(unsigned int block[][BLOCK_SIZE], char string[BYTES+1]){
-	int i, j;	// counter for loops
-	
-	for(i = 0; i < BLOCK_SIZE; i++){
-		for(j = 0; j < BLOCK_SIZE; j++){
-			string[BLOCK_SIZE * i + j] = block[j][i]; 
-		}
-	}
-	
-return;
-}