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

APIs support the U2F spec complient discovery based on Usage Pages.

Request batch attestation certs for consumer appIds

BUG=403301

Review URL: https://codereview.chromium.org/461403003

Cr-Commit-Position: refs/heads/master@{#289452}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289452 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/cryptotoken/gnubby-u2f.js

@@ -34,6 +34,12 @@ 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
@@ -43,11 +49,11 @@ 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];

chrome/browser/resources/cryptotoken/manifest.json

 {
   "name": "CryptoTokenExtension",
   "description": "CryptoToken Component Extension",
-  "version": "0.8.58",
+  "version": "0.8.59",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq7zRobvA+AVlvNqkHSSVhh1sEWsHSqz4oR/XptkDe/Cz3+gW9ZGumZ20NCHjaac8j1iiesdigp8B1LJsd/2WWv2Dbnto4f8GrQ5MVphKyQ9WJHwejEHN2K4vzrTcwaXqv5BSTXwxlxS/mXCmXskTfryKTLuYrcHEWK8fCHb+0gvr8b/kvsi75A1aMmb6nUnFJvETmCkOCPNX5CHTdy634Ts/x0fLhRuPlahk63rdf7agxQv5viVjQFk+tbgv6aa9kdSd11Js/RZ9yZjrFgHOBWgP4jTBqud4+HUglrzu8qynFipyNRLCZsaxhm+NItTyNgesxLdxZcwOz56KD1Q4IQIDAQAB",
   "manifest_version": 2,
   "permissions": [
@@ -17,6 +17,18 @@
         {
           "vendorId": 4176,
           "productId": 512
+        },
+        {
+          "vendorId": 9601,
+          "productId": 61904
+        },
+        {
+          "vendorId": 7223,
+          "productId": 61904
+        },
+        {
+          "vendorId": 1419,
+          "productId": 24579
         }
       ]
     }