Add builders to APDU command class

device/u2f/u2f_apdu_command.h

 // Copyright 2017 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.
 
 #ifndef DEVICE_U2F_U2F_APDU_COMMAND_H_
 #define DEVICE_U2F_U2F_APDU_COMMAND_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 19 matching lines @@
   // Returns serialized message data
   std::vector<uint8_t> GetEncodedCommand() const;
   void set_cla(uint8_t cla) { cla_ = cla; }
   void set_ins(uint8_t ins) { ins_ = ins; }
   void set_p1(uint8_t p1) { p1_ = p1; }
   void set_p2(uint8_t p2) { p2_ = p2; }
   void set_data(const std::vector<uint8_t>& data) { data_ = data; }
   void set_response_length(size_t response_length) {
     response_length_ = response_length;
   }
+  static scoped_refptr<U2fApduCommand> BuildRegisterCommand(

[juanlang (chromium.org), 2017/01/28 00:08:39]

Maybe remove Command? The caller will be using
U2fApduCommand::BuildRegisterCommand, and I don't find repeating the word
Command all that valuable.

[Reilly Grant (use Gerrit), 2017/01/28 00:29:29]

I suggest U2fApduCommand::CreateRegister to match the methods above.

[Casey Piper, 2017/01/30 21:51:41]

Done.

[Casey Piper, 2017/01/30 21:51:41]

Acknowledged.

+      const std::vector<uint8_t>& appid_digest,
+      const std::vector<uint8_t>& challenge_digest);
+  static scoped_refptr<U2fApduCommand> BuildGetVersionCommand();

[juanlang (chromium.org), 2017/01/28 00:08:39]

Remove Get, it's cleaner that way.

[Casey Piper, 2017/01/30 21:51:41]

Done.

+  // Early U2F drafts defined a non-ISO 7816-4 conforming layout
+  static scoped_refptr<U2fApduCommand> BuildGetLegacyVersionCommand();

[juanlang (chromium.org), 2017/01/28 00:08:39]

Ditto.

[Casey Piper, 2017/01/30 21:51:41]

Done.

+  static scoped_refptr<U2fApduCommand> BuildSignCommand(
+      const std::vector<uint8_t>& appid_digest,
+      const std::vector<uint8_t>& challenge_digest,
+      const std::vector<uint8_t>& key_handle);
 
  private:
   friend class base::RefCountedThreadSafe<U2fApduCommand>;
   friend class U2fApduBuilder;
   FRIEND_TEST_ALL_PREFIXES(U2fApduTest, TestDeserializeBasic);
   FRIEND_TEST_ALL_PREFIXES(U2fApduTest, TestDeserializeComplex);
   FRIEND_TEST_ALL_PREFIXES(U2fApduTest, TestSerializeEdgeCases);
+  FRIEND_TEST_ALL_PREFIXES(U2fApduTest, TestBuildApdu);
 
   static constexpr size_t kApduMinHeader = 4;
   static constexpr size_t kApduMaxHeader = 7;
   // As defined in ISO7816-4, extended length APDU request data is limited to
   // 16 bits in length with a maximum value of 65535. Response data length is
   // also limited to 16 bits in length with a value of 0x0000 corresponding to
   // a length of 65536
   static constexpr size_t kApduMaxDataLength = 65535;
   static constexpr size_t kApduMaxResponseLength = 65536;
   static constexpr size_t kApduMaxLength =
       kApduMaxDataLength + kApduMaxHeader + 2;
+  // APDU instructions
+  static constexpr uint8_t kInsU2fEnroll = 0x01;
+  static constexpr uint8_t kInsU2fSign = 0x02;
+  static constexpr uint8_t kInsU2fVersion = 0x03;
+  // P1 instructions
+  static constexpr uint8_t kP1TupRequired = 0x01;
+  static constexpr uint8_t kP1TupConsumed = 0x02;
+  static constexpr uint8_t kP1TupRequiredConsumed =
+      kP1TupRequired | kP1TupConsumed;
+  static constexpr size_t kMaxKeyHandleLength = 255;
+  static constexpr size_t kChallengeDigestLen = 32;
+  static constexpr size_t kAppIdDigestLen = 32;
 
   U2fApduCommand();
   U2fApduCommand(uint8_t cla,
                  uint8_t ins,
                  uint8_t p1,
                  uint8_t p2,
                  size_t response_length,
                  std::vector<uint8_t> data);
   ~U2fApduCommand();
 
   uint8_t cla_;
   uint8_t ins_;
   uint8_t p1_;
   uint8_t p2_;
   size_t response_length_;
   std::vector<uint8_t> data_;
 };
 }  // namespace device
 
 #endif  // DEVICE_U2F_U2F_APDU_COMMAND_H_