CRYPTO - Resolved comments from wtc. Used scoped_ptr<char[]> and

crypto/hkdf.cc

 // Copyright (c) 2013 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 "crypto/hkdf.h"
 
 #include "base/logging.h"
 #include "crypto/hmac.h"
 
 namespace crypto {
@@ skipping 31 matching lines @@
   // and info into the output keying material.
   const size_t material_length =
       2*key_bytes_to_generate + 2*iv_bytes_to_generate;
   const size_t n = (material_length + kSHA256HashLength-1) /
                    kSHA256HashLength;
   DCHECK_LT(n, 256u);
 
   output_.resize(n * kSHA256HashLength);
   base::StringPiece previous;
 
-  char* buf = new char[kSHA256HashLength + info.size() + 1];
+  scoped_ptr<char[]> buf(new char[kSHA256HashLength + info.size() + 1]);
   uint8 digest[kSHA256HashLength];
 
   HMAC hmac(HMAC::SHA256);
   result = hmac.Init(prk, sizeof(prk));
   DCHECK(result);
 
   for (size_t i = 0; i < n; i++) {
-    memcpy(buf, previous.data(), previous.size());
+    memcpy(buf.get(), previous.data(), previous.size());
     size_t j = previous.size();
-    memcpy(buf + j, info.data(), info.size());
+    memcpy(buf.get() + j, info.data(), info.size());
     j += info.size();
-    buf[j++] = static_cast<char>((i + 1) & 0xFF);
+    buf[j++] = static_cast<char>(i + 1);
 
-    result = hmac.Sign(base::StringPiece(buf, j), digest, sizeof(digest));
+    result = hmac.Sign(base::StringPiece(buf.get(), j), digest, sizeof(digest));
     DCHECK(result);
 
     memcpy(&output_[i*sizeof(digest)], digest, sizeof(digest));
     previous = base::StringPiece(reinterpret_cast<char*>(digest),
                                  sizeof(digest));
   }
 
   size_t j = 0;
   client_write_key_ = base::StringPiece(reinterpret_cast<char*>(&output_[j]),
                                         key_bytes_to_generate);
   j += key_bytes_to_generate;
   server_write_key_ = base::StringPiece(reinterpret_cast<char*>(&output_[j]),
                                         key_bytes_to_generate);
   j += key_bytes_to_generate;
   client_write_iv_ = base::StringPiece(reinterpret_cast<char*>(&output_[j]),
                                        iv_bytes_to_generate);
   j += iv_bytes_to_generate;
   server_write_iv_ = base::StringPiece(reinterpret_cast<char*>(&output_[j]),
                                        iv_bytes_to_generate);
-  delete[] buf;
 }
 
 HKDF::~HKDF() {
 }
 
 }  // namespace crypto