Changeset 117

Timestamp:

02/11/08 10:16:41 (2 years ago)

Author:

lrousseau

Message:

add support of C_GetMechanismInfo

See Ticket #11

Files:

• pykcs11/trunk/PyKCS11/__init__.py (modified) (3 diffs)
• pykcs11/trunk/samples/getinfo.py (modified) (1 diff)
• pykcs11/trunk/src/pkcs11lib.cpp (modified) (1 diff)
• pykcs11/trunk/src/pkcs11lib.h (modified) (1 diff)

pykcs11/trunk/PyKCS11/__init__.py

@@ -49 +49 @@
-        if x[3:] != "_VENDOR_DEFINED":
-            eval(x[:3])[eval(x)] = x # => CKM[CKM_RSA_PKCS] = 'CKM_RSA_PKCS'
+            eval(x[:3])[x] = eval(x) # => CKM['CKM_RSA_PKCS'] = CKM_RSA_PKCS
-
-class CK_SLOT_INFO:
@@ -177 +178 @@
-            if self.flags & v:
-                r.append(CK_TOKEN_INFO.flags_dict[v])
+        return r
+
+class CK_MECHANISM_INFO:
+    """
+    matches the PKCS#11 CK_MECHANISM_INFO structure
+
+    @ivar ulMinKeySize: minimum size of the key
+    @type ulMinKeySize: integer
+    @ivar ulMaxKeySize: maximum size of the key
+    @type ulMaxKeySize: integer
+    @ivar flags: bit flags specifying mechanism capabilities
+    @type flags: integer
+    """
+
+    flags_dict = {
+        CKF_HW: "CKF_HW",
+        CKF_ENCRYPT: "CKF_ENCRYPT",
+        CKF_DECRYPT: "CKF_DECRYPT",
+        CKF_DIGEST: "CKF_DIGEST",
+        CKF_SIGN: "CKF_SIGN",
+        CKF_SIGN_RECOVER: "CKF_SIGN_RECOVER",
+        CKF_VERIFY: "CKF_VERIFY",
+        CKF_VERIFY_RECOVER: "CKF_VERIFY_RECOVER",
+        CKF_GENERATE: "CKF_GENERATE",
+        CKF_GENERATE_KEY_PAIR: "CKF_GENERATE_KEY_PAIR",
+        CKF_WRAP: "CKF_WRAP",
+        CKF_UNWRAP: "CKF_UNWRAP",
+        CKF_DERIVE: "CKF_DERIVE",
+        CKF_EXTENSION: "CKF_EXTENSION",
+    }
+
+    def flags2text(self):
+        """
+        parse the L{self.flags} field and create a list of "CKF_*" strings
+        corresponding to bits set in flags
+
+        @return: a list of strings
+        @rtype: list
+        """
+        r = []
+        for v in CK_MECHANISM_INFO.flags_dict.keys():
+            if self.flags & v:
+                r.append(CK_MECHANISM_INFO.flags_dict[v])
-        return r
-
@@ -462 +506 @@
-        return m
-
+    def getMechanismInfo(self, slot, type):
+        """
+        C_GetMechanismInfo
+
+        @return: information about a mechanism
+        @rtype: a L{CK_MECHANISM_INFO} object
+        """
+        info = PyKCS11.LowLevel.CK_MECHANISM_INFO()
+        rv = self.lib.C_GetMechanismInfo(slot, CKM[type], info)
+        if rv != CKR_OK:
+            raise PyKCS11Error(rv)
+
+        i = CK_MECHANISM_INFO()
+        i.ulMinKeySize = info.ulMinKeySize
+        i.ulMaxKeySize = info.ulMaxKeySize
+        i.flags = info.flags
+
+        return i
+
-class Mechanism:
-    """Wraps CK_MECHANISM"""

pykcs11/trunk/samples/getinfo.py

@@ -120 +120 @@
-    for x in m:
-        print "   " + blue + x + normal
+        i = pkcs11.getMechanismInfo(slots[slot], x)
+        colorize("    ulMinKeySize:", i.ulMinKeySize)
+        colorize("    ulMaxKeySize:", i.ulMaxKeySize)
+        colorize("    flags:", i.flags2text())
-
-    if pin_available:

pykcs11/trunk/src/pkcs11lib.cpp

@@ -971 +971 @@
-}
-
+CK_RV CPKCS11Lib::C_GetMechanismInfo(
+        unsigned long slotID,
+        unsigned long type,
+        CK_MECHANISM_INFO* pInfo)
+{
+        CPKCS11LIB_PROLOGUE(C_GetMechanismInfo);
+
+        rv = m_pFunc->C_GetMechanismInfo(slotID, type, pInfo);
+
+        CPKCS11LIB_EPILOGUE;
+        return rv;
+}
+
-///////////////////////////////////////////////////////////////////////////////
-

pykcs11/trunk/src/pkcs11lib.h

@@ -287 +287 @@
-                vector<long> &mechanismList);
-
+        CK_RV C_GetMechanismInfo(
+                unsigned long slotID,
+                unsigned long type,
+                CK_MECHANISM_INFO* pInfo);
+
-};
-