7-SGX_Hands-on/README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Usage
 ## Setup
 Initialize the Enclave keypair by executing:
@@ -11,3 +12,40 @@ Initialize the Enclave keypair by executing:
 3. Verify signature using `cat <proxy_signature.der> | ./signatureproxy embedded -firm <firmware.bin> -ppub <proxy_public_key.pem>` 
    This step can also be done using OpenSSL: `openssl dgst -sha256 -verify <proxy_public_key.pem> -signature <proxy-signature.der> <firmware.bin>`
     
+=======
+# Signature Relay for firmware
+
+Documentation of 
+
+## Compiling
+
+This project can be compiled for simulation environments or directly on the hardware.
+
+1. **Simulated environment**
+
+At project root type the command
+
+```bash
+$ make SGX_MODE=SIM
+```
+
+2. **Hardware**
+
+At project root type the command
+
+```bash
+$ make
+```
+
+This creates the following directory tree:
+
+```
+out
+├── bin <- here is the executable binary file
+└── obj <- here are the object files generated by the compiling process
+``` 
+
+## Usage
+
+
+>>>>>>> c1d9d30 (Assignment 7 sgximpl: README.md compiling)