Update cryptotoken to 0.8.63

chrome/browser/resources/cryptotoken/usbenrollhandler.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Implements an enroll handler using USB gnubbies.
  */
 'use strict';
 
 /**
@@ skipping 80 matching lines @@
  *     results from more gnubbies.
  * @private
  */
 UsbEnrollHandler.prototype.signerFoundGnubby_ =
     function(signResult, moreExpected) {
   if (!signResult.code) {
     // If the signer reports a gnubby can sign, report this immediately to the
     // caller, as the gnubby is already enrolled. Map ok to WRONG_DATA, so the
     // caller knows what to do.
     this.notifyError_(DeviceStatusCodes.WRONG_DATA_STATUS);
-  } else if (signResult.code == DeviceStatusCodes.WRONG_DATA_STATUS) {
+  } else if (signResult.code == DeviceStatusCodes.WRONG_DATA_STATUS ||
+      signResult.code == DeviceStatusCodes.WRONG_LENGTH_STATUS) {
     var gnubby = signResult['gnubby'];
     // A valid helper request contains at least one enroll challenge, so use
     // the app id hash from the first challenge.
     var appIdHash = this.request_.enrollChallenges[0].appIdHash;
     DEVICE_FACTORY_REGISTRY.getGnubbyFactory().notEnrolledPrerequisiteCheck(
         gnubby, appIdHash, this.gnubbyPrerequisitesChecked_.bind(this));
   }
 };
 
 /**
@@ skipping 87 matching lines @@
  * @param {Gnubby} gnubby Gnubby instance
  * @param {string} version Protocol version
  * @private
  */
 UsbEnrollHandler.prototype.tryEnroll_ = function(gnubby, version) {
   var challenge = this.getChallengeOfVersion_(version);
   if (!challenge) {
     this.removeWrongVersionGnubby_(gnubby);
     return;
   }
-  var challengeChallenge = B64_decode(challenge['challenge']);
-  var appIdHash = B64_decode(challenge['appIdHash']);
-  gnubby.enroll(challengeChallenge, appIdHash,
-      this.enrollCallback_.bind(this, gnubby, version));
+  var challengeValue = B64_decode(challenge['challengeHash']);
+  var appIdHash = challenge['appIdHash'];
+  var individualAttest =
+      DEVICE_FACTORY_REGISTRY.getIndividualAttestation().
+          requestIndividualAttestation(appIdHash);
+  gnubby.enroll(challengeValue, B64_decode(appIdHash),
+      this.enrollCallback_.bind(this, gnubby, version), individualAttest);
 };
 
 /**
  * Finds the (first) challenge of the given version in this helper's challenges.
  * @param {string} version Protocol version
  * @return {Object} challenge, if found, or null if not.
  * @private
  */
 UsbEnrollHandler.prototype.getChallengeOfVersion_ = function(version) {
   for (var i = 0; i < this.enrollChallenges.length; i++) {
@@ skipping 102 matching lines @@
   this.notified_ = true;
   this.close();
   var reply = {
     'type': 'enroll_helper_reply',
     'code': DeviceStatusCodes.OK_STATUS,
     'version': version,
     'enrollData': info
   };
   this.cb_(reply);
 };