RAPPOR implementation

components/rappor/byte_vector_utils.cc

Index: components/rappor/byte_vector_utils.cc
diff --git a/components/rappor/byte_vector_utils.cc b/components/rappor/byte_vector_utils.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6d94b95e9cd5dfb4e8fc817d716dbf401b83b38c
--- /dev/null
+++ b/components/rappor/byte_vector_utils.cc
@@ -0,0 +1,124 @@
+// 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.
+
+#include "components/rappor/byte_vector_utils.h"
+
+#include <string>
+
+#include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
+#include "crypto/random.h"
+
+namespace rappor {
+
+ByteVector* ByteVectorOr(const ByteVector& lhs, ByteVector* rhs) {
+  DCHECK_EQ(lhs.size(), rhs->size());
+  for (size_t i = 0, len = lhs.size(); i < len; ++i) {
+    (*rhs)[i] = lhs[i] | (*rhs)[i];
+  }
+  return rhs;
+}
+
+ByteVector* ByteVectorMerge(const ByteVector& mask,
+                            const ByteVector& lhs,
+                            ByteVector* rhs) {
+  DCHECK_EQ(lhs.size(), rhs->size());
+  for (size_t i = 0, len = lhs.size(); i < len; ++i) {
+    (*rhs)[i] = (lhs[i] & ~mask[i]) | ((*rhs)[i] & mask[i]);
+  }
+  return rhs;
+}
+
+int CountBits(const ByteVector& vector) {
+  int bit_count = 0;
+  for(size_t i = 0; i < vector.size(); ++i) {
+    uint8_t byte = vector[i];
+    for (int j = 0; j < 8 ; ++j) {
+      if (byte & (1 << j))
+        bit_count++;
+    }
+  }
+  return bit_count;
+}
+
+ByteVectorGenerator::ByteVectorGenerator(size_t byte_count)
+    : byte_count_(byte_count) {}
+
+ByteVectorGenerator::~ByteVectorGenerator() {}
+
+ByteVector ByteVectorGenerator::GetRandomByteVector() {
+  ByteVector bytes(byte_count_);
+  crypto::RandBytes(bytes.data(), bytes.size());

[wtc, 2014/02/10 23:52:51]

IMPORTANT: the data() method of std::vector was added in C++11, so it may not be
supported by all compilers. If necessary, use &bytes[0] as a workaround.

[Steven Holte, 2014/02/11 00:36:12]

Done.

+  return bytes;
+}
+
+ByteVector ByteVectorGenerator::GetWeightedRandomByteVector(
+    Probability probability) {
+  ByteVector bytes = GetRandomByteVector();
+  switch (probability) {
+    case PROBABILITY_75:
+      return *ByteVectorOr(GetRandomByteVector(), &bytes);
+    case PROBABILITY_50:
+      return bytes;
+  }
+  NOTREACHED();
+  return bytes;
+}
+
+HmacByteVectorGenerator::HmacByteVectorGenerator(size_t byte_count,
+                                                 const std::string& secret)
+    : ByteVectorGenerator(byte_count),
+      hmac_(crypto::HMAC::SHA256),
+      value_(hmac_.DigestLength(), 0x01),
+      requested_bytes_(0) {
+  // HMAC_DRBG Instantiate Process
+  // 2. Key = 0x00 00...00
+  // 3. V = 0x01 01...01
+  ByteVector key(hmac_.DigestLength(), 0x00);
+  std::string initial_value(value_.begin(), value_.end());
+
+  // 4. (Key, V) = HMAC_DRBG_Update(seed_material, Key, V)
+  // HMAC_DRBG Update Process inlined
+  // 1. K = HMAC(K, V || 0x00 || provided_data)
+  crypto::HMAC keygen_hmac(crypto::HMAC::SHA256);
+  if (!keygen_hmac.Init(std::string(key.begin(), key.end())))
+    NOTREACHED();
+  if (!keygen_hmac.Sign(initial_value + char(0x00) + secret,
+      key.data(), key.size()))
+    NOTREACHED();
+  // 2. V = HMAC(K, V)
+  if (!hmac_.Init(std::string(key.begin(), key.end())))
+    NOTREACHED();
+  if (!hmac_.Sign(initial_value, value_.data(), value_.size()))
+    NOTREACHED();
+}
+
+HmacByteVectorGenerator::~HmacByteVectorGenerator() {}
+
+uint8_t HmacByteVectorGenerator::RandByte() {
+  size_t requested_byte_in_digest = requested_bytes_ % hmac_.DigestLength();
+  if (requested_byte_in_digest == 0) {
+    // Do step 4.1 of the HMAC_DRBG Generate Process for more bits.
+    // V = HMAC(Key, V)
+    if(!hmac_.Sign(std::string(value_.begin(), value_.end()),

[wtc, 2014/02/10 23:52:51]

Nit: add a space between "if" and "(".

[Steven Holte, 2014/02/11 00:36:12]

Done.

+        value_.data(), value_.size()))
+      NOTREACHED();
+  }
+  uint8_t result = value_[requested_byte_in_digest];
+  requested_bytes_++;
+  // Check max_number_of_bits_per_request from 10.1 Table 2
+  // max_number_of_bits_per_request == 2^19 bits == 2^16 bytes
+  DCHECK_LT(requested_bytes_, 1U << 16);
+  return result;
+}
+
+ByteVector HmacByteVectorGenerator::GetRandomByteVector() {
+  ByteVector bytes(byte_count_);
+  for (size_t i = 0; i < byte_count_; ++i) {
+    bytes[i] = RandByte();
+  }
+  return bytes;

[wtc, 2014/02/10 23:52:51]

You may want to use something like this and get rid of RandByte:

ByteVector HmacByteVectorGenerator::GetRandomByteVector() {
  ByteVector bytes(byte_count_);
  uint8_t* data = bytes.data();
  size_t bytes_to_go = byte_count_;
  while (bytes_to_go) {
    size_t requested_byte_in_digest = requested_bytes_ % hmac_.DigestLength();
    if (requested_byte_in_digest == 0) {
      // Do step 4.1 of the HMAC_DRBG Generate Process for more bits.
      // V = HMAC(Key, V)
      if (!hmac_.Sign(std::string(value_.begin(), value_.end()),
          value_.data(), value_.size()))
        NOTREACHED();
    }
    size_t n = std::min(bytes_to_go,
                        hmac_.DigestLength() - requested_byte_in_digest);
    memcpy(data, &value_[requested_byte_in_digest], n);
    data += n;
    bytes_to_go -= n;
    requested_bytes_ += n;
    // Check max_number_of_bits_per_request from 10.1 Table 2
    // max_number_of_bits_per_request == 2^19 bits == 2^16 bytes
    DCHECK_LT(requested_bytes_, 1U << 16);
  }
  return bytes;
}

[Steven Holte, 2014/02/11 00:36:12]

Done.

+}
+
+}  // namespace rappor