From fca61640198e19bdfae9e267c95235f45112aeb8 Mon Sep 17 00:00:00 2001 From: envlearner Date: Tue, 11 Apr 2023 14:19:43 +0800 Subject: [PATCH] Fix some typo errors including both doc/comment typo errors and code typo errors --- tools/copy_bom/src/bom.rs | 8 ++++---- tools/docker/Dockerfile.aliyunlinux3 | 2 +- tools/docker/Dockerfile.anolis8.4 | 2 +- tools/docker/Dockerfile.centos8.2 | 2 +- tools/docker/Dockerfile.ubuntu18.04 | 2 +- tools/docker/Dockerfile.ubuntu20.04 | 2 +- tools/gen_internal_conf/src/main.rs | 4 ++-- tools/installer/README.md | 4 ++-- tools/protect-integrity/App/App.cpp | 2 +- tools/protect-integrity/Enclave.edl | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/copy_bom/src/bom.rs b/tools/copy_bom/src/bom.rs index b41fd5aa..04606b1d 100644 --- a/tools/copy_bom/src/bom.rs +++ b/tools/copy_bom/src/bom.rs @@ -1,5 +1,5 @@ //! This file defines data structures to store contents in bom file -//! as well as all management on these strcutures. +//! as well as all management on these structures. //! Structures `Bom`, `Target`, `SymLink`, `Source`, `NormalFile`, `FileWithOption` //! are used to parse the bom file. //! Structures ending with `management` are used to define managements on different levels. @@ -581,7 +581,7 @@ impl TargetManagement { /// There is also a max_iteration bound. If the loop exceeds the bound and the queue is not empty, the function will abort the program. /// Because excess of the bound often means there's a reference cycles in the bom tree, which is an invalid case. /// After we visit all boms in the queue, we will get all boms sorted in the order of being included in the vector. -/// Then we will remove redudant boms in the vector. For a bom file that may exist more than one time, +/// Then we will remove redundant boms in the vector. For a bom file that may exist more than one time, /// only the last one will be kept in the final result. To remove redundancy, we will reverse the vector, /// and only keep the first one for each duplicate bom. fn find_all_included_bom_files(bom_file: &str, included_dirs: &Vec) -> Vec { @@ -624,7 +624,7 @@ fn find_all_included_bom_files(bom_file: &str, included_dirs: &Vec) -> V fn remove_redundant(bom_managements: &mut Vec) { remove_redundant_mkdir(bom_managements); remove_redundant_createlink(bom_managements); - remove_redudant_copydir(bom_managements); + remove_redundant_copydir(bom_managements); remove_redundant_copyfile(bom_managements); } @@ -665,7 +665,7 @@ fn remove_redundant_createlink(bom_managements: &mut Vec) { /// If multiple operation tries to copy dir to the same dest, Only the *LAST* copy dir will reserve. /// Known limitations: if the source dir does not have filename, e.g., /home/root/, it will not be analyzed now. -fn remove_redudant_copydir(bom_managements: &mut Vec) { +fn remove_redundant_copydir(bom_managements: &mut Vec) { // reverse, then can save the first operation bom_managements.reverse(); let mut all_copydirs = HashSet::new(); diff --git a/tools/docker/Dockerfile.aliyunlinux3 b/tools/docker/Dockerfile.aliyunlinux3 index 46526427..62147c23 100644 --- a/tools/docker/Dockerfile.aliyunlinux3 +++ b/tools/docker/Dockerfile.aliyunlinux3 @@ -193,7 +193,7 @@ RUN cd occlum && \ # # To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM # as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interative shell. +# up AESM service when an user login with an interactive shell. RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc WORKDIR /root diff --git a/tools/docker/Dockerfile.anolis8.4 b/tools/docker/Dockerfile.anolis8.4 index 662eb421..a7a86ea3 100644 --- a/tools/docker/Dockerfile.anolis8.4 +++ b/tools/docker/Dockerfile.anolis8.4 @@ -196,7 +196,7 @@ RUN cd occlum && \ # # To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM # as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interative shell. +# up AESM service when an user login with an interactive shell. RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc WORKDIR /root diff --git a/tools/docker/Dockerfile.centos8.2 b/tools/docker/Dockerfile.centos8.2 index 3c5e3a23..9f19bf16 100644 --- a/tools/docker/Dockerfile.centos8.2 +++ b/tools/docker/Dockerfile.centos8.2 @@ -181,7 +181,7 @@ RUN cd occlum && \ # # To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM # as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interative shell. +# up AESM service when an user login with an interactive shell. RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc WORKDIR /root diff --git a/tools/docker/Dockerfile.ubuntu18.04 b/tools/docker/Dockerfile.ubuntu18.04 index c9601f12..f3bd2586 100644 --- a/tools/docker/Dockerfile.ubuntu18.04 +++ b/tools/docker/Dockerfile.ubuntu18.04 @@ -192,7 +192,7 @@ RUN cd occlum && \ # # To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM # as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interative shell. +# up AESM service when an user login with an interactive shell. RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc WORKDIR /root diff --git a/tools/docker/Dockerfile.ubuntu20.04 b/tools/docker/Dockerfile.ubuntu20.04 index b87ff476..1e437955 100644 --- a/tools/docker/Dockerfile.ubuntu20.04 +++ b/tools/docker/Dockerfile.ubuntu20.04 @@ -196,7 +196,7 @@ RUN cd occlum && \ # # To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM # as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interative shell. +# up AESM service when an user login with an interactive shell. RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc WORKDIR /root diff --git a/tools/gen_internal_conf/src/main.rs b/tools/gen_internal_conf/src/main.rs index 0695dfd4..045b7518 100644 --- a/tools/gen_internal_conf/src/main.rs +++ b/tools/gen_internal_conf/src/main.rs @@ -147,7 +147,7 @@ fn main() { let occlum_user_json_file_path = sub_matches.value_of("output_user_json").unwrap(); debug!( - "Genereated Occlum user config (json) file name {:?}", + "Generated Occlum user config (json) file name {:?}", occlum_user_json_file_path ); @@ -317,7 +317,7 @@ fn main() { let occlum_sys_json_file_path = sub_matches.value_of("sys_json").unwrap(); debug!( - "Genereated Occlum sys config (json) file name {:?}", + "Generated Occlum sys config (json) file name {:?}", occlum_sys_json_file_path ); diff --git a/tools/installer/README.md b/tools/installer/README.md index aad6082a..2c4a6add 100644 --- a/tools/installer/README.md +++ b/tools/installer/README.md @@ -40,7 +40,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libcur ``` **Step 2. Install Intel® SGX driver and Intel® SGX PSW** -Please follow [Intel SGX Installation Guide](https://download.01.org/intel-sgx/sgx-linux/2.15.1/docs/Intel_SGX_SW_Installation_Guide_for_Linux.pdf) to install SGX driver and SGX PSW. SGX SDK is not required. Using PSW installer is recommanded. +Please follow [Intel SGX Installation Guide](https://download.01.org/intel-sgx/sgx-linux/2.15.1/docs/Intel_SGX_SW_Installation_Guide_for_Linux.pdf) to install SGX driver and SGX PSW. SGX SDK is not required. Using PSW installer is recommended. To install PSW, follow the guide to add Intel® SGX repository to apt source. And then run: ``` @@ -134,7 +134,7 @@ yum install -y ocaml ocaml-ocamlbuild ``` **Step 2. Install Intel® SGX driver and Intel® SGX PSW** -Please follow [Intel SGX Installation Guide](https://download.01.org/intel-sgx/sgx-linux/2.13/docs/Intel_SGX_Installation_Guide_Linux_2.13_Open_Source.pdf) to install SGX driver and SGX PSW. SGX SDK is not required. Using RPM installer is recommanded. +Please follow [Intel SGX Installation Guide](https://download.01.org/intel-sgx/sgx-linux/2.13/docs/Intel_SGX_Installation_Guide_Linux_2.13_Open_Source.pdf) to install SGX driver and SGX PSW. SGX SDK is not required. Using RPM installer is recommended. Also, UAE service libraries are needed but may not installed together with SGX PSW if SGX PSW installer is used. Go to SGX RPM local repo and run: ``` diff --git a/tools/protect-integrity/App/App.cpp b/tools/protect-integrity/App/App.cpp index bbf31459..2e26de93 100644 --- a/tools/protect-integrity/App/App.cpp +++ b/tools/protect-integrity/App/App.cpp @@ -207,7 +207,7 @@ static int initialize_enclave(void) { return 0; } - /* reopen the file with write capablity */ + /* reopen the file with write capability */ fp = freopen(token_path, "wb", fp); if (fp == NULL) { return 0; } size_t write_num = fwrite(token, 1, sizeof(sgx_launch_token_t), fp); diff --git a/tools/protect-integrity/Enclave.edl b/tools/protect-integrity/Enclave.edl index 3e5bac74..847f3ce9 100644 --- a/tools/protect-integrity/Enclave.edl +++ b/tools/protect-integrity/Enclave.edl @@ -7,7 +7,7 @@ enclave { trusted { public int ecall_protect([in, string] const char* input_path, - [in, string] const char* ouput_path); + [in, string] const char* output_path); public int ecall_show([in, string] const char* input_path, [in, string] const char* output_path); public int ecall_show_mac([in, string] const char* input_path);