Merge pull request #64 from asaero/fix-truncated-strings

Changed _fix_string_length calls to instead use string slices.

Author: danni

pkcs11/_pkcs11.pyx

@@ -192,12 +192,13 @@ class Slot(types.Slot):
 
         assertRV(_funclist.C_GetTokenInfo(self.slot_id, &info))
 
-        _fix_string_length(info.label, sizeof(info.label))
-        _fix_string_length(info.serialNumber, sizeof(info.serialNumber))
-        _fix_string_length(info.manufacturerID, sizeof(info.manufacturerID))
-        _fix_string_length(info.model, sizeof(info.model))
+        label = info.label[:sizeof(info.label)]
+        serialNumber = info.serialNumber[:sizeof(info.serialNumber)]
+        model = info.model[:sizeof(info.model)]
+        manufacturerID = info.manufacturerID[:sizeof(info.manufacturerID)]
 
-        return Token(self, **info)
+        return Token(self, label, serialNumber, model, manufacturerID,
+                     info.hardwareVersion, info.firmwareVersion, info.flags)
 
     def get_mechanisms(self):
         cdef CK_ULONG count
@@ -1247,13 +1248,11 @@ cdef class lib:
         cdef CK_INFO info
         assertRV(_funclist.C_GetInfo(&info))
 
-        _fix_string_length(info.manufacturerID,
-                           sizeof(info.manufacturerID))
-        _fix_string_length(info.libraryDescription,
-                           sizeof(info.libraryDescription))
+        manufacturerID = info.manufacturerID[:sizeof(info.manufacturerID)]
+        libraryDescription = info.libraryDescription[:sizeof(info.libraryDescription)]
 
-        self.manufacturer_id = _CK_UTF8CHAR_to_str(info.manufacturerID)
-        self.library_description = _CK_UTF8CHAR_to_str(info.libraryDescription)
+        self.manufacturer_id = _CK_UTF8CHAR_to_str(manufacturerID)
+        self.library_description = _CK_UTF8CHAR_to_str(libraryDescription)
         self.cryptoki_version = _CK_VERSION_to_tuple(info.cryptokiVersion)
         self.library_version = _CK_VERSION_to_tuple(info.libraryVersion)
 
@@ -1291,12 +1290,13 @@ cdef class lib:
         for slotID in slotIDs:
             assertRV(_funclist.C_GetSlotInfo(slotID, &info))
 
-            _fix_string_length(info.slotDescription,
-                               sizeof(info.slotDescription))
-            _fix_string_length(info.manufacturerID,
-                               sizeof(info.manufacturerID))
+            slotDescription = info.slotDescription[:sizeof(info.slotDescription)]
+            manufacturerID = info.manufacturerID[:sizeof(info.manufacturerID)]
 
-            slots.append(Slot(self, slotID, **info))
+            slots.append(
+                Slot(self, slotID, slotDescription, manufacturerID,
+                     info.hardwareVersion, info.firmwareVersion, info.flags)
+            )
 
         return slots
 

pkcs11/_utils.pyx

@@ -36,8 +36,3 @@ cdef _unpack_attributes(key, value):
     except KeyError:
         raise NotImplementedError("Can't unpack this %s. "
                                   "Expand ATTRIBUTE_TYPES!" % key)
-
-
-cdef _fix_string_length(CK_UTF8CHAR *string, size_t size):
-    """Insert NUL-bytes into strings so Python knows their length."""
-    string[size - 1] = b'\0'

tests/test_aes.py

@@ -107,7 +107,6 @@ def test_sign_stream(self):
 
     @requires(Mechanism.AES_KEY_WRAP)
     @FIXME.opencryptoki  # can't set key attributes
-    @FIXME.travis  # Travis has an old OpenSSL
     def test_wrap(self):
         key = self.session.generate_key(pkcs11.KeyType.AES, 128, template={
             pkcs11.Attribute.EXTRACTABLE: True,