Overview
Comment: | ChromeOS: Try to supply the user PIN to the card |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
036113d0513f7c3b9831984c55834cfc |
User & Date: | rkeene on 2016-02-15 07:22:53 |
Other Links: | manifest | tags |
Context
2016-02-15
| ||
07:31 | ChromeOS: Attempt to sign the correctly prefixed data check-in: 7879121689 user: rkeene tags: trunk | |
07:22 | ChromeOS: Try to supply the user PIN to the card check-in: 036113d051 user: rkeene tags: trunk | |
06:45 | ChromeOS: Removed extraneous PIN clearing check-in: 4509382d11 user: rkeene tags: trunk | |
Changes
Modified build/chrome/cackey.js from [79b6d25629] to [bf69054466].
︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | var pinWindowPINValue = ""; var pinWindowPreviousHandle = null; /* * Messages that may need to be retried after getting a PIN */ var cackeyMessagesToRetry = []; /* * Handle a response from the NaCl side regarding certificates available */ function cackeyMessageIncomingListCertificates(message, chromeCallback) { var idx; var certificates = []; | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | var pinWindowPINValue = ""; var pinWindowPreviousHandle = null; /* * Messages that may need to be retried after getting a PIN */ var cackeyMessagesToRetry = []; /* * Stored PIN for a given certificate */ var cackeyCertificateToPINMap = {}; /* * Compute a text-based handle for a certificate to be hashed by */ function cackeyCertificateToPINID(certificate) { var id; var certificateArray; id = ""; certificateArray = new Uint8Array(certificate); certificateArray.map( function(byte) { id += ("0" + byte.toString(16)).slice(-2); } ); delete certificateArray; return(id); } /* * Handle a response from the NaCl side regarding certificates available */ function cackeyMessageIncomingListCertificates(message, chromeCallback) { var idx; var certificates = []; |
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | if (messageEvent.data.target != "cackey") { return; } console.log("START MESSAGE"); console.log(messageEvent.data); console.log("END MESSAGE"); if (messageEvent.data.id == null) { return; } chromeCallback = cackeyOutstandingCallbacks[messageEvent.data.id]; | > > > > > > > > > > | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | if (messageEvent.data.target != "cackey") { return; } console.log("START MESSAGE"); console.log(messageEvent.data); console.log("END MESSAGE"); /* * If we failed for some reason and we have a certificate in the original * request then forget any PIN associated with that certificate */ if (messageEvent.data.status != "success") { if (messageEvent.data.originalrequest.certificate) { delete cackeyCertificateToPINMap[cackeyCertificateToPINID(messageEvent.data.originalrequest.certificate)]; } } if (messageEvent.data.id == null) { return; } chromeCallback = cackeyOutstandingCallbacks[messageEvent.data.id]; |
︙ | ︙ | |||
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | tmpMessageEvent.data.status = "error"; tmpMessageEvent.data.error = "PIN window closed without a PIN being provided"; cackeyMessageIncoming(tmpMessageEvent); } else { tmpMessageEvent.data.originalrequest.pin = pinWindowPINValue; cackeyHandle.postMessage(tmpMessageEvent.data.originalrequest); } delete cackeyMessagesToRetry[messageIdx]; } return; }) /* * Pass this message off to the other window so that it may resubmit the request. */ pinWindow.contentWindow.parentWindow = window; | > > > > > > > | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | tmpMessageEvent.data.status = "error"; tmpMessageEvent.data.error = "PIN window closed without a PIN being provided"; cackeyMessageIncoming(tmpMessageEvent); } else { tmpMessageEvent.data.originalrequest.pin = pinWindowPINValue; cackeyCertificateToPINMap[cackeyCertificateToPINID(tmpMessageEvent.data.originalrequest.certificate)] = pinWindowPINValue; cackeyHandle.postMessage(tmpMessageEvent.data.originalrequest); } delete cackeyMessagesToRetry[messageIdx]; } /* * We are done fetching the user PIN, clear the value */ pinWindowPINValue = ""; return; }) /* * Pass this message off to the other window so that it may resubmit the request. */ pinWindow.contentWindow.parentWindow = window; |
︙ | ︙ | |||
259 260 261 262 263 264 265 266 267 268 269 270 | } /* * Handler for messages from Chrome related to signing a hash of some sort */ function cackeySignMessage(signRequest, chromeCallback) { var callbackId; console.log("[cackey] Asked to sign a message -- throwing that request over to the NaCl side... "); callbackId = cackeyOutstandingCallbackCounter + 1; | > > | < | | | | | > | > | > > > > > | 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | } /* * Handler for messages from Chrome related to signing a hash of some sort */ function cackeySignMessage(signRequest, chromeCallback) { var callbackId; var command; var certificateId; console.log("[cackey] Asked to sign a message -- throwing that request over to the NaCl side... "); callbackId = cackeyOutstandingCallbackCounter + 1; command = { 'target': "cackey", 'command': "sign", 'id': callbackId, 'certificate': signRequest.certificate, 'data': signRequest.digest /* XXX:TODO: This needs to be prefixed based on the signRequest.hash */ }; certificateId = cackeyCertificateToPINID(command.certificate); if (cackeyCertificateToPINMap[certificateId]) { command.pin = cackeyCertificateToPINMap[certificateId]; } cackeyHandle.postMessage(command); cackeyOutstandingCallbackCounter = callbackId; cackeyOutstandingCallbacks[callbackId] = chromeCallback; console.log("[cackey] Thrown."); return; |
︙ | ︙ |