Cleaned up README and files

Author: Matt Manzi

README.md

@@ -1,13 +1,9 @@
 # DS-DEA
 _Matt Manzi_  
-_Project 2 of CMSC 487, Spring 2020._
 
 An implementation of the Simplified Data Encryption Standard (S-DES) and Double Simplified Data Encryption Algorithm (DS-DEA).
 
-This implementation includes code to run meet-in-the-middle and brute force attacks on the hardcoded set of plaintext/ciphertext pairs listed below:
-```
-0x42/0x52, 0x72/0xf0, 0x75/0xbe, 0x74/0x69, 0x65/0x8a
-```
+This implementation includes code to run meet-in-the-middle and brute force attacks on a hardcoded set of plaintext/ciphertext pairs listed in the following section.
 
 ## Installation and Usage
 
@@ -18,7 +14,13 @@ Once installed, enter the top-level project directory.  Run the code with the fo
 swift run DSDEA test|mitm|brute|decrypt
 ```
 
-## Project Answers
+## Attack Tests
+
+The following plaintext/ciphertext pairs listed below correspond to a key pair combination:
+```
+0x42/0x52, 0x72/0xf0, 0x75/0xbe, 0x74/0x69, 0x65/0x8a
+```
+The keys can be determined using the provided code.  See below for expected results.
 
 ### Found Keys
 
@@ -34,19 +36,6 @@ Below are the time for one run of each of meet-in-the-middle and brute force att
 * MITM: **1.176 seconds**
 * Brute Force: **3:30.07 minutes**
 
-<img src="times.png" alt="The time elapsed for a single meet-in-the-middle and brute force attack, respectively." />
-
-### Decrypted Message
-
-The given ciphertext:
-```
-0x586519b031aaee9a235247601fb37baefbcd54d8c3763f8523d2a1315ed8bdcc
-```
-decrypted with the keys found above will produce the (UTF-8-enocded) plaintext:
-```
-Congratulations on your success!
-```
-
 ### Weak Keys
 
 There are **4** weak keys for S-DES:

Sources/DSDEA/DSDEA.swift

@@ -4,7 +4,6 @@
 //  Algorithm (DS-DEA).
 //
 //  Created by Matt Manzi on 3/1/20.
-//  Project 2 of CMSC 487, Spring 2020.
 //
 
 import Foundation
@@ -14,60 +13,60 @@ let IV: UInt8 = 0x9c
 
 /// The user-facing portion of DS-DEA which uses double S-DES in CBC mode.
 public class DSDEA {
-    
+
     /// An instance of the core SDES functionality class.
     private static let core = SDESCore()
-    
+
     /**
     Encrypts a data array using the provided keys, based on the DS-DEA specification in CBC mode.
-    
+
     - Postcondition: The returned array will be the same size as the original.
-    
+
     - Parameter data: The data to encrypt.
     - Parameter keys: The two keys to encrypt the data with.
-    
+
     - Returns: The `keys`-encrypted data.
     */
     public static func encrypt(_ data: [UInt8],
                                with keys: [UInt16]) -> [UInt8] {
         var c: UInt8 = IV
         var out: [UInt8] = []
-        
+
         // double-encrypt each block
         for i in data {
             c = core.encrypt(core.encrypt(i ^ c, with: keys[0]), with: keys[1])
             out.append(c)
         }
-        
+
         return out
     }
-    
+
     /**
      Decrypts a data array using the provided keys, based on the DS-DEA specification in CBC mode.
-     
+
      - Postcondition: The returned array will be the same size as the original.
-     
+
      - Parameter data: The data to decrypt.
      - Parameter keys: The two keys to decrypt the data with.
-     
+
      - Returns: The `keys`-decrypted data.
      */
     public static func decrypt(_ data: [UInt8],
                                with keys: [UInt16]) -> [UInt8] {
         var c: UInt8 = IV
         var p: UInt8 = 0x00
         var out: [UInt8] = []
-        
+
         // double-decrypt each block
         for i in data {
             p = core.decrypt(core.decrypt(i, with: keys[1]), with: keys[0]) ^ c
             out.append(p)
-            
+
             // keep the current ciphertext for the XOR for the next decryption
             c = i
         }
-        
+
         return out
     }
-    
+
 }