Explicitly logging out the token to avoid leaving it in a non-stable state.

crypto_pkcs11.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ENTD_CRYPTO_PKCS11_H_
 #define ENTD_CRYPTO_PKCS11_H_
 
 #include <string>
 #include <map>
 
@@ skipping 107 matching lines @@
    private:
     SlotMap slot_map_;
   };
 
   class Session : public Scriptable<Session> {
    public:
     static const std::string class_name() {
       return "entd.crypto.Pkcs11.Session";
     };
 
-    Session() : session_handle_(0) {}
+    Session() : session_handle_(0), logged_in_(false) {}
     ~Session() {
+      if (logged_in_)
+        C_Logout(session_handle_);
       if (session_handle_)
         C_CloseSession(session_handle_);
     }
 
     bool Initialize(const CK_SLOT_ID slot_id,
                     const CK_SESSION_HANDLE& session_handle);
     static bool InitializeTemplate(v8::Handle<v8::FunctionTemplate> ctor_t);
 
     v8::Handle<v8::Value> Construct(const v8::Arguments& args) {
       return ThrowNoScriptableConstructor();
     }
 
     // Call C_GetSessionInfo(), and copy the results to the js_object().
     bool Refresh();
 
     // Stubs for PKCS#11 C_* functions of the same name.
     v8::Handle<v8::Value> Close(const v8::Arguments& args);
     v8::Handle<v8::Value> Login(const v8::Arguments& args);
     v8::Handle<v8::Value> Logout(const v8::Arguments& args);
     v8::Handle<v8::Value> InitPin(const v8::Arguments& args);
     v8::Handle<v8::Value> SetPin(const v8::Arguments& args);
     v8::Handle<v8::Value> FindObjects(const v8::Arguments& args);
     v8::Handle<v8::Value> CreateObject(const v8::Arguments& args);
     v8::Handle<v8::Value> GenerateKeyPair(const v8::Arguments& args);
 
+    // Helper functions.
+    v8::Handle<v8::Value> LogoutAndClose(const v8::Arguments& args);
+
     // Invoke the 'bool Refresh()' method from script.
     v8::Handle<v8::Value> CallRefresh(const v8::Arguments& args);
 
    private:
     CK_SLOT_ID slot_id_;
     CK_SESSION_HANDLE session_handle_;
+    bool logged_in_;
   };
 
   class Object : public Scriptable<Object> {
    public:
     static const std::string class_name() {
       return "entd.crypto.Pkcs11.Object";
     };
 
     Object() : session_handle_(0), object_handle_(0) {}
     ~Object() {}
@@ skipping 25 matching lines @@
   // This can be called multiple times.  It will keep trying to initialize the
   // library until it succeeds, then it will become a no-op.
   static CK_RV InitializeLibrary();
 };
 
 } // namespace crypto
 
 } // namespace entd
 
 #endif // ENTD_CRYPTO_PKCS11_H_