From fa3feddf3a25e34db2ac57ff8e962f13db07bf40 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 25 May 2020 19:33:47 -0400
Subject: Untested conversion to support Python 3

---
 cryptech/py11/mutex.py | 92 +++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

(limited to 'cryptech/py11/mutex.py')

diff --git a/cryptech/py11/mutex.py b/cryptech/py11/mutex.py
index da2123c..d3807f6 100644
--- a/cryptech/py11/mutex.py
+++ b/cryptech/py11/mutex.py
@@ -33,57 +33,57 @@ encoded_format = "=L"
 
 encoded_length = len(pack(encoded_format, 0))
 encoded_type   = CK_BYTE * encoded_length
-handle_max     = unpack(encoded_format, chr(0xff) * encoded_length)[0]
+handle_max     = unpack(encoded_format, b"\xff" * encoded_length)[0]
 
 class Mutex(object):
 
-  def __init__(self, handle):
-    from threading import Lock
-    self.encoded = encoded_type(*handle)
-    self.lock    = Lock()
+    def __init__(self, handle):
+        from threading import Lock
+        self.encoded = encoded_type(*handle)
+        self.lock    = Lock()
 
 def p11_callback(func):
-  from threading import ThreadError
-  def wrapper(self, arg):
-    try:
-      func(self, arg)
-    except ThreadError, e:
-      print "Failed: %s" % e
-      return CKR_MUTEX_NOT_LOCKED.ckr_code
-    except Exception, e:
-      print "Failed: %s" % e
-      return CKR_FUNCTION_FAILED.ckr_code
-    else:
-      return CKR_OK
-  return wrapper
+    from threading import ThreadError
+    def wrapper(self, arg):
+        try:
+            func(self, arg)
+        except ThreadError as e:
+            print("Failed: %s" % e)
+            return CKR_MUTEX_NOT_LOCKED.ckr_code
+        except Exception as e:
+            print("Failed: %s" % e)
+            return CKR_FUNCTION_FAILED.ckr_code
+        else:
+            return CKR_OK
+    return wrapper
 
 class MutexDB(object):
 
-  def __init__(self):
-    self.mutexes = {}
-    self.next_handle = 0
-
-  def find_free_handle(self):
-    if len(self.mutexes) > handle_max:
-      raise RuntimeError
-    while self.next_handle in self.mutexes:
-      self.next_handle = (self.next_handle + 1) & handle_max
-    return pack(encoded_format, self.next_handle)
-
-  @p11_callback
-  def create(self, handle_ptr):
-    handle = self.find_free_handle()
-    self.mutexes[handle] = Mutex(handle)
-    handle_ptr[0] = self.mutexes[handle].encoded
-
-  @p11_callback
-  def destroy(self, handle):
-    del self.mutexes[handle[:encoded_length]]
-
-  @p11_callback
-  def lock(self, handle):
-    self.mutexes[handle[:encoded_length]].lock.acquire()
-
-  @p11_callback
-  def unlock(self, handle):
-    self.mutexes[handle[:encoded_length]].lock.release()
+    def __init__(self):
+        self.mutexes = {}
+        self.next_handle = 0
+
+    def find_free_handle(self):
+        if len(self.mutexes) > handle_max:
+            raise RuntimeError
+        while self.next_handle in self.mutexes:
+            self.next_handle = (self.next_handle + 1) & handle_max
+        return pack(encoded_format, self.next_handle)
+
+    @p11_callback
+    def create(self, handle_ptr):
+        handle = self.find_free_handle()
+        self.mutexes[handle] = Mutex(handle)
+        handle_ptr[0] = self.mutexes[handle].encoded
+
+    @p11_callback
+    def destroy(self, handle):
+        del self.mutexes[handle[:encoded_length]]
+
+    @p11_callback
+    def lock(self, handle):
+        self.mutexes[handle[:encoded_length]].lock.acquire()
+
+    @p11_callback
+    def unlock(self, handle):
+        self.mutexes[handle[:encoded_length]].lock.release()
-- 
cgit v1.2.3