Check-in [bdb2e8cfb1]
Overview
SHA1:bdb2e8cfb1ef1a3388cde3524ed99436bf529112
Date: 2016-02-28 22:12:14
User: rkeene
Comment:ChromeOS: Delayed PCSC initialization even further until we receieved positive confirmation that initialization completed
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-02-28
22:37
[1a6c58edd1] ChromeOS: Added basic UI page that shows certificates (user: rkeene, tags: trunk)
22:12
[bdb2e8cfb1] ChromeOS: Delayed PCSC initialization even further until we receieved positive confirmation that initialization completed (user: rkeene, tags: trunk)
21:22
[789f3b2324] ChromeOS: Improved cleanup after crash (user: rkeene, tags: trunk)
Changes

Modified build/chrome/cackey.js from [76d1838f47] to [42af92888f].

138
139
140
141
142
143
144








145
146
147
148
149
150
151
...
666
667
668
669
670
671
672






673
674
675
676
677
678
679
...
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
	if (messageEvent.data.status != "success") {
		if (messageEvent.data.originalrequest) {
			if (messageEvent.data.originalrequest.certificate) {
				delete cackeyCertificateToPINMap[cackeyCertificateToPINID(messageEvent.data.originalrequest.certificate)];
			}
		}
	}









	if (messageEvent.data.id == null) {
		return;
	}

	chromeCallback = cackeyOutstandingCallbacks[messageEvent.data.id];

................................................................................
			"focused": true,
			"innerBounds": {
				"width": 350,
				"minWidth": 350,
				"height": 135,
				"minHeight": 135
			}






		});
	});

	/*
	 * Register a handler for dealing with the PCSC port being disconnected
	 */
	oldOnPortDisconnectedFunction = GoogleSmartCard.Pcsc.prototype.onPortDisconnected_;
................................................................................
	/*
	 * Register a handler for dealing with the PCSC port being available
	 */
	oldPCSCInitializationCallback = GoogleSmartCard.PcscNacl.prototype.pcscInitializationCallback_;
	GoogleSmartCard.PcscNacl.prototype.pcscInitializationCallback_ = function(requestId, instanceId, instance, error) {
		oldPCSCInitializationCallback.apply(this, [requestId, instanceId, instance, error]);

		cackeyInitPCSCCompleted();

		return;
	};

	/*
	 * Initialize global state
	 */
	cackeyInitGlobalState();







>
>
>
>
>
>
>
>







 







>
>
>
>
>
>







 







<
<







138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
...
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
...
702
703
704
705
706
707
708


709
710
711
712
713
714
715
	if (messageEvent.data.status != "success") {
		if (messageEvent.data.originalrequest) {
			if (messageEvent.data.originalrequest.certificate) {
				delete cackeyCertificateToPINMap[cackeyCertificateToPINID(messageEvent.data.originalrequest.certificate)];
			}
		}
	}

	if (messageEvent.data.command == "init" && messageEvent.data.status == "success") {
		if (GoogleSmartCard.IS_DEBUG_BUILD) {
			console.log("[cackey] Initialization completed, resending any queued messages");
		}

		cackeyInitPCSCCompleted();
	}

	if (messageEvent.data.id == null) {
		return;
	}

	chromeCallback = cackeyOutstandingCallbacks[messageEvent.data.id];

................................................................................
			"focused": true,
			"innerBounds": {
				"width": 350,
				"minWidth": 350,
				"height": 135,
				"minHeight": 135
			}
		}, function(uiWindow) {
			if (!uiWindow) {
				return;
			}

			uiWindow.contentWindow.parentWindow = window;
		});
	});

	/*
	 * Register a handler for dealing with the PCSC port being disconnected
	 */
	oldOnPortDisconnectedFunction = GoogleSmartCard.Pcsc.prototype.onPortDisconnected_;
................................................................................
	/*
	 * Register a handler for dealing with the PCSC port being available
	 */
	oldPCSCInitializationCallback = GoogleSmartCard.PcscNacl.prototype.pcscInitializationCallback_;
	GoogleSmartCard.PcscNacl.prototype.pcscInitializationCallback_ = function(requestId, instanceId, instance, error) {
		oldPCSCInitializationCallback.apply(this, [requestId, instanceId, instance, error]);



		return;
	};

	/*
	 * Initialize global state
	 */
	cackeyInitGlobalState();