@@ -236,11 +236,11 @@
 #define PCSC_NACL_H 1
 #ifdef __cplusplus
 #include <ppapi/cpp/core.h>
 #include <ppapi/cpp/instance.h>
 
-void pcscNaClInit(pp::Instance *instance, pp::Core *core);
+void pcscNaClInit(pp::Instance *instance, pp::Core *core, const char *smartcardManagerAppId, const char *clientId);
 bool pcscNaClHandleMessage(const pp::Var &message);
 
 #endif
 #endif
 _EOF_
@@ -310,19 +310,27 @@
 #include "dom_requests_manager.h"
 #include "pcsc_nacl.h"
 
 static DomRequestsManager *pcscNaClDRM = NULL;
 
-void pcscNaClInit(pp::Instance *instance, pp::Core *core) {
+void pcscNaClInit(pp::Instance *instance, pp::Core *core, const char *smartcardManagerAppId, const char *clientId) {
 	DomRequestsManager::PpDelegateImpl *drmDelegateImpl;
 	PcscNacl *pcsc_nacl;
+
+	if (smartcardManagerAppId == NULL) {
+		smartcardManagerAppId = "khpfeaanjngmcnplbdlpegiifgpfgdco";
+	}
+
+	if (clientId == NULL) {
+		clientId = "UNKNOWN";
+	}
 
 	drmDelegateImpl = new DomRequestsManager::PpDelegateImpl(instance, core);
 
 	pcscNaClDRM = new DomRequestsManager("pcsc-nacl", drmDelegateImpl);
 
-	pcsc_nacl = new PcscNacl(pcscNaClDRM, "khpfeaanjngmcnplbdlpegiifgpfgdco", "CACKey");
+	pcsc_nacl = new PcscNacl(pcscNaClDRM, smartcardManagerAppId, clientId);
 
 	if (!pcsc_nacl->Initialize()) {
 		return;
 	}