Code cleanup and ui fix.

Author: Satharus

AES-Encryption.asm

@@ -11,57 +11,91 @@ section .data
 message  TIMES 16 db 0
 key		 TIMES 16 db 0
 PromptMessage 	db 	"Enter the message: ",0
+PromptHex		db 	"Enter the 16 hex bytes without leading '0x', pad the bytes to be 2 digits wide:", 0xA
 PromptKey		db	"Enter the key: ", 0
 PromptDec		db 	"1.Encrypt", 0xA, "2.Decrypt", 0xA
 section .text
 _start:
-	; mov     eax, [esp+8]
-    ; call    SetSocketFromArg
-    ; mov     esi, prompt
-    ; mov     ecx, 30
-    ; call    WriteString
-    ; mov     bx, [socket]
-    ; xchg    bl, bh
-    ; movzx   eax, bx
-    ; call    WriteDec
-    ; call    WriteLine
-    
-    ; call InitialiseServer
-	mov esi, PromptMessage
+	cmp DWORD  [esp], 1
+	ja .server
+	;Ask whether to encrypt or decrypt
+	mov esi, PromptDec
 	mov ecx, 20
 	call WriteString
+	call ReadChar
+	cmp al, 0x31
+	jne .decrypt
 
+	;Print prompt for message
+	mov esi, PromptMessage
+	mov ecx, 20
+	call WriteString
+	;Read message
 	mov esi, message
 	mov ecx, 18
 	call ReadString
-
+	;Print prompt for key
 	mov esi, PromptKey
 	mov ecx, 15
 	call WriteString
-
+	;Read key
 	mov esi, key
 	mov ecx, 17
 	call ReadString
-
-	mov esi, PromptDec
-	mov ecx, 20
-	call WriteString
-	
-	call ReadChar
-	cmp al, 0x31
-	jne .decrypt
+	;Encrypt the message
 	mov esi, message
 	mov edi, key
 	call Encrypt
+
+	;Print the encrypted message
+	mov esi, message
+	call Print4x4Matrix
 	jmp .done
+
 	.decrypt:
+	;Print promp for encrypted message
+	mov esi, PromptHex
+	mov ecx, 80
+	call WriteString
+	;Read 16 bytes
+	mov esi, message
+	mov ecx, 16
+	.input:
+		call ReadHexByte
+		mov BYTE[esi], al
+		inc esi
+	loop .input
+	;Print prompt for key
+	mov esi, PromptKey
+	mov ecx, 15
+	call WriteString
+	;Read key
+	mov esi, key
+	mov ecx, 17
+	call ReadString
+	;Decrypt the string
 	mov esi, message
 	mov edi, key
 	call Decrypt
-	.done:
+	;Print decrypted string
 	mov esi, message
 	mov ecx, 16
 	call WriteString
+	jmp .done
+	.server:
+	mov     eax, [esp+8]
+    call    SetSocketFromArg
+    mov     esi, prompt
+    mov     ecx, 30
+    call    WriteString
+    mov     bx, [socket]
+    xchg    bl, bh
+    movzx   eax, bx
+    call    WriteDec
+    call    WriteLine
+    
+    call InitialiseServer
+	.done:
 	;Return zero
 	mov eax, 0x1
 	mov ebx, 0

ColumnMixing.inc

@@ -239,7 +239,7 @@ section .text
         jl .nextColumn
         ret
 
-
+    ;Prepares the galios field during the decryption phase
     GaliosDecryption:
     push eax 
     mov ecx, 16

Encryption.inc

@@ -1,8 +1,8 @@
-%include "Substitution.inc"	; Substitution functions
-%include "Rotation.inc"		; Rotation functions
-%include "ColumnMixing.inc"	; Column mixing functions
-%include "RoundKey.inc"		; Round key generation functions
-%include "AuxillaryFunctions.inc" 
+%include "Substitution.inc"	        ; Substitution functions
+%include "Rotation.inc"		        ; Rotation functions
+%include "ColumnMixing.inc"	        ; Column mixing functions
+%include "RoundKey.inc"		        ; Round key generation functions
+%include "AuxillaryFunctions.inc"   ; Auxillary misc. functions
 section .data
 mixedMessage TIMES 16 db 0
 currentRoundKey TIMES 16 db 0

IO.inc

@@ -24,7 +24,7 @@ ReadChar:
    	mov eax, 3		;sys_read systemcall
    	mov ebx, 0		;STDIN file descriptor
    	mov ecx, esp	;move the allocated dword address to ecx
-   	mov edx, 1		;Reading one byte
+   	mov edx, 2		;Reading one byte
    	int 80h			;Invoke the syscall
 
 	mov al, BYTE [esp] 	;Move the read value into al
@@ -103,6 +103,38 @@ WriteDec:
 	.done:
 	ret
 
+; Returns:
+;	al: value of the hex byte
+ReadHexByte:
+	push ecx
+	push esi
+	sub esp, 4		;allocate a dword on the stack
+   	mov eax, 3		;sys_read systemcall
+   	mov ebx, 0		;STDIN file descriptor
+   	mov ecx, esp	;move the allocated dword address to ecx
+   	mov edx, 3		;Reading 2 bytes
+   	int 80h			;Invoke the syscall
+	mov esi, esp
+
+	mov ecx, 2
+	.nextbyte:
+	cmp BYTE[esi], '9'
+	jle  .zeroto9
+		sub BYTE[esi], 0x27
+	.zeroto9:
+	sub BYTE[esi], 0x30
+	inc esi
+	loop .nextbyte
+	
+	movzx ax, BYTE [esp] 	;Move the read value into ax
+	shl	ax, 8
+	mov	al, BYTE [esp+1]
+	shl al, 4
+	shr ax, 4 
+	add esp, 4			;Clean up the stack
+	pop esi
+	pop ecx
+	ret
 ; Takes:
 ;	eax: value
 ; Prints the value in hexa (base-16)

Socket.inc

@@ -1,5 +1,5 @@
 section .data
-response db 'HTTP/1.1 200 OK', 0Dh, 0Ah, 'Content-Type: text/html', 0Dh, 0Ah, 'Content-Length: 16', 0Dh, 0Ah, 0Dh, 0Ah, 'ABCDABCDABCDABCD', 0Dh, 0Ah, 0h
+response db 'HTTP/1.1 200 OK', 0Dh, 0Ah, 'Content-Type: text/html', 0Dh, 0Ah, 'Content-Length: 16', 0Dh, 0Ah, 0Dh, 0Ah, 'TestMessage12345', 0Dh, 0Ah, 0h
 prompt   db 'Running on localhost at port: '
 section .bss
 buffer resb 255,    ; variable to store request headers
@@ -62,7 +62,7 @@ InitialiseServer:
 
     jmp .accept             ; jmp in parent process to _accept
     
-    ;Read the sent request
+    ;Read the received request
     .read:
     mov edx, 255            ; number of bytes to read (we will only read the first 255 bytes for simplicity)
     mov ecx, buffer         ; move the memory address of our buffer variable into ecx

Substitution.inc

@@ -1,7 +1,6 @@
 %include "SBOX.inc" ; File contining SBOX and its functions
 %include "SBOXInverse.inc"
-section .data 
-tmpbh db 0
+
 section .text
     ;Takes:
     ;   cl: value
@@ -31,7 +30,6 @@ section .text
     SubstituteMessage:
         .substitute:
             push ecx
-            mov [tmpbh],bh
             mov cl, [esi]
             call GetLowerNibble
             call GetHigherNibble