Skip to content

pcks11: use bytes.decode on stderr #911

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

Merged
williamcroberts merged 1 commit into from
Dec 18, 2025
Merged

pcks11: use bytes.decode on stderr #911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions tools/tpm2_pkcs11/tpm2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def createprimary(self, hierarchyauth=None, objauth=None, alg=None, attrs=None,)
_, stderr = p.communicate()
if (p.wait()):
raise RuntimeError("Could not execute tpm2_createprimary: %s" %
stderr)
stderr.decode())
return ctx

def evictcontrol(self, hierarchyauth, ctx, handle=None):
Expand All @@ -103,13 +103,12 @@ def evictcontrol(self, hierarchyauth, ctx, handle=None):
stdout, stderr = p.communicate()
if (p.wait()):
raise RuntimeError("Could not execute tpm2_evictcontrol: %s" %
stderr)
stderr.decode())
return tr_file

def evictcontrol_remove(self, hierarchyauth, ctx, handle=None):

# Only provide persistent handle when removing
# persistent objects
# Only provide persistent handle when removing persistent objects
cmd = ['tpm2_evictcontrol', '-c', str(ctx)]

if hierarchyauth and len(hierarchyauth) > 0:
Expand All @@ -122,7 +121,7 @@ def evictcontrol_remove(self, hierarchyauth, ctx, handle=None):
stdout, stderr = p.communicate()
if (p.wait()):
raise RuntimeError("Could not execute tpm2_evictcontrol: %s" %
stderr)
stderr.decode())
return stdout

def readpublic(self, handle, get_tr_file=True, pub_blob_path=None):
Expand All @@ -141,7 +140,7 @@ def readpublic(self, handle, get_tr_file=True, pub_blob_path=None):
stdout, stderr = p.communicate()
if (p.wait()):
raise RuntimeError("Could not execute tpm2_readpublic: %s" %
stderr)
stderr.decode())
return (stdout, tr_file if get_tr_file else None)

def load(self, pctx, pauth, priv, pub):
Expand Down Expand Up @@ -174,7 +173,7 @@ def load(self, pctx, pauth, priv, pub):
_, stderr = p.communicate()
rc = p.wait()
if rc:
raise RuntimeError("Could not execute tpm2_load: %s" % stderr)
raise RuntimeError("Could not execute tpm2_load: %s" % stderr.decode())
return ctx

def unseal(self, ctx, auth):
Expand All @@ -185,7 +184,7 @@ def unseal(self, ctx, auth):
stdout, stderr = p.communicate()
rc = p.wait()
if rc:
raise RuntimeError("Could not execute tpm2_unseal: %s" % stderr)
raise RuntimeError("Could not execute tpm2_unseal: %s" % stderr.decode())
return stdout

def _encryptdecrypt(self, ctx, auth, data, decrypt=False):
Expand All @@ -200,7 +199,7 @@ def _encryptdecrypt(self, ctx, auth, data, decrypt=False):
rc = p.wait()
if rc:
raise RuntimeError("Could not execute tpm2_encryptdecrypt: %s" %
stderr)
stderr.decode())
return stdout

def encrypt(self, ctx, auth, data):
Expand Down Expand Up @@ -246,7 +245,7 @@ def create(self,
os.remove(pub)
os.remove(priv)
raise RuntimeError("Could not execute tpm2_create: %s" %
str(stderr))
stderr.decode())

return priv, pub, stdout

Expand All @@ -258,7 +257,7 @@ def getcap(self, cap):
stdout, stderr = p.communicate()
rc = p.wait()
if rc:
raise RuntimeError("Could not execute tpm2_getcap: %s" % stderr)
raise RuntimeError("Could not execute tpm2_getcap: %s" % stderr.decode())
return stdout

def importkey(self,
Expand Down Expand Up @@ -373,7 +372,7 @@ def importkey(self,
os.remove(priv)
print("command: %s" % str(" ".join(cmd)))
raise RuntimeError("Could not execute tpm2_import: %s" %
stderr)
stderr.decode())

return priv, pub, stdout

Expand All @@ -397,7 +396,7 @@ def changeauth(self, pctx, objctx, oldobjauth, newobjauth):
_, stderr = p.communicate()
rc = p.wait()
if rc:
raise RuntimeError("Could not execute tpm2_changeauth: %s" % stderr)
raise RuntimeError("Could not execute tpm2_changeauth: %s" % stderr.decode())

return newpriv

Expand All @@ -423,7 +422,7 @@ def sign(self, ctx, halg, scheme, message):
if (rc != 0):
print("command: %s" % str(" ".join(cmd)))
raise RuntimeError("Could not execute tpm2_import: %s" %
str(stderr))
stderr.decode())
data = open(sig, "rb").read()
os.unlink(sig)
return data