Cleanup: Use BN_bn2bin_padded() for zero-padding rather than custom code.

crypto/ec_signature_creator_openssl.cc

 // Copyright (c) 2012 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/ec_signature_creator_impl.h"
 
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
@@ skipping 42 matching lines @@
   OpenSSLErrStackTracer err_tracer(FROM_HERE);
   // Create ECDSA_SIG object from DER-encoded data.
   const unsigned char* der_data = &der_sig.front();
   ScopedECDSA_SIG ecdsa_sig(
       d2i_ECDSA_SIG(NULL, &der_data, static_cast<long>(der_sig.size())));
   if (!ecdsa_sig.get())
     return false;
 
   // The result is made of two 32-byte vectors.
   const size_t kMaxBytesPerBN = 32;
-  std::vector<uint8> result;
-  result.resize(2 * kMaxBytesPerBN);
-  memset(&result[0], 0, result.size());
+  std::vector<uint8> result(2 * kMaxBytesPerBN);
 
-  BIGNUM* r = ecdsa_sig.get()->r;
-  BIGNUM* s = ecdsa_sig.get()->s;
-  int r_bytes = BN_num_bytes(r);
-  int s_bytes = BN_num_bytes(s);
-  // NOTE: Can't really check for equality here since sometimes the value
-  // returned by BN_num_bytes() will be slightly smaller than kMaxBytesPerBN.
-  if (r_bytes > static_cast<int>(kMaxBytesPerBN) ||
-      s_bytes > static_cast<int>(kMaxBytesPerBN)) {
-    DLOG(ERROR) << "Invalid key sizes r(" << r_bytes << ") s(" << s_bytes
-                << ")";
+  const BIGNUM* r = ecdsa_sig.get()->r;

[davidben, 2014/11/10 22:37:03]

Nit: was there in the original, but doesn't ecdsa_sig->r work?

[eroman, 2014/11/10 22:42:01]

Done: I removed the variables and inlined as ecdsa_sig->r, ecdsa_sig->s

+  const BIGNUM* s = ecdsa_sig.get()->s;
+
+  if (!BN_bn2bin_padded(&result[0], kMaxBytesPerBN, r) ||
+      !BN_bn2bin_padded(&result[kMaxBytesPerBN], kMaxBytesPerBN, s)) {
     return false;
   }
-  BN_bn2bin(ecdsa_sig.get()->r, &result[kMaxBytesPerBN - r_bytes]);
-  BN_bn2bin(ecdsa_sig.get()->s, &result[2 * kMaxBytesPerBN - s_bytes]);
   out_raw_sig->swap(result);
   return true;
 }
 
 }  // namespace crypto