Implement Expect-Staple

net/socket/ssl_client_socket_impl.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/socket/ssl_client_socket_impl.h"
 
 #include <errno.h>
 #include <openssl/bio.h>
 #include <openssl/bytestring.h>
 #include <openssl/err.h>
@@ skipping 67 matching lines @@
 
 // TLS extension number use for Token Binding.
 const unsigned int kTbExtNum = 24;
 
 // Token Binding ProtocolVersions supported.
 const uint8_t kTbProtocolVersionMajor = 0;
 const uint8_t kTbProtocolVersionMinor = 5;
 const uint8_t kTbMinProtocolVersionMajor = 0;
 const uint8_t kTbMinProtocolVersionMinor = 3;
 
+// Max age for OCSP responses
+const base::TimeDelta kAgeOneWeek = base::TimeDelta::FromDays(7);

[estark, 2016/06/15 23:51:47]

Unfortunately this constant would have to be duplicated in the QUIC code, is
that right?

[estark, 2016/06/15 23:51:47]

ditto

[estark, 2016/06/15 23:51:47]

It appears that mozilla::pkix requires responses without a nextUpdate to be
fresh within 1 day:
https://dxr.mozilla.org/mozilla-central/source/security/pkix/lib/pkixocsp.cpp...

Would we want to match that?

[dadrian, 2016/06/16 03:27:24]

Does QUIC support OCSP stapling? I'm not very familiar with the protocol.

[dadrian, 2016/06/16 03:27:24]

1 day seems short, but I have no actual basis for making that decision.

+
 bool EVP_MDToPrivateKeyHash(const EVP_MD* md, SSLPrivateKey::Hash* hash) {
   switch (EVP_MD_type(md)) {
     case NID_md5_sha1:
       *hash = SSLPrivateKey::Hash::MD5_SHA1;
       return true;
     case NID_sha1:
       *hash = SSLPrivateKey::Hash::SHA1;
       return true;
     case NID_sha256:
       *hash = SSLPrivateKey::Hash::SHA256;
@@ skipping 1244 matching lines @@
       result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN;
     else
       pkp_bypassed_ = true;
   }
 
   if (result == OK) {
     // Only check Certificate Transparency if there were no other errors with
     // the connection.
     VerifyCT();
 
+    CheckOCSP(*server_cert_verify_result_.verified_cert, *server_cert_,
+              server_cert_verify_result_.is_issued_by_known_root);
+
     DCHECK(!certificate_verified_);
     certificate_verified_ = true;
     MaybeCacheSession();
   }
 
   completed_connect_ = true;
   // Exit DoHandshakeLoop and return the result to the caller to Connect.
   DCHECK_EQ(STATE_NONE, next_handshake_state_);
   return result;
 }
@@ skipping 66 matching lines @@
         server_cert_verify_result_.cert_status &= ~CERT_STATUS_IS_EV;
       }
     }
     ct_verify_result_.cert_policy_compliance =
         policy_enforcer_->DoesConformToCertPolicy(
             server_cert_verify_result_.verified_cert.get(),
             ct_verify_result_.verified_scts, net_log_);
   }
 }
 
+void SSLClientSocketImpl::CheckOCSP(
+    const X509Certificate& verified_certificate,
+    const X509Certificate& unverified_certificate,
+    bool is_issued_by_known_root) {
+  base::Time verify_time = base::Time::Now();
+  transport_security_state_->CheckExpectStaple(
+      host_and_port_, verified_certificate, unverified_certificate,
+      is_issued_by_known_root, verify_time, kAgeOneWeek, ocsp_response_);
+}
+
 void SSLClientSocketImpl::OnHandshakeIOComplete(int result) {
   int rv = DoHandshakeLoop(result);
   if (rv != ERR_IO_PENDING) {
     LogConnectEndEvent(rv);
     DoConnectCallback(rv);
   }
 }
 
 void SSLClientSocketImpl::OnSendComplete(int result) {
   if (next_handshake_state_ == STATE_HANDSHAKE) {
@@ skipping 862 matching lines @@
   if (rv != OK) {
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
     return;
   }
 
   net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT,
                     base::Bind(&NetLogSSLInfoCallback, base::Unretained(this)));
 }
 
 }  // namespace net