Roll src/third_party/boringssl/src 0d81373f9..1991af690

net/ssl/ssl_cipher_suite_names.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_SSL_SSL_CIPHER_SUITE_NAMES_H_
 #define NET_SSL_SSL_CIPHER_SUITE_NAMES_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "net/base/net_export.h"
 
 namespace net {
 
 // SSLCipherSuiteToStrings returns three strings for a given cipher suite
 // number, the name of the key exchange algorithm, the name of the cipher and
 // the name of the MAC. The cipher suite number is the number as sent on the
 // wire and recorded at
 // http://www.iana.org/assignments/tls-parameters/tls-parameters.xml
 // If the cipher suite is unknown, the strings are set to "???".
-// In the case of an AEAD cipher suite, *mac_str is NULL and *is_aead is true.
+// In the case of an AEAD cipher suite, *mac_str is nullptr and *is_aead is
+// true.
+// In the case of a TLS 1.3 AEAD-only cipher suite, *key_exchange_str is nullptr

[svaldez, 2016/10/10 14:17:21]

Wrap?

[davidben, 2016/10/10 15:39:38]

These seem to be breaking at sentences, so I just left them alone.

+// and *is_tls13 is true.
 NET_EXPORT void SSLCipherSuiteToStrings(const char** key_exchange_str,
                                         const char** cipher_str,
                                         const char** mac_str,
                                         bool* is_aead,
+                                        bool* is_tls13,
                                         uint16_t cipher_suite);
 
 // SSLVersionToString returns the name of the SSL protocol version
 // specified by |ssl_version|, which is defined in
 // net/ssl/ssl_connection_status_flags.h.
 // If the version is unknown, |name| is set to "???".
 NET_EXPORT void SSLVersionToString(const char** name, int ssl_version);
 
 // Parses a string literal that represents a SSL/TLS cipher suite.
 //
@@ skipping 32 matching lines @@
 // - Cipher: not an AEAD cipher
 NET_EXPORT int ObsoleteSSLStatus(int connection_status);
 
 // Returns true if |cipher_suite| is suitable for use with HTTP/2. See
 // https://http2.github.io/http2-spec/#rfc.section.9.2.2.
 NET_EXPORT bool IsTLSCipherSuiteAllowedByHTTP2(uint16_t cipher_suite);
 
 }  // namespace net
 
 #endif  // NET_SSL_SSL_CIPHER_SUITE_NAMES_H_