From 1e903b58e4ab1589cf4763204526acfe8e4a387b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 1 Sep 2009 16:15:36 +0000
Subject: [PATCH] We can read objects :-)

---
 doc/examples/cryptoki-demo.cxx | 4 ++++
 doc/examples/makefile.am       | 2 +-
 src/cryptoki.hxx               | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/examples/cryptoki-demo.cxx b/doc/examples/cryptoki-demo.cxx
index cead680..022908e 100644
--- a/doc/examples/cryptoki-demo.cxx
+++ b/doc/examples/cryptoki-demo.cxx
@@ -68,6 +68,10 @@ int main(int argc, char const*const*const argv) try {
                  <<"maxKeySize: \""<<mechinfo.maxKeySize<<'"'<<std::endl
                  <<"flags: \""<<mechinfo.flags<<'"'<<std::endl;
       }
+      cryptoki::Session session(*it);
+      std::cout<<"-------------------- Objects -----------------"<<std::endl;
+      cryptoki::ObjectList objs(session.find());
+      std::cout<<"Objects Found: "<<objs.size()<<std::endl;
     } catch (std::exception& x) {
       std::cerr<<"**** FEHLER in "<<*argv<<": "<<x.what()<<std::endl;
     }
diff --git a/doc/examples/makefile.am b/doc/examples/makefile.am
index 98e2945..5575f3d 100644
--- a/doc/examples/makefile.am
+++ b/doc/examples/makefile.am
@@ -12,7 +12,7 @@ pcsc_demo_SOURCES = pcsc-demo.cxx
 pcsc_demo_LDADD = -lpcsclite
 
 cryptoki_demo_SOURCES = cryptoki-demo.cxx
-cryptoki_demo_LDADD = -ldl -lcryptoki++
+cryptoki_demo_LDADD = -ldl -lpthread -lcryptoki++
 cryptoki_demo_LDFLAGS = -L${top_builddir}/src
 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/src/cryptoki.hxx b/src/cryptoki.hxx
index 5524892..a85f936 100644
--- a/src/cryptoki.hxx
+++ b/src/cryptoki.hxx
@@ -668,7 +668,8 @@ namespace cryptoki {
       /*! @param slot slot to open a session on */
       Session(Slot& slot): _slot(slot), _session(0), _res(CKR_OK) {
         //! calls @c C_OpenSession
-        check(_slot._init->_fn->C_OpenSession(_slot._slot, 0, 0, 0, &_session),
+        check(_slot._init->_fn->C_OpenSession
+              (_slot._slot, CKF_SERIAL_SESSION, 0, 0, &_session),
               CRYPTOKI_FN_LOG("C_OpenSession"));
         //! @todo pass parameter
       }