Cleanup pass (#41)

* Removed old satp checks, that check is now handled by tracking hart state and enforcement in the driver. Standardized the sbi function style

* Removed all definition of _t types, as they are reserved. All structs are now referenced explictly as structs, not typedefd. See keystone-enclave/keystone#76 .

* Removed extraneous aes implementation

sm/attest.c

@@ -8,9 +8,9 @@
 
 /* This will walk the entire vaddr space in the enclave, validating
    linear at-most-once paddr mappings, and then hashing valid pages */
-int validate_and_hash_epm(hash_ctx_t* hash_ctx, int level,
+int validate_and_hash_epm(hash_ctx* hash_ctx, int level,
                           pte_t* tb, uintptr_t vaddr, int contiguous,
-                          struct keystone_sbi_create_t* cargs,
+                          struct keystone_sbi_create* cargs,
                           uintptr_t* runtime_max_seen,
                           uintptr_t* user_max_seen)
 {
@@ -154,10 +154,10 @@ int validate_and_hash_epm(hash_ctx_t* hash_ctx, int level,
   return -1;
 }
 
-enclave_ret_t validate_and_hash_enclave(struct enclave_t* enclave,
-                                        struct keystone_sbi_create_t* cargs){
+enclave_ret_code validate_and_hash_enclave(struct enclave* enclave,
+                                        struct keystone_sbi_create* cargs){
 
-  hash_ctx_t hash_ctx;
+  hash_ctx hash_ctx;
   int ptlevel = RISCV_PGLEVEL_TOP;
   int i;
 

sm/cpu.c

@@ -4,7 +4,7 @@
 //------------------------------------------------------------------------------
 #include "cpu.h"
 
-static struct cpu_state_t cpus[MAX_HARTS];
+static struct cpu_state cpus[MAX_HARTS];
 
 int cpu_is_enclave_context()
 {
@@ -16,7 +16,7 @@ int cpu_get_enclave_id()
   return cpus[read_csr(mhartid)].eid;
 }
 
-void cpu_enter_enclave_context(eid_t eid)
+void cpu_enter_enclave_context(enclave_id eid)
 {
   cpus[read_csr(mhartid)].is_enclave = 1;
   cpus[read_csr(mhartid)].eid = eid;

sm/cpu.h

@@ -9,16 +9,16 @@
 #include "enclave.h"
 
 /* hart state for regulating SBI */
-struct cpu_state_t
+struct cpu_state
 {
   int is_enclave;
-  eid_t eid;
+  enclave_id eid;
 };
 
 /* external functions */
 int cpu_is_enclave_context();
 int cpu_get_enclave_id();
-void cpu_enter_enclave_context(eid_t eid);
+void cpu_enter_enclave_context(enclave_id eid);
 void cpu_exit_enclave_context();
 
 #endif

sm/crypto.c

@@ -5,22 +5,22 @@
 #include "crypto.h"
 #include "page.h"
 
-void hash_init(hash_ctx_t* hash_ctx)
+void hash_init(hash_ctx* hash_ctx)
 {
   sha3_init(hash_ctx, MDSIZE);
 }
 
-void hash_extend(hash_ctx_t* hash_ctx, const void* ptr, size_t len)
+void hash_extend(hash_ctx* hash_ctx, const void* ptr, size_t len)
 {
   sha3_update(hash_ctx, ptr, len);
 }
 
-void hash_extend_page(hash_ctx_t* hash_ctx, const void* ptr)
+void hash_extend_page(hash_ctx* hash_ctx, const void* ptr)
 {
   sha3_update(hash_ctx, ptr, RISCV_PGSIZE);
 }
 
-void hash_finalize(void* md, hash_ctx_t* hash_ctx)
+void hash_finalize(void* md, hash_ctx* hash_ctx)
 {
   sha3_final(md, hash_ctx);
 }

sm/crypto.h

@@ -9,7 +9,7 @@
 #include "sha3/sha3.h"
 #include "ed25519/ed25519.h"
 
-typedef sha3_ctx_t hash_ctx_t;
+typedef sha3_ctx_t hash_ctx;
 #define MDSIZE  64
 
 #define SIGNATURE_SIZE  64
@@ -23,10 +23,10 @@ extern byte sm_signature[SIGNATURE_SIZE];
 extern byte sm_public_key[PUBLIC_KEY_SIZE];
 extern byte sm_private_key[PRIVATE_KEY_SIZE];
 
-void hash_init(hash_ctx_t* hash_ctx);
-void hash_extend(hash_ctx_t* hash_ctx, const void* ptr, size_t len);
-void hash_extend_page(hash_ctx_t* hash_ctx, const void* ptr);
-void hash_finalize(void* md, hash_ctx_t* hash_ctx);
+void hash_init(hash_ctx* hash_ctx);
+void hash_extend(hash_ctx* hash_ctx, const void* ptr, size_t len);
+void hash_extend_page(hash_ctx* hash_ctx, const void* ptr);
+void hash_finalize(void* md, hash_ctx* hash_ctx);
 
 void sign(void* sign, const void* data, size_t len, const byte* public_key, const byte* private_key);
 #endif /* crypto.h */