external/boringssl: Sync to b1cbe1979008debd0541621584b00e010d9935dd.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/ba94746eb2b4b59a0eb72047e4ca2d2d54454c87..b1cbe1979008debd0541621584b00e010d9935dd
Test: BoringSSL CTS Presubmits.
Change-Id: I143290c32ebd3d98f5a35ec8899df44983b73b8a
diff --git a/src/ssl/ssl_key_share.cc b/src/ssl/ssl_key_share.cc
index 52ff85d..a5ae578 100644
--- a/src/ssl/ssl_key_share.cc
+++ b/src/ssl/ssl_key_share.cc
@@ -171,13 +171,13 @@
CONSTEXPR_ARRAY struct {
int nid;
uint16_t group_id;
- const char name[8];
+ const char name[8], alias[11];
} kNamedGroups[] = {
- {NID_secp224r1, SSL_CURVE_SECP224R1, "P-224"},
- {NID_X9_62_prime256v1, SSL_CURVE_SECP256R1, "P-256"},
- {NID_secp384r1, SSL_CURVE_SECP384R1, "P-384"},
- {NID_secp521r1, SSL_CURVE_SECP521R1, "P-521"},
- {NID_X25519, SSL_CURVE_X25519, "X25519"},
+ {NID_secp224r1, SSL_CURVE_SECP224R1, "P-224", "secp224r1"},
+ {NID_X9_62_prime256v1, SSL_CURVE_SECP256R1, "P-256", "prime256v1"},
+ {NID_secp384r1, SSL_CURVE_SECP384R1, "P-384", "secp384r1"},
+ {NID_secp521r1, SSL_CURVE_SECP521R1, "P-521", "secp521r1"},
+ {NID_X25519, SSL_CURVE_X25519, "X25519", "x25519"},
};
} // namespace
@@ -227,6 +227,11 @@
*out_group_id = group.group_id;
return 1;
}
+ if (len == strlen(group.alias) &&
+ !strncmp(group.alias, name, len)) {
+ *out_group_id = group.group_id;
+ return 1;
+ }
}
return 0;
}