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.

Sign up for GitHub

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

Jump to bottom

Add support for RSA 3072 keys #244

Merged
merged 4 commits into from
May 5, 2020
Merged

Add support for RSA 3072 keys #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c943b3
swtpm_setup: Report supported RSA key sizes useful for EK key creation
stefanberger Apr 23, 2020
7af93fd
swtpm_setup: Add support for RSA 3072 bit EK keys
stefanberger Apr 23, 2020
d5cdc94
tests: Extend swtpm_setup test cases to also test with RSA 3072 bit keys
stefanberger Apr 23, 2020
d46624f
swtpm_setup: Allow to create largest possible EK
stefanberger Apr 29, 2020
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
23 changes: 18 additions & 5 deletions man/man8/swtpm_setup.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "swtpm_setup 8"
.TH swtpm_setup 8 "2020-05-01" "swtpm" ""
.TH swtpm_setup 8 "2020-05-04" "swtpm" ""
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down Expand Up @@ -277,18 +277,27 @@ A file to copy \s-1TCSD\s0's system_ps_file to. The system_ps_file contains the
needed by \s-1TCSD\s0 for key related functions.
.Sp
This option is only useful with \s-1TPM 1.2\s0 and in if ownership is taken.
.IP "\fBrsa-keysize <keysize\fR> (since v0.4)" 4
.IX Item "rsa-keysize <keysize> (since v0.4)"
This option allows to pass the size of a \s-1TPM 2 RSA EK\s0 key, such as 2048
or 3072. The supported keysizes for a \s-1TPM 2\s0 can be queried for using
the \fI\-\-print\-capabilities\fR option. The default size is 2048 bits for
both \s-1TPM 1.2\s0 and \s-1TPM 2.\s0 If 'max' is passed, the largest possible key
size is used.
.IP "\fB\-\-print\-capabilities\fR (since v0.2)" 4
.IX Item "--print-capabilities (since v0.2)"
Print capabilities that were added to swtpm_setup after version 0.1. The output
contains the following:
Print capabilities that were added to swtpm_setup after version 0.1.
The output may contain the following:
.Sp
.Vb 8
.Vb 10
\& {
\& "type": "swtpm_setup",
\& "features": [
\& "cmdarg\-keyfile\-fd",
\& "cmdarg\-pwdfile\-fd",
\& "no\-tpm12\-tools"
\& "no\-tpm12\-tools",
\& "tpm2\-rsa\-keysize\-2048",
\& "tpm2\-rsa\-keysize\-3072"
\& ]
\& }
.Ve
Expand All @@ -306,6 +315,10 @@ The \fI\-\-pwdfile\-fd\fR option is supported.
\&\s-1TPM 1.2\s0 tools cannot be found in the \s-1PATH.\s0 This means that no certificates can
be created since they cannot be written into the \s-1NVRAM\s0 and the \s-1NVRAM\s0 cannot be
locked. Among the \s-1TPM 1.2\s0 setup parameters only \fI\-\-createek\fR can be passed.
.IP "\fBtpm2\-rsa\-keysize\-2048, ...\fR" 4
.IX Item "tpm2-rsa-keysize-2048, ..."
The shown \s-1RSA\s0 key sizes are supported for a \s-1TPM 2\s0's \s-1EK\s0 key. If none of the
tpm2\-rsa\-keysize verbs is shown then only \s-1RSA 2048\s0 bit keys are supported.
.RE
.RS 4
.RE
Expand Down
21 changes: 18 additions & 3 deletions man/man8/swtpm_setup.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,17 +173,27 @@ needed by TCSD for key related functions.

This option is only useful with TPM 1.2 and in if ownership is taken.

=item B<rsa-keysize <keysize>> (since v0.4)

This option allows to pass the size of a TPM 2 RSA EK key, such as 2048
or 3072. The supported keysizes for a TPM 2 can be queried for using
the I<--print-capabilities> option. The default size is 2048 bits for
both TPM 1.2 and TPM 2. If 'max' is passed, the largest possible key
size is used.

=item B<--print-capabilities> (since v0.2)

Print capabilities that were added to swtpm_setup after version 0.1. The output
contains the following:
Print capabilities that were added to swtpm_setup after version 0.1.
The output may contain the following:

{
"type": "swtpm_setup",
"features": [
"cmdarg-keyfile-fd",
"cmdarg-pwdfile-fd",
"no-tpm12-tools"
"no-tpm12-tools",
"tpm2-rsa-keysize-2048",
"tpm2-rsa-keysize-3072"
]
}

Expand All @@ -205,6 +215,11 @@ TPM 1.2 tools cannot be found in the PATH. This means that no certificates can
be created since they cannot be written into the NVRAM and the NVRAM cannot be
locked. Among the TPM 1.2 setup parameters only I<--createek> can be passed.

=item B<tpm2-rsa-keysize-2048, ...>

The shown RSA key sizes are supported for a TPM 2's EK key. If none of the
tpm2-rsa-keysize verbs is shown then only RSA 2048 bit keys are supported.

=back

=item B<--help, -h>
Expand Down
1 change: 1 addition & 0 deletions src/swtpm_setup/swtpm_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const char *one_arg_params[] = {
"--swtpm_ioctl",
"--pcr-banks",
"--tcsd-system-ps-file",
"--rsa-keysize",
NULL
};

Expand Down
Loading