Manage attributes through AttributeMapper class

 - Provide entry point for user overrides in object templates
 - Allow user-supplied support for extra attributes in a
   forward-compatible manner

Author: MatthiasValvekens

pkcs11/_pkcs11.pxd

@@ -626,83 +626,6 @@ cdef inline CK_ULONG_buffer(length):
     return array(shape=(length,), itemsize=sizeof(CK_ULONG), format='L')
 
 
-cdef inline bytes _pack_attribute(key, value):
-    """Pack a Attribute value into a bytes array."""
-
-    try:
-        pack, _ = ATTRIBUTE_TYPES[key]
-        return pack(value)
-    except KeyError:
-        raise NotImplementedError("Can't pack this %s. "
-                                  "Expand ATTRIBUTE_TYPES!" % key)
-
-
-cdef inline _unpack_attributes(key, value):
-    """Unpack a Attribute bytes array into a Python value."""
-
-    try:
-        _, unpack = ATTRIBUTE_TYPES[key]
-        return unpack(value)
-    except KeyError:
-        raise NotImplementedError("Can't unpack this %s. "
-                                  "Expand ATTRIBUTE_TYPES!" % key)
-
-
-cdef inline _default_public_key_template(
-        capabilities, id, label, store,
-):
-    # Build attributes
-    return {
-        Attribute.CLASS: ObjectClass.PUBLIC_KEY,
-        Attribute.ID: id or b'',
-        Attribute.LABEL: label or '',
-        Attribute.TOKEN: store,
-        # Capabilities
-        Attribute.ENCRYPT: MechanismFlag.ENCRYPT & capabilities,
-        Attribute.WRAP: MechanismFlag.WRAP & capabilities,
-        Attribute.VERIFY: MechanismFlag.VERIFY & capabilities,
-    }
-
-
-cdef inline _default_private_key_template(
-        capabilities, id, label, store,
-):
-    return {
-        Attribute.CLASS: ObjectClass.PRIVATE_KEY,
-        Attribute.ID: id or b'',
-        Attribute.LABEL: label or '',
-        Attribute.TOKEN: store,
-        Attribute.PRIVATE: True,
-        Attribute.SENSITIVE: True,
-        # Capabilities
-        Attribute.DECRYPT: MechanismFlag.DECRYPT & capabilities,
-        Attribute.UNWRAP: MechanismFlag.UNWRAP & capabilities,
-        Attribute.SIGN: MechanismFlag.SIGN & capabilities,
-        Attribute.DERIVE: MechanismFlag.DERIVE & capabilities,
-    }
-
-
-cdef inline _default_secret_key_template(
-        capabilities, id, label, store,
-):
-    return {
-        Attribute.CLASS: ObjectClass.SECRET_KEY,
-        Attribute.ID: id or b'',
-        Attribute.LABEL: label or '',
-        Attribute.TOKEN: store,
-        Attribute.PRIVATE: True,
-        Attribute.SENSITIVE: True,
-        # Capabilities
-        Attribute.ENCRYPT: MechanismFlag.ENCRYPT & capabilities,
-        Attribute.DECRYPT: MechanismFlag.DECRYPT & capabilities,
-        Attribute.WRAP: MechanismFlag.WRAP & capabilities,
-        Attribute.UNWRAP: MechanismFlag.UNWRAP & capabilities,
-        Attribute.SIGN: MechanismFlag.SIGN & capabilities,
-        Attribute.VERIFY: MechanismFlag.VERIFY & capabilities,
-        Attribute.DERIVE: MechanismFlag.DERIVE & capabilities,
-    }
-
-
 cdef inline object map_rv_to_error(
         CK_RV rv
 ):