Remove redundant 3-SHAKE mitigation.

net/socket/ssl_server_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_server_socket_impl.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 486 matching lines @@
       STACK_OF(X509)* chain = SSL_get_peer_cert_chain(ssl_.get());
       client_cert_ = CreateX509Certificate(cert.get(), chain);
       if (!client_cert_.get())
         return ERR_SSL_CLIENT_AUTH_CERT_BAD_FORMAT;
     }
   } else {
     int ssl_error = SSL_get_error(ssl_.get(), rv);
     OpenSSLErrorInfo error_info;
     net_error = MapOpenSSLErrorWithDetails(ssl_error, err_tracer, &error_info);
 
-    // This hack is necessary because the mapping of SSL error codes to
-    // net_errors assumes (correctly for client sockets, but erroneously for
-    // server sockets) that peer cert verification failure can only occur if
-    // the cert changed during a renego. crbug.com/570351
-    if (net_error == ERR_SSL_SERVER_CERT_CHANGED)
+    // SSL_R_CERTIFICATE_VERIFY_FAILED's mapping is different between client and
+    // server.
+    if (ERR_GET_LIB(error_info.error_code) == ERR_LIB_SSL &&
+        ERR_GET_REASON(error_info.error_code) ==
+            SSL_R_CERTIFICATE_VERIFY_FAILED) {
       net_error = ERR_BAD_SSL_CLIENT_AUTH_CERT;
+    }
 
     // If not done, stay in this state
     if (net_error == ERR_IO_PENDING) {
       GotoState(STATE_HANDSHAKE);
     } else {
       LOG(ERROR) << "handshake failed; returned " << rv << ", SSL error code "
                  << ssl_error << ", net_error " << net_error;
       net_log_.AddEvent(
           NetLogEventType::SSL_HANDSHAKE_ERROR,
           CreateNetLogOpenSSLErrorCallback(net_error, ssl_error, error_info));
@@ skipping 207 matching lines @@
 SSLServerContextImpl::~SSLServerContextImpl() {}
 
 std::unique_ptr<SSLServerSocket> SSLServerContextImpl::CreateSSLServerSocket(
     std::unique_ptr<StreamSocket> socket) {
   bssl::UniquePtr<SSL> ssl(SSL_new(ssl_ctx_.get()));
   return std::unique_ptr<SSLServerSocket>(
       new SSLServerSocketImpl(std::move(socket), std::move(ssl)));
 }
 
 }  // namespace net