Add VID/PID pairs for known U2F devices. Interrim explicit listing until HID

chrome/browser/resources/cryptotoken/gnubby-u2f.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 Gnubby methods related to U2F support.
  */
 'use strict';
 
 // Commands and flags of the Gnubby applet
@@ skipping 16 matching lines @@
 Gnubby.P1_TUP_TESTONLY = 0x04;
 /** Attest with device key */
 Gnubby.P1_INDIVIDUAL_KEY = 0x80;
 
 // Version values
 /** V1 of the applet. */
 Gnubby.U2F_V1 = 'U2F_V1';
 /** V2 of the applet. */
 Gnubby.U2F_V2 = 'U2F_V2';
 
+/**
+ * Google corporate appId hash
+ * @private
+ */
+Gnubby.GOOGLE_CORP_APP_ID_HASH_ = 'ZEZHL99u7Xvzwzcg8jZnbDbhtF6-BIXbiaPN_dJL1p8';
+
 /** Perform enrollment
  * @param {ArrayBuffer|Uint8Array} challenge Enrollment challenge
  * @param {ArrayBuffer|Uint8Array} appIdHash Hashed application id
  * @param {function(...)} cb Result callback
  */
 Gnubby.prototype.enroll = function(challenge, appIdHash, cb) {
   var apdu = new Uint8Array(
       [0x00,
        Gnubby.U2F_ENROLL,
-       Gnubby.P1_TUP_REQUIRED | Gnubby.P1_TUP_CONSUME |
-         Gnubby.P1_INDIVIDUAL_KEY,
+       Gnubby.P1_TUP_REQUIRED | Gnubby.P1_TUP_CONSUME,
        0x00, 0x00, 0x00,
        challenge.length + appIdHash.length]);
-  // TODO: only use P1_INDIVIDUAL_KEY for corp appIdHashes.
+  if (B64_encode(appIdHash) == Gnubby.GOOGLE_CORP_APP_ID_HASH_)
+    apdu[2] |= Gnubby.P1_INDIVIDUAL_KEY;
   var u8 = new Uint8Array(apdu.length + challenge.length +
       appIdHash.length + 2);
   for (var i = 0; i < apdu.length; ++i) u8[i] = apdu[i];
   for (var i = 0; i < challenge.length; ++i) u8[i + apdu.length] =
     challenge[i];
   for (var i = 0; i < appIdHash.length; ++i) {
     u8[i + apdu.length + challenge.length] = appIdHash[i];
   }
   this.apduReply(u8.buffer, cb);
 };
@@ skipping 74 matching lines @@
       self.version_ = v1.buffer;
       cb(-GnubbyDevice.OK, v1.buffer);
     } else {
       if (!rc) {
         self.version_ = data;
       }
       cb(rc, data);
     }
   });
 };