Open /dev/tpm0 only once in the life-cycle of a Client object

Moved opening of the Client object to __init__ so that it can be used
with an in-kernel resource manager sessions.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/tpm2.py b/tpm2.py
index aa86685..b6cb7c9 100644
--- a/tpm2.py
+++ b/tpm2.py
@@ -461,15 +461,17 @@ class Client:
     def __init__(self, flags = 0, simulator = None):
         self.flags = flags
         self.simulator = simulator
+        self.tpm = open('/dev/tpm0', 'r+b')
+
+    def close(self):
+        self.tpm.close()
 
     def send_cmd(self, cmd):
         if self.simulator:
             rsp = self.simulator.send_cmd(cmd)
         else:
-            f = open('/dev/tpm0', 'r+b')
-            f.write(cmd)
-            rsp = f.read()
-            f.close()
+            self.tpm.write(cmd)
+            rsp = self.tpm.read()
 
         if (self.flags & Client.FLAG_DEBUG) != 0:
             sys.stderr.write('cmd' + os.linesep)
diff --git a/tpm2_smoke.py b/tpm2_smoke.py
index 80bb4aa..500a230 100755
--- a/tpm2_smoke.py
+++ b/tpm2_smoke.py
@@ -41,6 +41,7 @@ class SmokeTest(unittest.TestCase):
 
     def tearDown(self):
         self.client.flush_context(self.root_key)
+        self.client.close()
 
     def test_seal_with_auth(self):
         data = 'X' * 64