commit 15c0b3594be4cd3bd18a44be8eef0429a0cb072f
author Robert Sloan <varomodt@google.com> Mon Apr 16 08:36:46 2018 -0700
committer Robert Sloan <varomodt@google.com> Mon Apr 16 08:36:54 2018 -0700
tree 96fc5654e0d9b96afdd5a2c47a9515d06aea73ed
parent dc2f609faa3d5fa920e2c42a39750dca1a247c8f

external/boringssl: Sync to 9f0e7cb314ae64234b928fd379381ae9760a9a5f.

This includes the following changes:

https://boringssl.googlesource.com/boringssl/+log/f11ea19043f2b3ee42e4a76d0645914347e1a36e..9f0e7cb314ae64234b928fd379381ae9760a9a5f

Test: BoringSSL CTS Presubmits.
Change-Id: I9296845fe9db4baae2afc03328c5bc17f76a752f

src/ssl/ssl_key_share.cc

diff --git a/src/ssl/ssl_key_share.cc b/src/ssl/ssl_key_share.cc
index 2a076c3..c7f6f88 100644
--- a/src/ssl/ssl_key_share.cc
+++ b/src/ssl/ssl_key_share.cc
@@ -248,11 +248,11 @@
 
 UniquePtr<SSLKeyShare> SSLKeyShare::Create(CBS *in) {
   uint64_t group;
-  if (!CBS_get_asn1_uint64(in, &group)) {
+  if (!CBS_get_asn1_uint64(in, &group) || group > 0xffff) {
     return nullptr;
   }
-  UniquePtr<SSLKeyShare> key_share = Create(static_cast<uint64_t>(group));
-  if (!key_share->Deserialize(in)) {
+  UniquePtr<SSLKeyShare> key_share = Create(static_cast<uint16_t>(group));
+  if (!key_share || !key_share->Deserialize(in)) {
     return nullptr;
   }
   return key_share;