From 27f974d240d75e6a2a083d58696f6b7fcf21aea5 Mon Sep 17 00:00:00 2001 From: Chris Coulson Date: Fri, 12 Jan 2024 22:38:34 +0000 Subject: [PATCH] testutil: remove last use of mssim.OpenConnection --- testutil/tpm.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testutil/tpm.go b/testutil/tpm.go index 0b6110d..9a14e30 100644 --- a/testutil/tpm.go +++ b/testutil/tpm.go @@ -473,12 +473,14 @@ func (c *tpmSimulatorLaunchContext) launch(opts *TPMSimulatorOptions) error { return fmt.Errorf("cannot start simulator: %w", err) } - var transport *mssim.Transport + device := mssim.NewLocalDevice(c.port) + var tpm *tpm2.TPMContext + // Give the simulator 5 seconds to start up Loop: for i := 0; ; i++ { var err error - transport, err = mssim.OpenConnection("", c.port) + tpm, err = tpm2.OpenTPMDevice(device) switch { case err != nil && i == 4: return fmt.Errorf("cannot open simulator connection: %w", err) @@ -488,8 +490,6 @@ Loop: break Loop } } - - tpm := tpm2.NewTPMContext(transport) defer tpm.Close() if err := tpm.Startup(tpm2.StartupClear); err != nil {