Add a bucket in the connection type histograms for...

net/base/ssl_client_socket_win.cc

 // Copyright (c) 2006-2008 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/base/ssl_client_socket_win.h"
 
 #include <schnlsp.h>
 
 #include "base/lock.h"
 #include "base/singleton.h"
@@ skipping 1015 matching lines @@
 void SSLClientSocketWin::LogConnectionTypeMetrics(
     PCCERT_CHAIN_CONTEXT chain_context) {
   UpdateConnectionTypeHistograms(CONNECTION_SSL);
 
   PCERT_SIMPLE_CHAIN first_chain = chain_context->rgpChain[0];
   int num_elements = first_chain->cElement;
   PCERT_CHAIN_ELEMENT* element = first_chain->rgpElement;
   bool has_md5 = false;
   bool has_md2 = false;
   bool has_md4 = false;
+  bool has_md5_ca = false;
 
-  // Each chain starts with the end entity certificate and ends with the root
-  // CA certificate.  Do not inspect the signature algorithm of the root CA
-  // certificate because the signature on the trust anchor is not important.
+  // Each chain starts with the end entity certificate (i = 0) and ends with
+  // the root CA certificate (i = num_elements - 1).  Do not inspect the
+  // signature algorithm of the root CA certificate because the signature on
+  // the trust anchor is not important.
   for (int i = 0; i < num_elements - 1; ++i) {
     PCCERT_CONTEXT cert = element[i]->pCertContext;
     const char* algorithm = cert->pCertInfo->SignatureAlgorithm.pszObjId;
     if (strcmp(algorithm, szOID_RSA_MD5RSA) == 0) {
       // md5WithRSAEncryption: 1.2.840.113549.1.1.4
       has_md5 = true;
+      if (i != 0)
+        has_md5_ca = true;
     } else if (strcmp(algorithm, szOID_RSA_MD2RSA) == 0) {
       // md2WithRSAEncryption: 1.2.840.113549.1.1.2
       has_md2 = true;
     } else if (strcmp(algorithm, szOID_RSA_MD4RSA) == 0) {
       // md4WithRSAEncryption: 1.2.840.113549.1.1.3
       has_md4 = true;
     }
   }
 
   if (has_md5)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5);
   if (has_md2)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2);
   if (has_md4)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD4);
+  if (has_md5_ca)
+    UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5_CA);
 }
 
 // Set server_cert_status_ and return OK or a network error.
 int SSLClientSocketWin::VerifyServerCert() {
   DCHECK(server_cert_);
   server_cert_status_ = 0;
 
   // Build and validate certificate chain.
 
   CERT_CHAIN_PARA chain_para;
@@ skipping 113 matching lines @@
   // compatible with WinHTTP, which doesn't report this error (bug 3004).
   server_cert_status_ &= ~CERT_STATUS_NO_REVOCATION_MECHANISM;
 
   if (IsCertStatusError(server_cert_status_))
     return MapCertStatusToNetError(server_cert_status_);
   return OK;
 }
 
 }  // namespace net