[libvirt] [PATCH 00/18] Add support for vTPM state encryption

Stefan Berger posted 18 patches 1 week ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20190709172341.3063264-1-stefanb@linux.vnet.ibm.com
docs/formatdomain.html.in                     |  16 +
docs/formatsecret.html.in                     |  61 +++-
docs/schemas/domaincommon.rng                 |  30 ++
docs/schemas/secret.rng                       |  10 +
include/libvirt/libvirt-secret.h              |   1 +
po/POTFILES                                   |   2 +-
src/Makefile.am                               |   1 +
src/conf/Makefile.inc.am                      |   7 +
src/conf/domain_conf.c                        |  96 ++++-
src/conf/domain_conf.h                        |   5 +
src/conf/secret_conf.c                        |  13 +
src/conf/virtpm_conf.c                        |  36 ++
src/conf/virtpm_conf.h                        |  36 ++
src/libvirt_private.syms                      |  20 +-
src/qemu/Makefile.inc.am                      |   1 +
src/qemu/qemu_block.c                         |   1 +
src/qemu/qemu_driver.c                        |  28 ++
src/qemu/qemu_extdevice.c                     |   2 +-
src/qemu/qemu_extdevice.h                     |   3 +
src/qemu/qemu_tpm.c                           | 193 ++++++----
src/security/Makefile.inc.am                  |   1 +
src/tpm/Makefile.inc.am                       |  20 ++
src/tpm/virtpm.c                              | 330 ++++++++++++++++++
src/{util => tpm}/virtpm.h                    |   8 +
src/util/Makefile.inc.am                      |   2 -
src/util/virsecret.c                          |   2 +-
src/util/virstorageencryption.c               |   2 +-
src/util/virstorageencryption.h               |   1 +
src/util/virtpm.c                             |  74 ----
tests/Makefile.am                             |   1 +
.../tpm-emulator-tpm2-enc.x86_64-latest.args  |  35 ++
.../tpm-emulator-tpm2-enc.xml                 |  34 ++
tests/qemuxml2argvtest.c                      |   1 +
.../tpm-emulator-tpm2-enc.xml                 |  38 ++
tests/qemuxml2xmltest.c                       |   2 +
tests/secretxml2xmlin/usage-vtpm.xml          |   7 +
tests/secretxml2xmltest.c                     |   1 +
37 files changed, 957 insertions(+), 164 deletions(-)
create mode 100644 src/conf/virtpm_conf.c
create mode 100644 src/conf/virtpm_conf.h
create mode 100644 src/tpm/Makefile.inc.am
create mode 100644 src/tpm/virtpm.c
rename src/{util => tpm}/virtpm.h (77%)
delete mode 100644 src/util/virtpm.c
create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml
create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml
create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml

[libvirt] [PATCH 00/18] Add support for vTPM state encryption

Posted by Stefan Berger 1 week ago
This series of patches addresses the RFE in BZ 172830:
https://bugzilla.redhat.com/show_bug.cgi?id=1728030

This series of patches adds support for vTPM state encryption by passing
the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm'
where they can read a passphrase from and derive a key from that passphrase.

The TPM's domain XML looks to enable state encryption looks like this:

    <tpm model='tpm-tis'>
      <backend type='emulator' version='1.2'>
        <encryption format='vtpm'>
          <secret type='passphrase' uuid='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/>
        </encryption>
      </backend>
      <alias name='tpm0'/>
    </tpm>

The vTPM secret holding the passphrase looks like this:

<secret ephemeral='no' private='yes'>
  <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid>
  <description>vTPM passphrase example</description>
  <usage type='vtpm'>
    <name>vtpm_example</name>
  </usage>
</secret>


The swtpm v0.2 (upcoming) is needed that supports the command line option
--print-capabilities returning a JSON object that identifies features added
since v0.1. One such features is the possibility to pass a passphrase via a
file descriptor.

The patches do some refactoring of existing code on the way.

  Stefan

Stefan Berger (18):
  secret: Add support for usage type vTPM
  tests: Add test for new Secret vTPM usage type
  tests: Add already existing test case tpm-emulator-tpm2
  util: Add VIR_STORAGE_ENCRYPTION_FORMAT_VTPM
  conf: Extend TPM XML parser with encryption support
  schema: Extend the TPM XML schema with support for encryption
  tests: Add test for TPM XML encryption parser and formatter
  tests: Add tests for QEMU command line generation with encrypted TPM
  tpm: Move virtpm.c from utils dir to own tpm dir
  tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c
  tpm: Refactor virTPMEmulatorInit to use loop
  tpm: Check whether previously found executables were updated
  tpm: Parse the capabilities supported by swtpm and swtpm_setup
  tpm: Use fd to pass password to swtpm_setup and swtpm
  tpm: Pass migration key passphrase via fd to swtpm
  tpm: Check TPM XML device configuration changes after edit
  docs: Extend Secret XML documentation with vtpm usage type
  docs: Extend TPM docs with new encryption element

 docs/formatdomain.html.in                     |  16 +
 docs/formatsecret.html.in                     |  61 +++-
 docs/schemas/domaincommon.rng                 |  30 ++
 docs/schemas/secret.rng                       |  10 +
 include/libvirt/libvirt-secret.h              |   1 +
 po/POTFILES                                   |   2 +-
 src/Makefile.am                               |   1 +
 src/conf/Makefile.inc.am                      |   7 +
 src/conf/domain_conf.c                        |  96 ++++-
 src/conf/domain_conf.h                        |   5 +
 src/conf/secret_conf.c                        |  13 +
 src/conf/virtpm_conf.c                        |  36 ++
 src/conf/virtpm_conf.h                        |  36 ++
 src/libvirt_private.syms                      |  20 +-
 src/qemu/Makefile.inc.am                      |   1 +
 src/qemu/qemu_block.c                         |   1 +
 src/qemu/qemu_driver.c                        |  28 ++
 src/qemu/qemu_extdevice.c                     |   2 +-
 src/qemu/qemu_extdevice.h                     |   3 +
 src/qemu/qemu_tpm.c                           | 193 ++++++----
 src/security/Makefile.inc.am                  |   1 +
 src/tpm/Makefile.inc.am                       |  20 ++
 src/tpm/virtpm.c                              | 330 ++++++++++++++++++
 src/{util => tpm}/virtpm.h                    |   8 +
 src/util/Makefile.inc.am                      |   2 -
 src/util/virsecret.c                          |   2 +-
 src/util/virstorageencryption.c               |   2 +-
 src/util/virstorageencryption.h               |   1 +
 src/util/virtpm.c                             |  74 ----
 tests/Makefile.am                             |   1 +
 .../tpm-emulator-tpm2-enc.x86_64-latest.args  |  35 ++
 .../tpm-emulator-tpm2-enc.xml                 |  34 ++
 tests/qemuxml2argvtest.c                      |   1 +
 .../tpm-emulator-tpm2-enc.xml                 |  38 ++
 tests/qemuxml2xmltest.c                       |   2 +
 tests/secretxml2xmlin/usage-vtpm.xml          |   7 +
 tests/secretxml2xmltest.c                     |   1 +
 37 files changed, 957 insertions(+), 164 deletions(-)
 create mode 100644 src/conf/virtpm_conf.c
 create mode 100644 src/conf/virtpm_conf.h
 create mode 100644 src/tpm/Makefile.inc.am
 create mode 100644 src/tpm/virtpm.c
 rename src/{util => tpm}/virtpm.h (77%)
 delete mode 100644 src/util/virtpm.c
 create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml
 create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml
 create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml

-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list