Roll src/third_party/boringssl/src 3cab5572b..95c6956

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 112916068a510964b410fe34c4a34b5e3e5b0961..85598fcf2124533125813162c681919a8b87b79b 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -31069,6 +31069,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Net.SSLServerKeyExchangeHash" enum="SSLHashAlgorithm">
+  <obsolete>
+    Replaced by Net.SSLSignatureAlgorithm.
+  </obsolete>
   <owner>davidben@chromium.org</owner>
   <summary>
     For each SSL connection with a full handshake using a DHE- or ECDHE-based
@@ -31088,6 +31091,15 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Net.SSLSignatureAlgorithm" enum="SSLSignatureAlgorithm">
+  <summary>
+    For each SSL connection with a full handshake using a DHE- or ECDHE-based
+    key exchange, the signature algorithm used to authenticate the peer. In TLS
+    1.2, this is the signature on the ServerKeyExchange message. (Note: Although
+    the ECDSA values specify a curve, the curve is only enforced in TLS 1.3.)
+  </summary>
+</histogram>
+
 <histogram name="Net.SSLv3FallbackToRenegoPatchedServer"
     enum="TLSRenegotiationPatched">
   <obsolete>
@@ -90353,6 +90365,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </enum>
 
 <enum name="SSLHashAlgorithm" type="int">
+  <obsolete>
+    Removed June 2016.
+  </obsolete>
   <int value="0" label="None (unused)"/>
   <int value="1" label="MD5"/>
   <int value="2" label="SHA-1"/>
@@ -90458,6 +90473,17 @@ To add a new entry, add it with any value and run test to compute valid value.
       label="Displayed clock interstitial. (DISPLAYED_CLOCK_INTERSTITIAL)"/>
 </enum>
 
+<enum name="SSLSignatureAlgorithm" type="int">

[davidben, 2016/06/29 19:21:47]

This is a little messy. So the values come from here:
https://tlswg.github.io/tls13-spec/#rfc.section.6.3.2.2

Except for ecdsa_sha1 which comes from here which still hasn't been merged yet.
https://github.com/tlswg/tls13-spec/pull/488/files

In TLS 1.3, we're being Clever (TM) and reinterpret_cast'ing a pair of u8s into
a u16. Since we're still implementing 1.3, I've only transcribed the values
corresponding to TLS 1.2 algorithms for now. But I want to make this change now
so we can start making the BoringSSL API fit the post-1.3 world. (Also having
the other half of the algorithm in there would have been really useful. That I
was only recording the hash was a mistake.)

For more fun, these involve a hex to decimal conversion. :-)

[Mark P, 2016/06/29 19:54:17]

Thanks for the explanation.  And I checked your math (hex -> decimal).

Do you have plans to support / add the other algorithms?  I assume you don't
support them now, right?
       /* RSASSA-PSS algorithms */
       rsa_pss_sha256 (0x0700),
       rsa_pss_sha384 (0x0701),
       rsa_pss_sha512 (0x0702),

       /* EdDSA algorithms */
       ed25519 (0x0703),
       ed448 (0x0704),

Also, have you double-checked using about:histograms that this works correctly?

[davidben, 2016/06/29 19:58:04]

Thanks. Yeah, I wouldn't mind it if we could enter these in hex and save poking
about Google Calculator. :-)
We don't support them no, now. They're not defined in TLS 1.2. When we implement
TLS 1.3, we will. I figured I'd wait until we actually had them in code, in case
the TLSWG, I dunno, changes the numbers or something.
I would like to support Ed25519 someday (we have the low-level code in BoringSSL
now). But this is predicated on the CA system coming up with Ed25519
certificates, so it may not be for a loooooong while. :-)
Looks to be good.

+  <int value="513" label="rsa_pkcs1_sha1"/>
+  <int value="515" label="ecdsa_sha1"/>
+  <int value="1025" label="rsa_pkcs1_sha256"/>
+  <int value="1027" label="ecdsa_secp256r1_sha256"/>
+  <int value="1281" label="rsa_pkcs1_sha384"/>
+  <int value="1283" label="ecdsa_secp384r1_sha384"/>
+  <int value="1537" label="rsa_pkcs1_sha512"/>
+  <int value="1539" label="ecdsa_secp521r1_sha512"/>
+</enum>
+
 <enum name="StarsLaunchLocation" type="int">
   <int value="0" label="All Items"/>
   <int value="1" label="Uncategorized"/>