External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: tpm: Enable creation of certs for TPM 1.2 in non-privileged mode

Browse Source 
When 'swtpm_setup --print-capabilities' shows the 'tpm12-not-need-root'
flag, then it is possible to create certificates for the TPM 1.2 also
in non-privileged mode since swtpm_setup doesn't need tcsd anymore.
Check for this flag and create the certificates if this flag is found.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Stefan Berger 2021-10-30 00:01:37 -04:00 committed by Michal Privoznik
parent b2757b697e
commit 0b4705a4aa
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_tpm.c
View File

@ -463,11 +463,13 @@ qemuTPMEmulatorRunSetup(const char *storagepath,
if (!swtpm_setup) if (!swtpm_setup)
return -1; return -1;
if (!privileged && tpmversion == VIR_DOMAIN_TPM_VERSION_1_2) if (!privileged && tpmversion == VIR_DOMAIN_TPM_VERSION_1_2 &&
!virTPMSwtpmSetupCapsGet(VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT)) {
return virFileWriteStr(logfile, return virFileWriteStr(logfile,
_("Did not create EK and certificates since " _("Did not create EK and certificates since "
"this requires privileged mode for a " "this requires privileged mode for a "
"TPM 1.2\n"), 0600); "TPM 1.2\n"), 0600);
}
if (!privileged && qemuTPMCreateConfigFiles(swtpm_setup) < 0) if (!privileged && qemuTPMCreateConfigFiles(swtpm_setup) < 0)
return -1; return -1;

1
src/util/virtpm.c
View File

@ -46,6 +46,7 @@ VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
VIR_TPM_SWTPM_SETUP_FEATURE_LAST, VIR_TPM_SWTPM_SETUP_FEATURE_LAST,
"cmdarg-pwdfile-fd", "cmdarg-pwdfile-fd",
"cmdarg-create-config-files", "cmdarg-create-config-files",
"tpm12-not-need-root",
); );
/** /**

1
src/util/virtpm.h
View File

@ -39,6 +39,7 @@ typedef enum {
typedef enum { typedef enum {
VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD, VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD,
VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES,
VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT,
VIR_TPM_SWTPM_SETUP_FEATURE_LAST VIR_TPM_SWTPM_SETUP_FEATURE_LAST
} virTPMSwtpmSetupFeature; } virTPMSwtpmSetupFeature;