Rename oak_restricted_kernel_api to oak_restricted_kernel_sdk

Cargo.toml

@@ -44,8 +44,8 @@ members = [
   "oak_launcher_utils",
   "oak_remote_attestation",
   "oak_restricted_kernel",
-  "oak_restricted_kernel_api",
   "oak_restricted_kernel_interface",
+  "oak_restricted_kernel_sdk",
   "oak_sev_guest",
   "oak_simple_io",
   "oak_tdx_guest",
@@ -98,7 +98,7 @@ oak_launcher_utils = { path = "./oak_launcher_utils" }
 oak_linux_boot_params = { path = "./linux_boot_params" }
 oak_logger = { path = "./oak_functions/logger" }
 oak_remote_attestation = { path = "./oak_remote_attestation" }
-oak_restricted_kernel_api = { path = "./oak_restricted_kernel_api" }
+oak_restricted_kernel_sdk = { path = "./oak_restricted_kernel_sdk" }
 oak_restricted_kernel_interface = { path = "./oak_restricted_kernel_interface" }
 oak_sev_guest = { path = "./oak_sev_guest", default-features = false }
 oak_simple_io = { path = "./oak_simple_io" }

FORCE_CI

@@ -1 +1 @@
-22
+23

enclave_apps/Cargo.toml

@@ -12,6 +12,6 @@ micro_rpc = { path = "../micro_rpc" }
 oak_enclave_runtime_support = { path = "../oak_enclave_runtime_support" }
 oak_channel = { path = "../oak_channel" }
 oak_core = { path = "../oak_core" }
-oak_restricted_kernel_api = { path = "../oak_restricted_kernel_api" }
+oak_restricted_kernel_sdk = { path = "../oak_restricted_kernel_sdk" }
 oak_restricted_kernel_interface = { path = "../oak_restricted_kernel_interface" }
 oak_remote_attestation = { path = "../oak_remote_attestation" }

enclave_apps/key_xor_test_app/Cargo.toml

@@ -10,7 +10,7 @@ log = "*"
 micro_rpc = { workspace = true }
 oak_enclave_runtime_support = { workspace = true }
 oak_channel = { workspace = true }
-oak_restricted_kernel_api = { workspace = true }
+oak_restricted_kernel_sdk = { workspace = true }
 oak_restricted_kernel_interface = { workspace = true }
 static_assertions = "*"
 

enclave_apps/key_xor_test_app/src/main.rs

@@ -23,8 +23,8 @@ extern crate alloc;
 use core::panic::PanicInfo;
 use log::info;
 use oak_channel::{Read, Write};
-use oak_restricted_kernel_api::{syscall::read, FileDescriptorChannel, StderrLogger};
 use oak_restricted_kernel_interface::DERIVED_KEY_FD;
+use oak_restricted_kernel_sdk::{syscall::read, FileDescriptorChannel, StderrLogger};
 
 static LOGGER: StderrLogger = StderrLogger {};
 
@@ -66,5 +66,5 @@ fn out_of_memory(layout: ::core::alloc::Layout) -> ! {
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
     log::error!("PANIC: {}", info);
-    oak_restricted_kernel_api::syscall::exit(-1);
+    oak_restricted_kernel_sdk::syscall::exit(-1);
 }

enclave_apps/oak_echo_enclave_app/Cargo.toml

@@ -12,7 +12,7 @@ micro_rpc = { workspace = true }
 oak_enclave_runtime_support = { workspace = true }
 oak_channel = { workspace = true }
 oak_core = { workspace = true }
-oak_restricted_kernel_api = { workspace = true }
+oak_restricted_kernel_sdk = { workspace = true }
 static_assertions = "*"
 
 [[bin]]

enclave_apps/oak_echo_enclave_app/src/main.rs

@@ -24,7 +24,7 @@ use alloc::boxed::Box;
 use core::panic::PanicInfo;
 use log::info;
 use oak_core::samplestore::StaticSampleStore;
-use oak_restricted_kernel_api::{FileDescriptorChannel, StderrLogger};
+use oak_restricted_kernel_sdk::{FileDescriptorChannel, StderrLogger};
 
 static LOGGER: StderrLogger = StderrLogger {};
 
@@ -63,5 +63,5 @@ fn out_of_memory(layout: ::core::alloc::Layout) -> ! {
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
     log::error!("PANIC: {}", info);
-    oak_restricted_kernel_api::syscall::exit(-1);
+    oak_restricted_kernel_sdk::syscall::exit(-1);
 }

enclave_apps/oak_echo_raw_enclave_app/Cargo.toml

@@ -10,7 +10,7 @@ log = "*"
 micro_rpc = { workspace = true }
 oak_enclave_runtime_support = { workspace = true }
 oak_channel = { workspace = true }
-oak_restricted_kernel_api = { workspace = true }
+oak_restricted_kernel_sdk = { workspace = true }
 static_assertions = "*"
 
 [[bin]]

enclave_apps/oak_echo_raw_enclave_app/src/main.rs

@@ -24,7 +24,7 @@ use alloc::{vec, vec::Vec};
 use core::panic::PanicInfo;
 use log::info;
 use oak_channel::{Read, Write};
-use oak_restricted_kernel_api::{FileDescriptorChannel, StderrLogger};
+use oak_restricted_kernel_sdk::{FileDescriptorChannel, StderrLogger};
 
 const MESSAGE_SIZE: usize = 1;
 
@@ -65,5 +65,5 @@ fn out_of_memory(layout: ::core::alloc::Layout) -> ! {
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
     log::error!("PANIC: {}", info);
-    oak_restricted_kernel_api::syscall::exit(-1);
+    oak_restricted_kernel_sdk::syscall::exit(-1);
 }

enclave_apps/oak_functions_enclave_app/Cargo.toml

@@ -21,7 +21,7 @@ oak_enclave_runtime_support = { workspace = true }
 oak_core = { workspace = true }
 oak_channel = { workspace = true }
 oak_remote_attestation = { workspace = true }
-oak_restricted_kernel_api = { workspace = true }
+oak_restricted_kernel_sdk = { workspace = true }
 static_assertions = "*"
 
 [[bin]]

enclave_apps/oak_functions_enclave_app/src/main.rs

@@ -24,7 +24,7 @@ use alloc::{boxed::Box, sync::Arc};
 use core::panic::PanicInfo;
 use log::info;
 use oak_core::samplestore::StaticSampleStore;
-use oak_restricted_kernel_api::{FileDescriptorChannel, StderrLogger};
+use oak_restricted_kernel_sdk::{FileDescriptorChannel, StderrLogger};
 
 static LOGGER: StderrLogger = StderrLogger {};
 
@@ -45,7 +45,7 @@ fn main() -> ! {
         log::set_max_level(log::LevelFilter::Warn);
     }
     let mut invocation_stats = StaticSampleStore::<1000>::new().unwrap();
-    let dice_data = oak_restricted_kernel_api::dice::get_dice_evidence_and_keys()
+    let dice_data = oak_restricted_kernel_sdk::dice::get_dice_evidence_and_keys()
         .expect("couldn't get DICE data");
     let service = oak_functions_service::OakFunctionsService::new(
         dice_data.evidence,
@@ -68,5 +68,5 @@ fn out_of_memory(layout: ::core::alloc::Layout) -> ! {
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
     log::error!("PANIC: {}", info);
-    oak_restricted_kernel_api::syscall::exit(-1);
+    oak_restricted_kernel_sdk::syscall::exit(-1);
 }

oak_enclave_runtime_support/Cargo.toml

@@ -10,6 +10,6 @@ license = "Apache-2.0"
 libm = "*"
 rlsf = "*"
 log = "*"
-oak_restricted_kernel_api = { workspace = true }
+oak_restricted_kernel_sdk = { workspace = true }
 oak_restricted_kernel_interface = { workspace = true }
 spinning_top = "*"

oak_enclave_runtime_support/src/heap.rs

@@ -39,7 +39,7 @@ unsafe impl FlexSource for Source {
             min_size
         };
 
-        oak_restricted_kernel_api::syscall::mmap(
+        oak_restricted_kernel_sdk::syscall::mmap(
             // TODO(#3864): One we start compiling C++ applications internally using the Oak
             // Toolchain, we won't need to manually separate Rust and C++ heaps.
             Some(0x100_0000_0000 as *const core::ffi::c_void),

oak_restricted_kernel_api/Cargo.toml → oak_restricted_kernel_sdk/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "oak_restricted_kernel_api"
+name = "oak_restricted_kernel_sdk"
 version = "0.1.0"
 authors = ["Andri Saar <[email protected]>"]
 edition = "2021"