From f2b8078cb1138d9935c842ba85fcc66e36b199ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 9 Dec 2009 11:13:54 +0000
Subject: [PATCH] new method Init.reset() - try whether we can find newly added
 slots

---
 install-64-and-32-bit-linux.sh | 8 +++++---
 src/cryptoki.cxx               | 8 +-------
 src/cryptoki.hxx               | 8 ++++++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/install-64-and-32-bit-linux.sh b/install-64-and-32-bit-linux.sh
index 1cf121b..b1d1813 100755
--- a/install-64-and-32-bit-linux.sh
+++ b/install-64-and-32-bit-linux.sh
@@ -1,5 +1,8 @@
 ./bootstrap.sh && \
-LDFLAGS="-L/usr/lib32 -m32" CXXFLAGS="-m32" ./configure \
+LDFLAGS="-L/usr/lib32 -m32" \
+  CXXFLAGS="-m32" \
+  CPPFLAGS="-DCRYPTOKI_LOG\(X\)='std::clog<<X<<"'"@"'"<<__PRETTY_FUNCTION__<<std::endl'" \
+  ./configure \
   --libdir=/usr/local/lib32 \
   --build=x86_64 \
   --host=i386 && \
@@ -9,7 +12,7 @@ make clean && \
 LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
   CPPFLAGS="-I/opt/local/i586-mingw32msvc/include" \
   ./configure \
-  --prefix=/opt/local/i586-mingw32msvc \
+  --prefix=/opt/local/ig586-mingw32msvc \
   --build=x86_64 \
   --host=i586-mingw32msvc && \
 make && \
@@ -18,4 +21,3 @@ make clean && \
 ./configure && \
 make check && \
 sudo make install
-
diff --git a/src/cryptoki.cxx b/src/cryptoki.cxx
index 517b0a1..bc79aa2 100644
--- a/src/cryptoki.cxx
+++ b/src/cryptoki.cxx
@@ -292,6 +292,7 @@ namespace cryptoki {
     attrs.push_back(Attribute(CKA_ISSUER, cert.issuerDER()));
     attrs.push_back(Attribute(CKA_SERIAL_NUMBER, cert.serial()));
     attrs.push_back(Attribute(CKA_VALUE, cert.valueDER()));
+    CRYPTOKI_LOG("create: serial = "<<crypto::hex(cert.serial()));
     return create(attrs);
   }
   
@@ -337,13 +338,6 @@ namespace cryptoki {
     return create(attrs);
   }
   
-  Object Session::create(const std::string& label,
-                         const openssl::PKCS12& p12) {
-    CRYPTOKI_LOG("log");
-    AttributeList attrs;
-    return create(attrs);
-  }
-
   //----------------------------------------------------------------------------
   Object Session::create(const AttributeList& attrs) {
     CRYPTOKI_LOG("log");
diff --git a/src/cryptoki.hxx b/src/cryptoki.hxx
index 717c7fa..f8e6e7a 100644
--- a/src/cryptoki.hxx
+++ b/src/cryptoki.hxx
@@ -776,6 +776,12 @@ namespace cryptoki {
         }
       }
 
+      Init& reset() {
+        check(_fn->C_Finalize(0), CRYPTOKI_FN_LOG("C_Finalize"));
+        check(_fn->C_Initialize(0), CRYPTOKI_FN_LOG("C_Initialize"));
+        return *this;
+      }
+
       /*! @name                                            C Like Error Handling
 
           You are strongly recommended not to disable exception
@@ -1083,8 +1089,6 @@ namespace cryptoki {
       //! Create a new PrivateKey Object.
       Object create(const std::string& label, const openssl::PrivateKey& key,
                     const openssl::X509& cert);
-      //! Create a new Certificate and optional PrivateKey Object.
-      Object create(const std::string& label, const openssl::PKCS12& p12);
       
       //@}