Restore SSL_SESSION/X509Certificate X509* sharing

net/cert/x509_util_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 "net/cert/x509_util_openssl.h"
 
 #include <limits.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 253 matching lines @@
 
   base::StringPiece str_date(reinterpret_cast<const char*>(x509_time->data),
                              x509_time->length);
 
   CertDateFormat format = x509_time->type == V_ASN1_UTCTIME ?
       CERT_DATE_FORMAT_UTC_TIME : CERT_DATE_FORMAT_GENERALIZED_TIME;
   return ParseCertificateDate(str_date, format, time);
 }
 
 // Returns true if |der_cache| points to valid data, false otherwise.
 // (note: the DER-encoded data in |der_cache| is owned by |cert|, callers should

[xunjieli, 2017/02/21 15:54:05]

nit: maybe update the comment. "|cert|" isn't present in the code.

[davidben, 2017/02/28 00:17:42]

Done.

 // not free it).
 bool GetDER(X509* x509, base::StringPiece* der_cache) {
+  if (x509->buf) {
+    *der_cache = base::StringPiece(
+        reinterpret_cast<const char*>(CRYPTO_BUFFER_data(x509->buf)),
+        CRYPTO_BUFFER_len(x509->buf));
+    return true;
+  }
+
   int x509_der_cache_index =
       g_der_cache_singleton.Get().der_cache_ex_index();
 
   // Re-encoding the DER data via i2d_X509 is an expensive operation,
   // but it's necessary for comparing two certificates. Re-encode at
   // most once per certificate and cache the data within the X509 cert
   // using X509_set_ex_data.
   DERCache* internal_cache = static_cast<DERCache*>(
       X509_get_ex_data(x509, x509_der_cache_index));
   if (!internal_cache) {
@@ skipping 56 matching lines @@
 
   digest.resize(out_size);
   token->assign(kChannelBindingPrefix);
   token->append(digest.begin(), digest.end());
   return true;
 }
 
 }  // namespace x509_util
 
 }  // namespace net