rename init to finalize

keystone-enclave · Mar 27, 2024 · 2a5afeb · 2a5afeb
1 parent b49b3be
commit 2a5afeb
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/examples/attestation/host/host.cpp b/examples/attestation/host/host.cpp
@@ -235,7 +235,7 @@ Host::dispatch_ocall(RunData& run_data) {
 Report
 Host::run(const std::string& nonce) {
   Keystone::Enclave enclave;
-  enclave.init(eapp_file_.c_str(), rt_file_.c_str(), ld_file_.c_str(), params_);
+  enclave.finalize(eapp_file_.c_str(), rt_file_.c_str(), ld_file_.c_str(), params_);
 
   RunData run_data{
       SharedBuffer{enclave.getSharedBuffer(), enclave.getSharedBufferSize()},

diff --git a/examples/hello-native/host/host_native.cpp b/examples/hello-native/host/host_native.cpp
@@ -30,7 +30,7 @@ main(int argc, char** argv) {
   params.setFreeMemSize(1024 * 1024);
   params.setUntrustedSize(1024 * 1024);
 
-  enclave.init(argv[1], argv[2], argv[3], params);
+  enclave.finalize(argv[1], argv[2], argv[3], params);
 
   enclave.registerOcallDispatch(incoming_call_dispatch);
 

diff --git a/examples/hello/host/host.cpp b/examples/hello/host/host.cpp
@@ -15,7 +15,7 @@ main(int argc, char** argv) {
   params.setFreeMemSize(256 * 1024);
   params.setUntrustedSize(256 * 1024);
 
-  enclave.init(argv[1], argv[2], argv[3], params);
+  enclave.finalize(argv[1], argv[2], argv[3], params);
 
   enclave.registerOcallDispatch(incoming_call_dispatch);
   edge_call_init_internals(

diff --git a/examples/tests/test-runner.cpp b/examples/tests/test-runner.cpp
@@ -117,7 +117,7 @@ main(int argc, char** argv) {
     asm volatile("rdcycle %0" : "=r"(cycles1));
   }
 
-  enclave.init(eapp_file, rt_file, ld_file, params);
+  enclave.finalize(eapp_file, rt_file, ld_file, params);
 
   if (self_timing) {
     asm volatile("rdcycle %0" : "=r"(cycles2));

diff --git a/sdk/include/host/Enclave.hpp b/sdk/include/host/Enclave.hpp
@@ -64,15 +64,15 @@ class Enclave {
 
  public:
   Enclave();
+  Enclave(Params params);
   ~Enclave();
   Error measureSelf(char* hash);
   static Error measure(char* hash, const char* eapppath, const char* runtimepath, const char* loaderpath, Params params);
   // shared buffer is utm
   void* getSharedBuffer();
   size_t getSharedBufferSize();
   Error registerOcallDispatch(OcallFunc func);
-  // TODO(Evgeny): rename init to something else. finalize?
-  Error init(const char* filepath, const char* runtime, const char* loaderpath, Params parameters);
+  Error finalize(const char* filepath, const char* runtime, const char* loaderpath, Params _params);
   Error destroy();
   Error run(uintptr_t* ret = nullptr);
 

diff --git a/sdk/src/host/Enclave.cpp b/sdk/src/host/Enclave.cpp
@@ -17,6 +17,9 @@ namespace Keystone {
 Enclave::Enclave() {
 }
 
+Enclave::Enclave(Params params) : params(params) {
+}
+
 Enclave::~Enclave() {
   assert(destroy() == Error::Success);
 }
@@ -283,7 +286,7 @@ Enclave::finalize() {
 }
 
 Error
-Enclave::init(const char* eapppath, const char* runtimepath, const char* loaderpath, Params _params) {
+Enclave::finalize(const char* eapppath, const char* runtimepath, const char* loaderpath, Params _params) {
   params = _params;
 
   Error err = addStandard(eapppath, runtimepath, loaderpath);