Overview
| Comment: | ChromeOS: Fix issue where multiple calls made close together may have used the same ID |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
40765d77283c64f16fe86ee3f84b194a |
| User & Date: | rkeene on 2016-03-09 04:40:03 |
| Other Links: | manifest | tags |
Context
|
2016-03-09
| ||
| 04:48 | ChromeOS: Added list of readers detected to smartcard UI check-in: e0f544bc9b user: rkeene tags: trunk | |
| 04:40 | ChromeOS: Fix issue where multiple calls made close together may have used the same ID check-in: 40765d7728 user: rkeene tags: trunk | |
| 04:30 | ChromeOS: Added support for listing smartcard readers check-in: 64c4c68fa6 user: rkeene tags: trunk | |
Changes
Modified build/chrome/cackey.js from [acab99bc2a] to [cc6681845c].
| ︙ | ︙ | |||
407 408 409 410 411 412 413 |
function cackeyListCertificates(chromeCallback) {
var callbackId;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Asked to provide a list of certificates -- throwing that request over to the NaCl side... ");
}
| | < | < | 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 |
function cackeyListCertificates(chromeCallback) {
var callbackId;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Asked to provide a list of certificates -- throwing that request over to the NaCl side... ");
}
callbackId = ++cackeyOutstandingCallbackCounter;
cackeyInitPCSC(function() {
cackeyHandle.postMessage(
{
'target': "cackey",
'command': "listcertificates",
'id': callbackId
}
);
cackeyOutstandingCallbacks[callbackId] = chromeCallback;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Thrown.");
}
}, chromeCallback);
return;
}
/*
* Handler for messages from Chrome related to listing readers
*/
function cackeyListReaders(chromeCallback) {
var callbackId;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Asked to provide a list of readers -- throwing that request over to the NaCl side... ");
}
callbackId = ++cackeyOutstandingCallbackCounter;
cackeyInitPCSC(function() {
cackeyHandle.postMessage(
{
'target': "cackey",
'command': "listreaders",
'id': callbackId
}
);
cackeyOutstandingCallbacks[callbackId] = chromeCallback;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Thrown.");
}
}, chromeCallback);
|
| ︙ | ︙ | |||
501 502 503 504 505 506 507 |
delete digestHeader;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Asked to sign a message -- throwing that request over to the NaCl side... ");
}
| | < | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 |
delete digestHeader;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Asked to sign a message -- throwing that request over to the NaCl side... ");
}
callbackId = ++cackeyOutstandingCallbackCounter;
command = {
'target': "cackey",
'command': "sign",
'id': callbackId,
'certificate': signRequest.certificate,
'data': digest.buffer
};
certificateId = cackeyCertificateToPINID(command.certificate);
if (cackeyCertificateToPINMap[certificateId] && cackeyCertificateToPINMap[certificateId].pin) {
command.pin = cackeyCertificateToPINMap[certificateId].pin;
cackeyCertificateToPINMapUpdateLastUsed(certificateId);
}
cackeyInitPCSC(function() {
cackeyHandle.postMessage(command);
cackeyOutstandingCallbacks[callbackId] = chromeCallback;
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("[cackey] Thrown.");
}
}, chromeCallback);
|
| ︙ | ︙ |