Index: build/chrome/build-deps ================================================================== --- build/chrome/build-deps +++ build/chrome/build-deps @@ -174,11 +174,11 @@ function buildPCSC() { local version url pkg sha256 configure_extra local archive workdir pkg='nacl-libpcsc' - version='179983e00b5ed8a8fead5d2f9bb35f5304716041' + version='a72d1992e9e7d70c885d3b34f9b75317fa8671ef' url="https://chiselapp.com/user/rkeene/repository/nacl-libpcsc/tarball/nacl-libpcsc-${version}.tar.gz?uuid=${version}" sha256='-' archive="archive/${pkg}-${version}.tar.gz" workdir="workdir-${RANDOM}${RANDOM}${RANDOM}${RANDOM}.build" Index: build/chrome/cackey-chrome-plugin.cc ================================================================== --- build/chrome/cackey-chrome-plugin.cc +++ build/chrome/cackey-chrome-plugin.cc @@ -32,11 +32,10 @@ virtual void HandleMessageThread(pp::VarDictionary *message, pp::Var *messagePlain) { cackey_chrome_returnType signRet; char *pinPrompt = NULL; const char *pin; - const char *smartcardManagerAppId = NULL; unsigned char buffer[8192]; struct cackey_certificate *certificates, incomingCertificateCACKey; struct cackey_reader *readers; pp::VarDictionary *reply, *readerInfo; pp::VarArray certificatesPPArray, readersPPArray; @@ -54,19 +53,11 @@ * Do the thing we are being asked to do */ reply = new pp::VarDictionary(); if (command.AsString() == "init") { - if (message->HasKey("smartcardManagerAppId")) { - smartcardManagerAppId = strdup(message->Get("smartcardManagerAppId").AsString().c_str()); - } - - pcscNaClInit(this, corePointer, smartcardManagerAppId, "CACKey"); - - if (smartcardManagerAppId) { - free((void *) smartcardManagerAppId); - } + pcscNaClInit(this, corePointer); reply->Set("status", "success"); } else if (command.AsString() == "listcertificates") { numCertificates = cackey_chrome_listCertificates(&certificates); Index: build/chrome/cackey.js ================================================================== --- build/chrome/cackey.js +++ build/chrome/cackey.js @@ -716,20 +716,23 @@ * Initialize CACKey with the correct handle to talk to the Google Smartcard Manager App */ cackeyHandle.postMessage( { "target": "cackey", - "command": "init", - "smartcardManagerAppId": "khpfeaanjngmcnplbdlpegiifgpfgdco" + "command": "init" } ); /* * Initialize the PCSC NaCl interface */ - new GoogleSmartCard.NaclModule(cackeyHandle); - cackeyPCSCHandle = new GoogleSmartCard.PcscLiteClient.NaclClientBackend(cackeyHandle.messageChannel, "CACKey", "khpfeaanjngmcnplbdlpegiifgpfgdco"); + cackeyPCSCHandle = new GoogleSmartCard.PcscLiteClient.NaclClientBackend( + null, + "CACKey", + "khpfeaanjngmcnplbdlpegiifgpfgdco", + cackeyHandle + ); console.log("[cackey] cackeyInitPCSC() complete"); return; }