Differences From
Artifact [06cf85fd98]:
30 30
31 31 virtual ~CACKeyInstance() {}
32 32
33 33 virtual void HandleMessageThread(pp::VarDictionary *message, pp::Var *messagePlain) {
34 34 cackey_chrome_returnType signRet;
35 35 char *pinPrompt = NULL;
36 36 const char *pin;
37 - const char *smartcardManagerAppId = NULL;
38 37 unsigned char buffer[8192];
39 38 struct cackey_certificate *certificates, incomingCertificateCACKey;
40 39 struct cackey_reader *readers;
41 40 pp::VarDictionary *reply, *readerInfo;
42 41 pp::VarArray certificatesPPArray, readersPPArray;
43 42 pp::VarArrayBuffer *certificateContents, *incomingCertificateContents, *incomingData, *outgoingData;
44 43 pp::Var command;
................................................................................
52 51
53 52 /*
54 53 * Do the thing we are being asked to do
55 54 */
56 55 reply = new pp::VarDictionary();
57 56
58 57 if (command.AsString() == "init") {
59 - if (message->HasKey("smartcardManagerAppId")) {
60 - smartcardManagerAppId = strdup(message->Get("smartcardManagerAppId").AsString().c_str());
61 - }
62 -
63 - pcscNaClInit(this, corePointer, smartcardManagerAppId, "CACKey");
64 -
65 - if (smartcardManagerAppId) {
66 - free((void *) smartcardManagerAppId);
67 - }
58 + pcscNaClInit(this, corePointer);
68 59
69 60 reply->Set("status", "success");
70 61 } else if (command.AsString() == "listcertificates") {
71 62 numCertificates = cackey_chrome_listCertificates(&certificates);
72 63
73 64 certificatesPPArray.SetLength(numCertificates);
74 65