diff --git a/man/man3/swtpm_ioctls.3 b/man/man3/swtpm_ioctls.3 index 05c3adb9b..d3841c806 100644 --- a/man/man3/swtpm_ioctls.3 +++ b/man/man3/swtpm_ioctls.3 @@ -148,7 +148,7 @@ and control commands used by the control channel over socket interface. .IX Header "DESCRIPTION" The \s-1CUSE TPM\s0 implements an ioctl interface on the \s-1CUSE TPM\s0's character device. The ioctl's are used for out-of-band control of various \s-1TPM\s0 operations, -such as its intialization, resetting, and state migration. The control channel +such as its initialization, resetting, and state migration. The control channel over \s-1TCP\s0 or UnixIO sockets uses control commands for these operations. .PP The following is an enumeration of the supported ioctl's and control commands, @@ -158,10 +158,10 @@ commands return a \s-1TPM\s0 error code in their response. Ioctl's are prefixed .PP In case of the ioctl interface, the pointer to a command's data structure is passed as the 2nd parameter to the \fIioctl()\fR function. The fields in the command's -data structure are to be fill out in host endianess format. +data structure are to be fill out in host endianness format. .PP In case of control commands, the command code must be encoded as a 4 byte -interger preceding the command's data structure. Command code and data must be +integer preceding the command's data structure. Command code and data must be written in big endian format. .IP "\fB\s-1PTM_GET_CAPABILITY / CMD_GET_CAPABILITY,\s0 ptm_cap\fR" 4 .IX Item "PTM_GET_CAPABILITY / CMD_GET_CAPABILITY, ptm_cap" @@ -242,7 +242,7 @@ delete the volatile state upon startup (\fB\s-1PTM_INIT_FLAG_DELETE_VOLATILE\s0\ A \s-1TPM\s0 result code is returned in the tpm_result field. .IP "\fB\s-1PTM_SHUTDOWN / CMD_SHUTDOWN,\s0 ptm_res\fR" 4 .IX Item "PTM_SHUTDOWN / CMD_SHUTDOWN, ptm_res" -This ioctl allows to shut down the \s-1TPM.\s0 +This ioctl allows a user to shut down the \s-1TPM.\s0 .Sp A \s-1TPM\s0 result code is returned in ptm_res. .IP "\fB\s-1PTM_GET_TPMESTABLISHED / CMD_GET_TPMESTABLISHED,\s0 ptm_est\fR" 4 @@ -387,11 +387,11 @@ The ptm_getstate data structure looks as follows: \& }; .Ve .Sp -In the request the state_flags field allows to set the +In the request the state_flags field allows a user to set the \&\fB\s-1PTM_STATE_FLAG_DECRYPT\s0\fR flag to retrieve decrypted \s-1TPM\s0 state in case the \s-1TPM\s0's state was written in encrypted form. .Sp -The type field allows to choose one of the \s-1TPM\s0's state blobs, and must be +The type field allows a user to choose one of the \s-1TPM\s0's state blobs, and must be one of \fB\s-1PTM_BLOB_TYPE_PERMANENT\s0\fR, \fB\s-1PTM_BLOB_TYPE_VOLATILE\s0\fR, and \&\fB\s-1PTM_BLOB_TYPE_SAVESTATE\s0\fR. .Sp @@ -489,7 +489,7 @@ See also \fB\f(BIsendmsg\fB\|(2)\fR and \fB\f(BIcmsg\fB\|(3)\fR. A \s-1TPM\s0 result code is returned in ptm_res. .IP "\fB\s-1CMD_SET_BUFFERSIZE,\s0 ptm_setbuffersize\fR" 4 .IX Item "CMD_SET_BUFFERSIZE, ptm_setbuffersize" -This command allows to set and query for the buffer size that the \s-1TPM\s0 is +This command allows a user to set and query for the buffer size that the \s-1TPM\s0 is using for input and output I/O buffers. .Sp The ptm_setbuffersize data structure looks as follows: diff --git a/man/man3/swtpm_ioctls.pod b/man/man3/swtpm_ioctls.pod index 1f7a2a3fd..54d00645c 100644 --- a/man/man3/swtpm_ioctls.pod +++ b/man/man3/swtpm_ioctls.pod @@ -11,7 +11,7 @@ B<#include Etpm_ioctl.hE> The CUSE TPM implements an ioctl interface on the CUSE TPM's character device. The ioctl's are used for out-of-band control of various TPM operations, -such as its intialization, resetting, and state migration. The control channel +such as its initialization, resetting, and state migration. The control channel over TCP or UnixIO sockets uses control commands for these operations. The following is an enumeration of the supported ioctl's and control commands, @@ -21,10 +21,10 @@ I and control commands are prefixed with I. In case of the ioctl interface, the pointer to a command's data structure is passed as the 2nd parameter to the ioctl() function. The fields in the command's -data structure are to be fill out in host endianess format. +data structure are to be fill out in host endianness format. In case of control commands, the command code must be encoded as a 4 byte -interger preceding the command's data structure. Command code and data must be +integer preceding the command's data structure. Command code and data must be written in big endian format. =over 4 @@ -122,7 +122,7 @@ A TPM result code is returned in the tpm_result field. =item B -This ioctl allows to shut down the TPM. +This ioctl allows a user to shut down the TPM. A TPM result code is returned in ptm_res. @@ -267,11 +267,11 @@ The ptm_getstate data structure looks as follows: } u; }; -In the request the state_flags field allows to set the +In the request the state_flags field allows a user to set the B flag to retrieve decrypted TPM state in case the TPM's state was written in encrypted form. -The type field allows to choose one of the TPM's state blobs, and must be +The type field allows a user to choose one of the TPM's state blobs, and must be one of B, B, and B. @@ -370,7 +370,7 @@ A TPM result code is returned in ptm_res. =item B -This command allows to set and query for the buffer size that the TPM is +This command allows a user to set and query for the buffer size that the TPM is using for input and output I/O buffers. The ptm_setbuffersize data structure looks as follows: diff --git a/man/man8/swtpm.8 b/man/man8/swtpm.8 index 8d4c36057..aaa21d366 100644 --- a/man/man8/swtpm.8 +++ b/man/man8/swtpm.8 @@ -183,7 +183,7 @@ must be passed with the fd parameter and the commands are read from this file descriptor then. If a port is provided the \fIbind address\fR on which to listen for \s-1TCP\s0 connections can be provided as well; the default bind address is 127.0.0.1. If a link -local IPv6 addresss if provided, the name of the interface to bind to must be +local IPv6 address is provided, the name of the interface to bind to must be provided with \fIifname\fR. .Sp This parameter enables a persistent connection by default unless the disconnect option @@ -191,7 +191,7 @@ is given. This parameter should be used rather than the \-p and \-\-fd options. .IP "\fB\-\-server type=unixio[,path=][,fd=] [,mode=<0...>][,uid=][,gid=]\fR" 4 .IX Item "--server type=unixio[,path=][,fd=] [,mode=<0...>][,uid=][,gid=]" Expect UnixIO connections on the given path. If no path is provided, a file descriptor -must be passed instead. The mode parameter allows to set the file mode bits of the +must be passed instead. The mode parameter allows a user to set the file mode bits of the UnixIO path. The mode bits value must be given as an octal number starting with a '0'. The default value is 0770. uid and gid set the ownership of the UnixIO socket's path. This operation requires root privileges. @@ -235,10 +235,10 @@ This option adds a control channel to the \s-1TPM.\s0 The control channel can ei a given \fIpath\fR or \fIfiledescriptor\fR or it can use a \s-1TCP\s0 socket on the given \fIport\fR or \fIfiledescriptor\fR. If a port is provided the \fIbind address\fR on which to listen for \s-1TCP\s0 connections can be provided as well; the default bind address is 127.0.0.1. If a link -local IPv6 addresss if provided, the name of the interface to bind to must be +local IPv6 address is provided, the name of the interface to bind to must be provided with \fIifname\fR. .Sp -The mode parameter allows to set the file mode bits of the UnixIO path. +The mode parameter allows a user to set the file mode bits of the UnixIO path. The mode bits value must be given as an octal number starting with a '0'. The default value is 0770. uid and gid set the ownership of the UnixIO socket's path. This operation requires root privileges. @@ -275,7 +275,7 @@ Choose \s-1TPM 2\s0 functionality; by default a \s-1TPM 1.2\s0 is chosen. Enable logging to a file given its file descriptor or its path. Use '\-' for path to suppress the logging. .Sp -The level parameter allows to choose the level of logging. Starting at log +The level parameter allows a user to choose the level of logging. Starting at log level 5, libtpms debug logging is activated. .Sp All logged lines will be prefixed with prefix. By default no prefix is prepended. @@ -290,7 +290,7 @@ The \fIallow-set-locality\fR parameter allows the swtpm to receive TPM/TPM2_SetLocality commands. This is parameter is useful if the Linux \&\s-1VTPM\s0 proxy driver access is enabled by file descriptor passing. This option is implied by the \fI\-\-vtpm\-proxy\fR option and therefore need not -be explicity set if this option is passed. In all other cases care should be +be explicitly set if this option is passed. In all other cases care should be taken as to who can send the TPM/TPM2_SetLocality command. .IP "\fB\-\-key file=|fd= [,format=][,mode=aes\-cbc|aes\-256\-cbc], [remove[=true|false]]\fR" 4 .IX Item "--key file=|fd= [,format=][,mode=aes-cbc|aes-256-cbc], [remove[=true|false]]" @@ -310,14 +310,14 @@ The \fIremove\fR parameter will attempt to remove the given keyfile once the key has been read. .IP "\fB\-\-key pwdfile=|pwdfd= [,mode=aes\-cbc|aes\-256\-cbc][remove[=true|false]][,kdf=sha512|pbkdf2]\fR" 4 .IX Item "--key pwdfile=|pwdfd= [,mode=aes-cbc|aes-256-cbc][remove[=true|false]][,kdf=sha512|pbkdf2]" -This variant of the key parameter allows to provide a passphrase in a file. +This variant of the key parameter allows a user to provide a passphrase in a file. The file is read and a key is derived from it using either a \s-1SHA512\s0 hash or \s-1PBKDF2.\s0 By default \s-1PBKDF2\s0 is used. .IP "\fB\-\-migration\-key file=|fd= [,format=][,mode=aes\-cbc|aes\-256\-cbc] [,remove[=true|false]]\fR" 4 .IX Item "--migration-key file=|fd= [,format=][,mode=aes-cbc|aes-256-cbc] [,remove[=true|false]]" The availability of a migration key ensures that the state of the \s-1TPM\s0 will not be revealed in unencrypted form when -the \s-1TPM\s0 state blobs are retreived through the ioctl interface. +the \s-1TPM\s0 state blobs are retrieved through the ioctl interface. The migration key is not used for encrypting \s-1TPM\s0 state written to files, this is what the \fI\-\-key\fR parameter is used for. .Sp @@ -347,12 +347,12 @@ The \fIremove\fR parameter will attempt to remove the given keyfile once the key has been read. .IP "\fB\-\-migration\-key pwdfile=|pwdfd= [,mode=aes\-cbc|aes\-256\-cbc][,remove[=true|false]][,pdf=sha512|pbkdf2]\fR" 4 .IX Item "--migration-key pwdfile=|pwdfd= [,mode=aes-cbc|aes-256-cbc][,remove[=true|false]][,pdf=sha512|pbkdf2]" -This variant of the key parameter allows to provide a passphrase in a file. +This variant of the key parameter allows a user to provide a passphrase in a file. The file is read and a key is derived from it using either a \s-1SHA512\s0 hash or \s-1PBKDF2.\s0 By default \s-1PBKDF2\s0 is used. .IP "\fB\-\-pid file=|fd=\fR" 4 .IX Item "--pid file=|fd=" -This options allows to set the name of file where the process \s-1ID\s0 (pid) of the \s-1TPM\s0 +This options allows a user to set the name of file where the process \s-1ID\s0 (pid) of the \s-1TPM\s0 will be written into. It is also possible to pass a file descriptor to a file that has been opened for writing. .IP "\fB\-r|\-\-runas \fR" 4 @@ -360,7 +360,7 @@ has been opened for writing. Switch to the given user. This option can only be used when swtpm is started as root. .IP "\fB\-\-seccomp action=none|log|kill\fR (since v0.2)" 4 .IX Item "--seccomp action=none|log|kill (since v0.2)" -This option allows to select the action to take by the seccomp profile when +This option allows a user to select the action to take by the seccomp profile when a syscall is executed that is not allowed. The default is \fIkill\fR. To disable the seccomp profile, choose \fInone\fR. The \fIlog\fR action logs offending syscalls. The \fIlog\fR action is only available if libseccomp supports logging. diff --git a/man/man8/swtpm.pod b/man/man8/swtpm.pod index d03f6d2b2..de8a8f363 100644 --- a/man/man8/swtpm.pod +++ b/man/man8/swtpm.pod @@ -52,7 +52,7 @@ must be passed with the fd parameter and the commands are read from this file descriptor then. If a port is provided the I on which to listen for TCP connections can be provided as well; the default bind address is 127.0.0.1. If a link -local IPv6 addresss if provided, the name of the interface to bind to must be +local IPv6 address is provided, the name of the interface to bind to must be provided with I. This parameter enables a persistent connection by default unless the disconnect option @@ -61,7 +61,7 @@ is given. This parameter should be used rather than the -p and --fd options. =item B<--server type=unixio[,path=EpathE][,fd=EfdE] [,mode=E0...E][,uid=EuidE][,gid=EgidE]> Expect UnixIO connections on the given path. If no path is provided, a file descriptor -must be passed instead. The mode parameter allows to set the file mode bits of the +must be passed instead. The mode parameter allows a user to set the file mode bits of the UnixIO path. The mode bits value must be given as an octal number starting with a '0'. The default value is 0770. uid and gid set the ownership of the UnixIO socket's path. This operation requires root privileges. @@ -131,10 +131,10 @@ This option adds a control channel to the TPM. The control channel can either us a given I or I or it can use a TCP socket on the given I or I. If a port is provided the I on which to listen for TCP connections can be provided as well; the default bind address is 127.0.0.1. If a link -local IPv6 addresss if provided, the name of the interface to bind to must be +local IPv6 address is provided, the name of the interface to bind to must be provided with I. -The mode parameter allows to set the file mode bits of the UnixIO path. +The mode parameter allows a user to set the file mode bits of the UnixIO path. The mode bits value must be given as an octal number starting with a '0'. The default value is 0770. uid and gid set the ownership of the UnixIO socket's path. This operation requires root privileges. @@ -181,7 +181,7 @@ Choose TPM 2 functionality; by default a TPM 1.2 is chosen. Enable logging to a file given its file descriptor or its path. Use '-' for path to suppress the logging. -The level parameter allows to choose the level of logging. Starting at log +The level parameter allows a user to choose the level of logging. Starting at log level 5, libtpms debug logging is activated. All logged lines will be prefixed with prefix. By default no prefix is prepended. @@ -197,7 +197,7 @@ The I parameter allows the swtpm to receive TPM/TPM2_SetLocality commands. This is parameter is useful if the Linux VTPM proxy driver access is enabled by file descriptor passing. This option is implied by the I<--vtpm-proxy> option and therefore need not -be explicity set if this option is passed. In all other cases care should be +be explicitly set if this option is passed. In all other cases care should be taken as to who can send the TPM/TPM2_SetLocality command. =item B<--key file=EkeyfileE|fd=EfdE [,format=Ehex|binaryE][,mode=aes-cbc|aes-256-cbc], [remove[=true|false]]> @@ -219,7 +219,7 @@ has been read. =item B<--key pwdfile=Epassphrase fileE|pwdfd=EfdE [,mode=aes-cbc|aes-256-cbc][remove[=true|false]][,kdf=sha512|pbkdf2]> -This variant of the key parameter allows to provide a passphrase in a file. +This variant of the key parameter allows a user to provide a passphrase in a file. The file is read and a key is derived from it using either a SHA512 hash or PBKDF2. By default PBKDF2 is used. @@ -227,7 +227,7 @@ or PBKDF2. By default PBKDF2 is used. The availability of a migration key ensures that the state of the TPM will not be revealed in unencrypted form when -the TPM state blobs are retreived through the ioctl interface. +the TPM state blobs are retrieved through the ioctl interface. The migration key is not used for encrypting TPM state written to files, this is what the I<--key> parameter is used for. @@ -258,13 +258,13 @@ has been read. =item B<--migration-key pwdfile=Epassphrase fileE|pwdfd=EfdE [,mode=aes-cbc|aes-256-cbc][,remove[=true|false]][,pdf=sha512|pbkdf2]> -This variant of the key parameter allows to provide a passphrase in a file. +This variant of the key parameter allows a user to provide a passphrase in a file. The file is read and a key is derived from it using either a SHA512 hash or PBKDF2. By default PBKDF2 is used. =item B<--pid file=EpidfileE|fd=EfiledescriptorE> -This options allows to set the name of file where the process ID (pid) of the TPM +This options allows a user to set the name of file where the process ID (pid) of the TPM will be written into. It is also possible to pass a file descriptor to a file that has been opened for writing. @@ -274,7 +274,7 @@ Switch to the given user. This option can only be used when swtpm is started as =item B<--seccomp action=none|log|kill> (since v0.2) -This option allows to select the action to take by the seccomp profile when +This option allows a user to select the action to take by the seccomp profile when a syscall is executed that is not allowed. The default is I. To disable the seccomp profile, choose I. The I action logs offending syscalls. The I action is only available if libseccomp supports logging. diff --git a/man/man8/swtpm_bios.8 b/man/man8/swtpm_bios.8 index ce4fbe085..36702aa64 100644 --- a/man/man8/swtpm_bios.8 +++ b/man/man8/swtpm_bios.8 @@ -159,7 +159,7 @@ to. By default \fIlocalhost\fR is assumed. The default \s-1TCP\s0 port is 6545 u the environment variable \fI\s-1TCSD_TCP_DEVICE_PORT\s0\fR indicates another port. .PP In case of success 0 will be returned. In case a \s-1TPM\s0 error was -encountered the return code will be 128. In case of communcation +encountered the return code will be 128. In case of communication failure 255 is returned. In case the \s-1TPM\s0 needs to be reset to become activated, 129 will be returned. .PP diff --git a/man/man8/swtpm_ioctl.8 b/man/man8/swtpm_ioctl.8 index 7ae78317f..cecb7edab 100644 --- a/man/man8/swtpm_ioctl.8 +++ b/man/man8/swtpm_ioctl.8 @@ -203,7 +203,7 @@ Set the locality for the subsequent \s-1TPM\s0 commands. .IX Item "-v" Have the \s-1TPM\s0 write the volatile state to a file. Upon a TPM_Init (\-i) the \&\s-1TPM\s0 state will be read and the \s-1TPM\s0 can then resume operation without further -intialization. +initialization. .IP "\fB\-C\fR" 4 .IX Item "-C" Cancel an ongoing \s-1TPM\s0 command. diff --git a/man/man8/swtpm_setup.8 b/man/man8/swtpm_setup.8 index ca797c8eb..5e5db1255 100644 --- a/man/man8/swtpm_setup.8 +++ b/man/man8/swtpm_setup.8 @@ -145,7 +145,7 @@ swtpm_setup \- Swtpm utility to simulate the manufacturing of a TPM 1.2 or 2.0 \&\fBswtpm_setup [\s-1OPTIONS\s0]\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" -\&\fBswtpm_setup\fR is a tool that prepares the intial state for a libtpms-based +\&\fBswtpm_setup\fR is a tool that prepares the initial state for a libtpms-based \&\s-1TPM.\s0 .PP For creating the initial state of a \s-1TPM 1.2,\s0 swtpm_setup must be run either @@ -254,7 +254,7 @@ If this option is not given and an existing state file is found, an error code is returned. .IP "\fB\-\-not\-overwrite\fR" 4 .IX Item "--not-overwrite" -Do not overwrite existing \s-1TPM\s0 state. If exising \s-1TPM\s0 state is found, the +Do not overwrite existing \s-1TPM\s0 state. If existing \s-1TPM\s0 state is found, the program ends without an error. .IP "\fB\-\-vmid <\s-1VM ID\s0\fR>" 4 .IX Item "--vmid " @@ -264,7 +264,7 @@ used for creating the certificates and may be required by that tool. .IP "\fB\-\-pcr\-banks <\s-1PCR\s0 banks\fR>" 4 .IX Item "--pcr-banks " Optional comma-separated list of \s-1PCR\s0 banks to activate. Providing '\-' -allows to skip the selection and activates all \s-1PCR\s0 banks. By default +allows a user to skip the selection and activates all \s-1PCR\s0 banks. By default the sha1 and sha256 banks are activated. .IP "\fB\-\-swtpm_ioctl " 4 .IX Item "--swtpm_ioctl " diff --git a/man/man8/swtpm_setup.conf.8 b/man/man8/swtpm_setup.conf.8 index 89e6c16fe..40f617b84 100644 --- a/man/man8/swtpm_setup.conf.8 +++ b/man/man8/swtpm_setup.conf.8 @@ -144,14 +144,14 @@ swtpm_setup.conf \- Configuration file for swtpm_setup .IX Header "DESCRIPTION" The file \fI/etc/swtpm_setup.conf\fR contains configuration information for the swtpm_setup and swtpm_setup.sh programs. It must only contain -one configuration keywork per line, followed by an equals sign (=) and then +one configuration keyword per line, followed by an equals sign (=) and then followed by appropriate configuration information. A comment at the end of the line may be introduced by a hash (#) sign. .PP The following keywords are recognized: .IP "\fBcreate_certs_tool\fR" 4 .IX Item "create_certs_tool" -This keyword is to be followed by the name of an executable or exectuable +This keyword is to be followed by the name of an executable or executable script used for creating various \s-1TPM\s0 certificates. The tool will be called with the following options .RS 4 diff --git a/man/man8/swtpm_setup.conf.pod b/man/man8/swtpm_setup.conf.pod index 80b2120ea..02b42f7e4 100644 --- a/man/man8/swtpm_setup.conf.pod +++ b/man/man8/swtpm_setup.conf.pod @@ -6,7 +6,7 @@ swtpm_setup.conf - Configuration file for swtpm_setup The file I contains configuration information for the swtpm_setup and swtpm_setup.sh programs. It must only contain -one configuration keywork per line, followed by an equals sign (=) and then +one configuration keyword per line, followed by an equals sign (=) and then followed by appropriate configuration information. A comment at the end of the line may be introduced by a hash (#) sign. @@ -16,7 +16,7 @@ The following keywords are recognized: =item B -This keyword is to be followed by the name of an executable or exectuable +This keyword is to be followed by the name of an executable or executable script used for creating various TPM certificates. The tool will be called with the following options diff --git a/man/man8/swtpm_setup.pod b/man/man8/swtpm_setup.pod index 30ca28866..e521845a5 100644 --- a/man/man8/swtpm_setup.pod +++ b/man/man8/swtpm_setup.pod @@ -8,7 +8,7 @@ B =head1 DESCRIPTION -B is a tool that prepares the intial state for a libtpms-based +B is a tool that prepares the initial state for a libtpms-based TPM. For creating the initial state of a TPM 1.2, swtpm_setup must be run either @@ -145,7 +145,7 @@ code is returned. =item B<--not-overwrite> -Do not overwrite existing TPM state. If exising TPM state is found, the +Do not overwrite existing TPM state. If existing TPM state is found, the program ends without an error. =item B<--vmid > @@ -157,7 +157,7 @@ used for creating the certificates and may be required by that tool. =item B<--pcr-banks > Optional comma-separated list of PCR banks to activate. Providing '-' -allows to skip the selection and activates all PCR banks. By default +allows a user to skip the selection and activates all PCR banks. By default the sha1 and sha256 banks are activated. =item B<--swtpm_ioctl > diff --git a/src/swtpm/cuse_tpm.c b/src/swtpm/cuse_tpm.c index 7b379d2ad..d86be43df 100644 --- a/src/swtpm/cuse_tpm.c +++ b/src/swtpm/cuse_tpm.c @@ -217,7 +217,7 @@ static const char *usage = " : set the directory where the TPM's state will be written\n" " into; the TPM_PATH environment variable can be used\n" " instead;\n" -" mode allows to set the file mode bits of the state\n" +" mode allows a user to set the file mode bits of the state\n" " files; the default mode is 0640;\n" "-r|--runas : after creating the CUSE device, change to the given\n" " user\n" diff --git a/src/swtpm/swtpm.c b/src/swtpm/swtpm.c index b5bd60a58..082ce2fd6 100644 --- a/src/swtpm/swtpm.c +++ b/src/swtpm/swtpm.c @@ -118,7 +118,7 @@ static void usage(FILE *file, const char *prgname, const char *iface) " it will be treaded as client connection;\n" " NOTE: fd and clientfd are mutually exclusive and clientfd\n" " is only valid for UnixIO channels\n" - " mode allows to set the file mode bits of a Unixio socket;\n" + " mode allows a user to set the file mode bits of a Unixio socket;\n" " the value must be given in octal number format\n" " uid and gid set the ownership of the Unixio socket's file;\n" "--migration-key file=|fd=[,mode=aes-cbc|aes-256-cbc][,format=hex|binary][,remove=[true|false]]\n" @@ -153,7 +153,7 @@ static void usage(FILE *file, const char *prgname, const char *iface) " : set the directory where the TPM's state will be written\n" " into; the TPM_PATH environment variable can be used\n" " instead;\n" - " mode allows to set the file mode bits of the state files;\n" + " mode allows a user to set the file mode bits of the state files;\n" " the default mode is 0640;\n" "--server [type=tcp][,port=port[,bindaddr=address[,ifname=ifname]]][,fd=fd][,disconnect]\n" " : Expect TCP connections on the given port;\n" @@ -165,7 +165,7 @@ static void usage(FILE *file, const char *prgname, const char *iface) "--server type=unixio[,path=path][,fd=fd][,mode=0...][,uid=uid][,gid=gid]\n" " : Expect UnixIO connections on the given path; if fd is\n" " provided, packets will be read from it directly;\n" - " mode allows to set the file mode bits of the socket; the\n" + " mode allows a user to set the file mode bits of the socket; the\n" " value must be given in octal number format;\n" " uid and gid set the ownership of the Unixio socket's file;\n" "--flags [not-need-init][,startup-clear|startup-state|startup-deactivated|startup-none]\n" diff --git a/src/swtpm/swtpm_chardev.c b/src/swtpm/swtpm_chardev.c index 247836dbc..54ffb1394 100644 --- a/src/swtpm/swtpm_chardev.c +++ b/src/swtpm/swtpm_chardev.c @@ -147,7 +147,7 @@ static void usage(FILE *file, const char *prgname, const char *iface) " it will be treaded as client connection;\n" " NOTE: fd and clientfd are mutually exclusive and \n" " clientfd is only valid for UnixIO channels\n" - " mode allows to set the file mode bits of a Unixio socket;\n" + " mode allows a user to set the file mode bits of a Unixio socket;\n" " the value must be given in octal number format\n" " uid and gid set the ownership of the Unixio socket's file;\n" "--migration-key file=|fd=[,mode=aes-cbc|aes-256-cbc][,format=hex|binary][,remove=[true|false]]\n" @@ -179,7 +179,7 @@ static void usage(FILE *file, const char *prgname, const char *iface) " : set the directory where the TPM's state will be written\n" " into; the TPM_PATH environment variable can be used\n" " instead;\n" - " mode allows to set the file mode bits of the state files;\n" + " mode allows a user to set the file mode bits of the state files;\n" " the default mode is 0640;\n" "-r|--runas : change to the given user\n" #ifdef WITH_VTPM_PROXY diff --git a/src/swtpm/swtpm_nvfile.c b/src/swtpm/swtpm_nvfile.c index 6f3f937d1..d3760ef42 100644 --- a/src/swtpm/swtpm_nvfile.c +++ b/src/swtpm/swtpm_nvfile.c @@ -1085,7 +1085,7 @@ SWTPM_NVRAM_DecryptData(const encryptionkey *key, !tlv_data_find_tag(data, length, tag_encrypted_data, &td[1])) { logprintf(STDERR_FILENO, - "Could not find HMAC or encrpted data (tag %u) " + "Could not find HMAC or encrypted data (tag %u) " "in byte stream.\n", tag_encrypted_data); rc = TPM_FAIL; break; diff --git a/src/swtpm_bios/tpm_bios.c b/src/swtpm_bios/tpm_bios.c index b854a4b24..9d521a245 100644 --- a/src/swtpm_bios/tpm_bios.c +++ b/src/swtpm_bios/tpm_bios.c @@ -667,7 +667,7 @@ static void print_usage(const char *prgname) "\t terminate with exit code 129 if the TPM\n" "\t needs to be reset\n" "\t-u give up physical presence\n" -"\t on TPM 2 set the platform hierachy to a\n" +"\t on TPM 2 set the platform hierarchy to a\n" "\t random password\n" "\t-v display version and exit\n" "\t-h display this help screen and exit\n" diff --git a/src/swtpm_ioctl/tpm_ioctl.c b/src/swtpm_ioctl/tpm_ioctl.c index 485bd733f..f694541ab 100644 --- a/src/swtpm_ioctl/tpm_ioctl.c +++ b/src/swtpm_ioctl/tpm_ioctl.c @@ -821,7 +821,7 @@ static void usage(const char *prgname) "-b : set the buffer size of the TPM and get its current\n" " size; get minimum and maximum supported sizes\n" "--info : get TPM implementation specific information;\n" -" flags must be an interger value\n" +" flags must be an integer value\n" "--version : display version and exit\n" "--help : display help screen and exit\n" "\n"