SSL - minor cleanup. Added UpdateSignedCertificateTimestamps to SSLInfo.

SSL - minor cleanup. Added UpdateSignedCertificateTimestamps to SSLInfo.
This method has the common code to update SignedCertificateTimestamps
This code was duplicated in openssl and nss.

QUIC will be calling the following method soon.

R=rch@chromium.org

Committed: https://crrev.com/f2930fc0d889193980be8e6d38d7825f4941eeb1
Cr-Commit-Position: refs/heads/master@{#360602}

[ramant (doing other things), 2015-11-19 00:34:33]

Description was changed from

==========
l# Enter a description of the change.
SSL - minor cleanup. Added UpdateSignedCertificateTimestamps to SSLInfo.
This method has the common code to update SignedCertificateTimestamps
This code was duplicated in openssl and nss.

QUIC will be calling the following method soon.

R=rch@chromium.org
==========

to

==========
l# Enter a description of the change.
SSL - minor cleanup. Added UpdateSignedCertificateTimestamps to SSLInfo.
This method has the common code to update SignedCertificateTimestamps
This code was duplicated in openssl and nss.

QUIC will be calling the following method soon.

R=rch@chromium.org
==========

[ramant (doing other things), 2015-11-19 00:34:44]

Description was changed from

==========
l# Enter a description of the change.
SSL - minor cleanup. Added UpdateSignedCertificateTimestamps to SSLInfo.
This method has the common code to update SignedCertificateTimestamps
This code was duplicated in openssl and nss.

QUIC will be calling the following method soon.

R=rch@chromium.org
==========

to

==========
SSL - minor cleanup. Added UpdateSignedCertificateTimestamps to SSLInfo.
This method has the common code to update SignedCertificateTimestamps
This code was duplicated in openssl and nss.

QUIC will be calling the following method soon.

R=rch@chromium.org
==========

[ramant (doing other things), 2015-11-19 00:34:50]

The CQ bit was checked by rtenneti@chromium.org to run a CQ dry run

[chromium-reviews, 2015-11-19 00:35:22]

Fixed the description (sorry about that).

On Wed, Nov 18, 2015 at 4:34 PM, rtenneti@chromium.org via
codereview.chromium.org <reply@chromiumcodereview-hr.appspotmail.com> wrote:

> Reviewers: Ryan Hamilton
> CL: https://codereview.chromium.org/1452053005/
>
> Description:
> l# Enter a description of the change.
> SSL - minor cleanup. Added UpdateSignedCertificateTimestamps to SSLInfo.
> This method has the common code to update SignedCertificateTimestamps
> This code was duplicated in openssl and nss.
>
> QUIC will be calling the following method soon.
>
> R=rch@chromium.org
>
> Base URL: https://chromium.googlesource.com/chromium/src.git@master
>
> Affected files (+27, -38 lines):
>   M net/socket/ssl_client_socket_nss.cc
>   M net/socket/ssl_client_socket_openssl.cc
>   M net/ssl/ssl_info.h
>   M net/ssl/ssl_info.cc
>
>
> Index: net/socket/ssl_client_socket_nss.cc
> diff --git a/net/socket/ssl_client_socket_nss.cc
> b/net/socket/ssl_client_socket_nss.cc
> index
>
8fad0a021d91b1b554018f74ddbe78d99626f2c3..82932785a93570915973f10be30931655631fccc
> 100644
> --- a/net/socket/ssl_client_socket_nss.cc
> +++ b/net/socket/ssl_client_socket_nss.cc
> @@ -3151,25 +3151,7 @@ bool SSLClientSocketNSS::CalledOnValidThread()
> const {
>  }
>
>  void SSLClientSocketNSS::AddSCTInfoToSSLInfo(SSLInfo* ssl_info) const {
> -  for (ct::SCTList::const_iterator iter =
> -       ct_verify_result_.verified_scts.begin();
> -       iter != ct_verify_result_.verified_scts.end(); ++iter) {
> -    ssl_info->signed_certificate_timestamps.push_back(
> -        SignedCertificateTimestampAndStatus(*iter, ct::SCT_STATUS_OK));
> -  }
> -  for (ct::SCTList::const_iterator iter =
> -       ct_verify_result_.invalid_scts.begin();
> -       iter != ct_verify_result_.invalid_scts.end(); ++iter) {
> -    ssl_info->signed_certificate_timestamps.push_back(
> -        SignedCertificateTimestampAndStatus(*iter,
> ct::SCT_STATUS_INVALID));
> -  }
> -  for (ct::SCTList::const_iterator iter =
> -       ct_verify_result_.unknown_logs_scts.begin();
> -       iter != ct_verify_result_.unknown_logs_scts.end(); ++iter) {
> -    ssl_info->signed_certificate_timestamps.push_back(
> -        SignedCertificateTimestampAndStatus(*iter,
> -                                            ct::SCT_STATUS_LOG_UNKNOWN));
> -  }
> +  ssl_info->UpdateSignedCertificateTimestamps(ct_verify_result_);
>  }
>
>  // static
> Index: net/socket/ssl_client_socket_openssl.cc
> diff --git a/net/socket/ssl_client_socket_openssl.cc
> b/net/socket/ssl_client_socket_openssl.cc
> index
>
00ccb3f90585b94068516f96b63448acb02bc683..0fc5d9eb048305fe5c74286aec780f4f66eadec9
> 100644
> --- a/net/socket/ssl_client_socket_openssl.cc
> +++ b/net/socket/ssl_client_socket_openssl.cc
> @@ -2077,25 +2077,7 @@ int
> SSLClientSocketOpenSSL::NewSessionCallback(SSL_SESSION* session) {
>  }
>
>  void SSLClientSocketOpenSSL::AddSCTInfoToSSLInfo(SSLInfo* ssl_info) const
> {
> -  for (ct::SCTList::const_iterator iter =
> -       ct_verify_result_.verified_scts.begin();
> -       iter != ct_verify_result_.verified_scts.end(); ++iter) {
> -    ssl_info->signed_certificate_timestamps.push_back(
> -        SignedCertificateTimestampAndStatus(*iter, ct::SCT_STATUS_OK));
> -  }
> -  for (ct::SCTList::const_iterator iter =
> -       ct_verify_result_.invalid_scts.begin();
> -       iter != ct_verify_result_.invalid_scts.end(); ++iter) {
> -    ssl_info->signed_certificate_timestamps.push_back(
> -        SignedCertificateTimestampAndStatus(*iter,
> ct::SCT_STATUS_INVALID));
> -  }
> -  for (ct::SCTList::const_iterator iter =
> -       ct_verify_result_.unknown_logs_scts.begin();
> -       iter != ct_verify_result_.unknown_logs_scts.end(); ++iter) {
> -    ssl_info->signed_certificate_timestamps.push_back(
> -        SignedCertificateTimestampAndStatus(*iter,
> -                                            ct::SCT_STATUS_LOG_UNKNOWN));
> -  }
> +  ssl_info->UpdateSignedCertificateTimestamps(ct_verify_result_);
>  }
>
>  std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const {
> Index: net/ssl/ssl_info.cc
> diff --git a/net/ssl/ssl_info.cc b/net/ssl/ssl_info.cc
> index
>
82d4a62aabd8e85ec76eb9111b8081549553b2c8..545bf7ec6dfa449d342904d2c5a9301f48ed38c4
> 100644
> --- a/net/ssl/ssl_info.cc
> +++ b/net/ssl/ssl_info.cc
> @@ -64,4 +64,20 @@ void SSLInfo::SetCertError(int error) {
>    cert_status |= MapNetErrorToCertStatus(error);
>  }
>
> +void SSLInfo::UpdateSignedCertificateTimestamps(
> +    const ct::CTVerifyResult& ct_verify_result) {
> +  for (const auto& sct : ct_verify_result.verified_scts) {
> +    signed_certificate_timestamps.push_back(
> +        SignedCertificateTimestampAndStatus(sct, ct::SCT_STATUS_OK));
> +  }
> +  for (const auto& sct : ct_verify_result.invalid_scts) {
> +    signed_certificate_timestamps.push_back(
> +        SignedCertificateTimestampAndStatus(sct, ct::SCT_STATUS_INVALID));
> +  }
> +  for (const auto& sct : ct_verify_result.unknown_logs_scts) {
> +    signed_certificate_timestamps.push_back(
> +        SignedCertificateTimestampAndStatus(sct,
> ct::SCT_STATUS_LOG_UNKNOWN));
> +  }
> +}
> +
>  }  // namespace net
> Index: net/ssl/ssl_info.h
> diff --git a/net/ssl/ssl_info.h b/net/ssl/ssl_info.h
> index
>
b18b5266c3e87331fbbb9ba2a124dc55c84b7de5..40dec2865729bb3e431dfc1641f46d0a6086193e
> 100644
> --- a/net/ssl/ssl_info.h
> +++ b/net/ssl/ssl_info.h
> @@ -10,6 +10,7 @@
>  #include "base/memory/ref_counted.h"
>  #include "net/base/net_export.h"
>  #include "net/cert/cert_status_flags.h"
> +#include "net/cert/ct_verify_result.h"
>  #include "net/cert/sct_status_flags.h"
>  #include "net/cert/x509_cert_types.h"
>  #include "net/ssl/signed_certificate_timestamp_and_status.h"
> @@ -43,6 +44,14 @@ class NET_EXPORT SSLInfo {
>    // Adds the specified |error| to the cert status.
>    void SetCertError(int error);
>
> +  // Adds the SignedCertificateTimestamps from ct_verify_result to
> +  // |signed_certificate_timestamps|.  SCTs are held in three separate
> vectors
> +  // in ct_verify_result, each vetor representing a particular
> verification
> +  // state, this method associates each of the SCTs with the corresponding
> +  // SCTVerifyStatus as it adds it to the |signed_certificate_timestamps|
> list.
> +  void UpdateSignedCertificateTimestamps(
> +      const ct::CTVerifyResult& ct_verify_result);
> +
>    // The SSL certificate.
>    scoped_refptr<X509Certificate> cert;
>
>
>
>

-- 
You received this message because you are subscribed to the Google Groups
"Chromium-reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[commit-bot: I haz the power, 2015-11-19 00:38:22]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1452053005/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1452053005/1

[commit-bot: I haz the power, 2015-11-19 03:00:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-11-19 03:00:07]

Dry run: This issue passed the CQ dry run.

[Ryan Hamilton, 2015-11-19 05:28:59]

lgtm

[ramant (doing other things), 2015-11-19 16:28:27]

The CQ bit was checked by rtenneti@chromium.org

[commit-bot: I haz the power, 2015-11-19 16:29:23]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1452053005/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1452053005/1

[commit-bot: I haz the power, 2015-11-19 16:34:25]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-11-19 16:35:18]

Patchset 1 (id:??) landed as
https://crrev.com/f2930fc0d889193980be8e6d38d7825f4941eeb1
Cr-Commit-Position: refs/heads/master@{#360602}