Bring the handling of <keygen> and support for the application/x-x509-user-ce...

chrome/browser/renderer_host/x509_user_cert_resource_handler.cc

 // Copyright (c) 2009 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 "chrome/browser/renderer_host/x509_user_cert_resource_handler.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/download/download_file.h"
@@ skipping 81 matching lines @@
     const URLRequestStatus& urs,
     const std::string& sec_info) {
   if (urs.status() != URLRequestStatus::SUCCESS)
     return false;
 
   // TODO(gauravsh): Verify that 'request_id' was actually a keygen form post
   // and only then import the certificate.
   AssembleResource();
   scoped_refptr<net::X509Certificate> cert =
       net::X509Certificate::CreateFromBytes(resource_buffer_->data(),
-                                            content_length_);
+          content_length_, net::X509Certificate::FORMAT_AUTO);
   // The handler will run the UI and delete itself when it's finished.
   new SSLAddCertHandler(request_, cert);
   return true;
 }
 
 void X509UserCertResourceHandler::OnRequestClosed() {
 }
 
 void X509UserCertResourceHandler::AssembleResource() {
   size_t bytes_copied = 0;
   resource_buffer_ = new net::IOBuffer(content_length_);
 
   for (size_t i = 0; i < buffer_->contents.size(); ++i) {
     net::IOBuffer* data = buffer_->contents[i].first;
     const int data_len = buffer_->contents[i].second;
     DCHECK(bytes_copied + data_len <= content_length_);
     memcpy(resource_buffer_->data() + bytes_copied, data->data(), data_len);
     bytes_copied += data_len;
   }
 }