Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minor typos #215

Merged
merged 3 commits into from
Jul 7, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For now, this project is focusing on the keylime agent component, which is a
HTTP server running on the machine that executes keylime operations.
Most keylime operations rely on TPM co-processor; therefore, the server needs
a physical TPM chip (or a TPM emulator) to perform keylime operations. The
TPM emulator is a program that runs in the deamon to mimic TPM commands.
TPM emulator is a program that runs in the daemon to mimic TPM commands.

The rust keylime agent is in early development and not ready for production use.

Expand Down
4 changes: 2 additions & 2 deletions src/cmd_exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const RETRY: usize = 4;
* execution return output and file output
* KeylimeTpmError
*
* Set up execution envrionment to execute tpm command through shell commands
* Set up execution environment to execute tpm command through shell commands
* and return the execution result in a tuple. Based on the latest update of
* python keylime this function implement the functionality of cmd_exec
* script in the python keylime repo. RaiseOnError, return code and lock are
Expand Down Expand Up @@ -107,7 +107,7 @@ pub(crate) fn run(
return Err(Error::Execution(output.status.code(), return_output));
}

// Retrive data from output path file
// Retrieve data from output path file
if let Some(p) = output_path {
file_output = read_file_output_path(p.to_string())?;
}
Expand Down
2 changes: 1 addition & 1 deletion src/keys_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub struct Verify {

#[derive(Deserialize)]
pub struct UkeyJson {
b64_encrypted_key: String, // this will be handled as a blog once wired in
b64_encrypted_key: String, // this will be handled as a blob once wired in
auth_tag: String,
}

Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ fn get_uuid(agent_uuid_config: &str) -> String {
async fn main() -> Result<()> {
pretty_env_logger::init();
let mut ctx = tpm::get_tpm2_ctx()?;
// Retreive the TPM Vendor, this allows us to warn if someone is using a
// Retrieve the TPM Vendor, this allows us to warn if someone is using a
// Software TPM ("SW")
if tss_esapi::utils::get_tpm_vendor(&mut ctx)?.contains("SW") {
warn!("INSECURE: Keylime is using a software TPM emulator rather than a real hardware TPM.");
Expand Down Expand Up @@ -221,7 +221,7 @@ async fn main() -> Result<()> {
*
* Helper function to help the keylime agent read file and get the file
* content. It is not from the original python version. Because rust needs
* to handle error in result, it is good to keep this function seperate from
* to handle error in result, it is good to keep this function separate from
* the main function.
*/
fn read_in_file(path: String) -> std::io::Result<String> {
Expand Down
2 changes: 1 addition & 1 deletion src/quotes_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ pub async fn identity(
}

// This is a Quote request from the cloud verifier, which will check
// integrity measurement. The PCRs inclued in the Quote will be specified
// integrity measurement. The PCRs included in the Quote will be specified
// by the mask, vmask. It should return this data:
// { QuoteAIK(nonce, 16:H(NK_pub), xi:yi), NK_pub}
// where xi:yi are additional PCRs to be included in the quote.
Expand Down
2 changes: 1 addition & 1 deletion src/revocation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ pub(crate) async fn run_revocation_service() -> Result<()> {
let _ = run_revocation_actions(msg_payload)?;
}
_ => {
error!("Invalid revocation message siganture {}", body);
error!("Invalid revocation message signature {}", body);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ echo "-------- Setting up Virtual TPM"
mkdir /tmp/tpmdir
swtpm_setup --tpm2 \
--tpmstate /tmp/tpmdir \
--createek --allow-signing --decryption --create-ek-cert \
--createek --decryption --create-ek-cert \
--create-platform-cert \
--display
swtpm socket --tpm2 \
Expand Down