Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: pkcs11.h

Issue 2523001: Implemented ReadObjectsFromSlot() to populate pkcs11.slots on initialization. (Closed) Base URL: ssh://git@chromiumos-git/entd.git
Patch Set: Small change from feedback Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « js_object_wrapper.h ('k') | pkcs11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkcs11.h
diff --git a/pkcs11.h b/pkcs11.h
index 70b4bc58f3ccd4b71ad4b5ba79157e1f76b7da46..faa194f690fdb65614d4c7d69f7eebfa7b257e9b 100644
--- a/pkcs11.h
+++ b/pkcs11.h
@@ -21,6 +21,7 @@ class Certificate;
class CSR;
class Pkcs11CertificateHandler;
class Pkcs11SlotHandler;
+class SlotObject;
// Implementation class for interfacing with pkcs11 devices,
// including generation of Certificate Service Requests (CSR)
@@ -108,6 +109,9 @@ class Pkcs11 : public JSObjectWrapper<Pkcs11> {
// Call this *instead of* Initialize() to use local files
bool InitializeLocalFiles(const std::string& csr, const std::string& cert);
+ // Adds slot_object to "pkcs11.slots"
+ bool AddJSSlotObject(const SlotObject* slot_object);
+
// JSObjectWrapper functions
static const char* GetClassName() { return "pkcs11"; }
static void SetTemplateBindings(
@@ -125,6 +129,8 @@ class Pkcs11 : public JSObjectWrapper<Pkcs11> {
scoped_ptr<Pkcs11CertificateHandler> certificate_handler_;
scoped_ptr<Pkcs11SlotHandler> slot_handler_;
+ void SetupHandlers();
+
DISALLOW_COPY_AND_ASSIGN(Pkcs11);
};
« no previous file with comments | « js_object_wrapper.h ('k') | pkcs11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698