Fix SpdySession::WriteCredentialFrame ECPrivateKey creation args.

net/spdy/spdy_session.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 "net/spdy/spdy_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/stats_counters.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/signature_creator.h"
+#include "net/base/asn1_util.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/net_log.h"
 #include "net/base/net_util.h"
+#include "net/base/origin_bound_cert_service.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/spdy/spdy_frame_builder.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_protocol.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/spdy/spdy_settings_storage.h"
 #include "net/spdy/spdy_stream.h"
 
@@ skipping 593 matching lines @@
     case CLIENT_CERT_RSA_SIGN: {
       scoped_ptr<crypto::RSAPrivateKey> private_key(
           crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_data));
       scoped_ptr<crypto::SignatureCreator> creator(
           crypto::SignatureCreator::Create(private_key.get()));
       creator->Update(secret, arraysize(secret));
       creator->Final(&proof);
       break;
     }
     case CLIENT_CERT_ECDSA_SIGN: {
-      // Convert the cert string into a vector<unit8>
-      std::vector<uint8> cert_data;
-      for (size_t i = 0; i < cert.length(); i++) {
-        cert_data.push_back(cert[i]);
-      }
+      base::StringPiece spki_piece;
+      asn1::ExtractSPKIFromDERCert(cert, &spki_piece);
+      std::vector<uint8> spki(spki_piece.data(),
+                              spki_piece.data() + spki_piece.size());
       scoped_ptr<crypto::ECPrivateKey> private_key(
-          crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo("",
-                                                                  key_data,
-                                                                  cert_data));
+          crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
+              OriginBoundCertService::kEPKIPassword, key_data, spki));
       scoped_ptr<crypto::ECSignatureCreator> creator(
           crypto::ECSignatureCreator::Create(private_key.get()));
       creator->Sign(secret, arraysize(secret), &proof);
       break;
     }
     default:
       NOTREACHED();
   }
 
   spdy::SpdyCredential credential;
@@ skipping 1212 matching lines @@
   if (it == pending_callback_map_.end())
     return;
 
   CompletionCallback callback = it->second.callback;
   int result = it->second.result;
   pending_callback_map_.erase(it);
   callback.Run(result);
 }
 
 }  // namespace net