Make OpenSSL UpdateServerCert() OS independent.

net/cert/x509_certificate_mac.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/cert/x509_certificate.h"
 
 #include <CommonCrypto/CommonDigest.h>
 #include <CoreServices/CoreServices.h>
 #include <Security/Security.h>
 
-#include <cert.h>
-
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/singleton.h"
 #include "base/pickle.h"
 #include "base/sha1.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "crypto/cssm_init.h"
 #include "crypto/mac_security_services_lock.h"
 #include "crypto/nss_util.h"

[wtc, 2014/02/25 01:13:09]

This header is NSS-specific and should also be removed. In fact, I believe we
can remove it now. I'll look into that.

 #include "net/cert/x509_util_mac.h"
 
 using base::ScopedCFTypeRef;
 using base::Time;
 
 namespace net {
 
 namespace {
 
 void GetCertDistinguishedName(
@@ skipping 161 matching lines @@
   }
 }
 
 struct CSSMOIDString {
   const CSSM_OID* oid_;
   std::string string_;
 };
 
 typedef std::vector<CSSMOIDString> CSSMOIDStringVector;
 
-class ScopedCertName {
- public:
-  explicit ScopedCertName(CERTName* name) : name_(name) { }
-  ~ScopedCertName() {
-    if (name_) CERT_DestroyName(name_);
-  }
-  operator CERTName*() { return name_; }
-
- private:
-  CERTName* name_;
-};

[Ryan Sleevi, 2014/02/21 22:34:38]

Unrelated cleanups are best left for a separate CL.

-
 class ScopedEncodedCertResults {
  public:
   explicit ScopedEncodedCertResults(CSSM_TP_RESULT_SET* results)
       : results_(results) { }
   ~ScopedEncodedCertResults() {
     if (results_) {
       CSSM_ENCODED_CERT* encCert =
           reinterpret_cast<CSSM_ENCODED_CERT*>(results_->Results);
       for (uint32 i = 0; i < results_->NumberOfResults; i++) {
         crypto::CSSMFree(encCert[i].CertBlob.Data);
@@ skipping 317 matching lines @@
       *type = kPublicKeyTypeDH;
       break;
     default:
       *type = kPublicKeyTypeUnknown;
       *size_bits = 0;
       break;
   }
 }
 
 }  // namespace net