Changeset 115

Timestamp:

02/11/08 09:09:17 (2 years ago)

Author:

lrousseau

Message:

add getMechanismList() method

See Ticket #11

Files:

• pykcs11/trunk/PyKCS11/__init__.py (modified) (1 diff)
• 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

@@ -445 +445 @@
-        return s
-
+    def getMechanismList(self, slot):
+        """
+        C_GetMechanismList
+
+        @return: the list of available mechanisms for a slot
+        @rtype: list
+        """
+        mechanismList = PyKCS11.LowLevel.ckintlist()
+        rv = self.lib.C_GetMechanismList(slot, mechanismList)
+        if rv != CKR_OK:
+            raise PyKCS11Error(rv)
+
+        m = []
+        for x in xrange(len(mechanismList)):
+            m.append(CKM[mechanismList[x]])
+        return m
+
-class Mechanism:
-    """Wraps CK_MECHANISM"""

pykcs11/trunk/samples/getinfo.py

@@ -116 +116 @@
-    colorize("  utcTime:", t.utcTime)
-
+    m = pkcs11.getMechanismList(slots[slot])
+    print "  Mechanism list: "
+    for x in m:
+        print "   " + blue + x + normal
+
-    if pin_available:
-        session.logout()

pykcs11/trunk/src/pkcs11lib.cpp

@@ -952 +952 @@
-}
-
+CK_RV CPKCS11Lib::C_GetMechanismList(
+        unsigned long slotID,
+        vector<long> &mechanismList)
+{
+        CPKCS11LIB_PROLOGUE(C_GetMechanismList);
+
+        CK_ULONG i;
+        mechanismList.clear();
+        CK_MECHANISM_TYPE ck_mechanismList[1024];
+        CK_ULONG ulCount = sizeof(ck_mechanismList)/sizeof(ck_mechanismList[0]);
+        rv = m_pFunc->C_GetMechanismList(slotID, ck_mechanismList, &ulCount);
+        if (CKR_OK == rv)
+                for(i=0; i<ulCount; i++)
+                        mechanismList.push_back(ck_mechanismList[i]);
+
+        CPKCS11LIB_EPILOGUE;
+        return rv;
+}
+
-///////////////////////////////////////////////////////////////////////////////
-

pykcs11/trunk/src/pkcs11lib.h

@@ -283 +283 @@
-                unsigned long* pSlot);
-
+        CK_RV C_GetMechanismList(
+                unsigned long slotID,
+                vector<long> &mechanismList);
+
-};
-