Roll BoringSSL 306e520:aac2f6a

net/ssl/openssl_ssl_util.cc

 // Copyright 2014 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/ssl/openssl_ssl_util.h"
 
 #include <errno.h>
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ skipping 100 matching lines @@
     case SSL_R_ENCRYPTED_LENGTH_TOO_LONG:
     case SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST:
     case SSL_R_EXCESSIVE_MESSAGE_SIZE:
     case SSL_R_EXTRA_DATA_IN_MESSAGE:
     case SSL_R_GOT_A_FIN_BEFORE_A_CCS:
     case SSL_R_INVALID_COMMAND:
     case SSL_R_INVALID_STATUS_RESPONSE:
     case SSL_R_INVALID_TICKET_KEYS_LENGTH:
     // SSL_do_handshake reports this error when the server responds to a
     // ClientHello with a fatal close_notify alert.
-    case SSL_AD_REASON_OFFSET + SSL_AD_CLOSE_NOTIFY:
+    case SSL_R_SSLV3_ALERT_CLOSE_NOTIFY:
     case SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE:
-    // TODO(joth): SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE may be returned from the
-    // server after receiving ClientHello if there's no common supported cipher.
-    // Ideally we'd map that specific case to ERR_SSL_VERSION_OR_CIPHER_MISMATCH
-    // to match the NSS implementation. See also http://goo.gl/oMtZW
-    case SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE:
     case SSL_R_SSLV3_ALERT_NO_CERTIFICATE:
     case SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER:
     case SSL_R_TLSV1_ALERT_DECODE_ERROR:
     case SSL_R_TLSV1_ALERT_DECRYPTION_FAILED:
     case SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION:
     case SSL_R_TLSV1_ALERT_INTERNAL_ERROR:
     case SSL_R_TLSV1_ALERT_NO_RENEGOTIATION:
     case SSL_R_TLSV1_ALERT_RECORD_OVERFLOW:
     case SSL_R_TLSV1_ALERT_USER_CANCELLED:
       return ERR_SSL_PROTOCOL_ERROR;
     case SSL_R_CERTIFICATE_VERIFY_FAILED:
       // The only way that the certificate verify callback can fail is if
       // the leaf certificate changed during a renegotiation.
       return ERR_SSL_SERVER_CERT_CHANGED;
-    case SSL_AD_REASON_OFFSET + SSL3_AD_INAPPROPRIATE_FALLBACK:
+    case SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK:
       return ERR_SSL_INAPPROPRIATE_FALLBACK;
+    // SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE may be returned from the server after
+    // receiving ClientHello if there's no common supported cipher. Map that
+    // specific case to ERR_SSL_VERSION_OR_CIPHER_MISMATCH to match the NSS
+    // implementation. See https://goo.gl/oMtZW and https://crbug.com/446505.
+    case SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE: {
+      uint32_t previous = ERR_peek_error();
+      if (previous != 0 && ERR_GET_LIB(previous) == ERR_LIB_SSL &&
+          ERR_GET_REASON(previous) == SSL_R_HANDSHAKE_FAILURE_ON_CLIENT_HELLO) {
+        return ERR_SSL_VERSION_OR_CIPHER_MISMATCH;
+      }
+      return ERR_SSL_PROTOCOL_ERROR;
+    }
     default:
       LOG(WARNING) << "Unmapped error reason: " << ERR_GET_REASON(error_code);
       return ERR_SSL_PROTOCOL_ERROR;
   }
 }
 
 base::Value* NetLogOpenSSLErrorCallback(int net_error,
                                         int ssl_error,
                                         const OpenSSLErrorInfo& error_info,
                                         NetLog::LogLevel /* log_level */) {
@@ skipping 75 matching lines @@
 
 NetLog::ParametersCallback CreateNetLogOpenSSLErrorCallback(
     int net_error,
     int ssl_error,
     const OpenSSLErrorInfo& error_info) {
   return base::Bind(&NetLogOpenSSLErrorCallback,
                     net_error, ssl_error, error_info);
 }
 
 }  // namespace net