Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1388616 - Custom extension support for certificate_authorities, r…
…=ttaubert

--HG--
branch : NSS_TLS13_DRAFT19_BRANCH
extra : rebase_source : 660feacdd48ca0a148e3e2982c4bad9e28e6b113
extra : amend_source : 07699ce5172e45670d23d6106efba718decd316f
  • Loading branch information
martinthomson committed Aug 9, 2017
1 parent 889190e commit ebe9732
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 24 deletions.
49 changes: 25 additions & 24 deletions gtests/ssl_gtest/ssl_custext_unittest.cc
Expand Up @@ -44,30 +44,31 @@ SECStatus NoopExtensionHandler(PRFileDesc *fd, SSLHandshakeType message,
}

// All of the (current) set of supported extensions, plus a few extra.
static const uint16_t kManyExtensions[] = {ssl_server_name_xtn,
ssl_cert_status_xtn,
ssl_supported_groups_xtn,
ssl_ec_point_formats_xtn,
ssl_signature_algorithms_xtn,
ssl_use_srtp_xtn,
ssl_app_layer_protocol_xtn,
ssl_signed_cert_timestamp_xtn,
ssl_padding_xtn,
ssl_extended_master_secret_xtn,
ssl_session_ticket_xtn,
ssl_tls13_key_share_xtn,
ssl_tls13_pre_shared_key_xtn,
ssl_tls13_early_data_xtn,
ssl_tls13_supported_versions_xtn,
ssl_tls13_cookie_xtn,
ssl_tls13_psk_key_exchange_modes_xtn,
ssl_tls13_ticket_early_data_info_xtn,
ssl_renegotiation_info_xtn,
ssl_next_proto_nego_xtn,
ssl_tls13_ticket_early_data_info_xtn,
ssl_tls13_short_header_xtn,
1,
0xffff};
static const uint16_t kManyExtensions[] = {
ssl_server_name_xtn,
ssl_cert_status_xtn,
ssl_supported_groups_xtn,
ssl_ec_point_formats_xtn,
ssl_signature_algorithms_xtn,
ssl_use_srtp_xtn,
ssl_app_layer_protocol_xtn,
ssl_signed_cert_timestamp_xtn,
ssl_padding_xtn,
ssl_extended_master_secret_xtn,
ssl_session_ticket_xtn,
ssl_tls13_key_share_xtn,
ssl_tls13_pre_shared_key_xtn,
ssl_tls13_early_data_xtn,
ssl_tls13_supported_versions_xtn,
ssl_tls13_cookie_xtn,
ssl_tls13_psk_key_exchange_modes_xtn,
ssl_tls13_ticket_early_data_info_xtn,
ssl_tls13_certificate_authorities_xtn,
ssl_next_proto_nego_xtn,
ssl_renegotiation_info_xtn,
ssl_tls13_short_header_xtn,
1,
0xffff};
// The list here includes all extensions we expect to use (SSL_MAX_EXTENSIONS),
// plus the deprecated values (see sslt.h), and two extra dummy values.
PR_STATIC_ASSERT((SSL_MAX_EXTENSIONS + 5) == PR_ARRAY_SIZE(kManyExtensions));
Expand Down
1 change: 1 addition & 0 deletions lib/ssl/ssl3ext.c
Expand Up @@ -181,6 +181,7 @@ static const struct {
{ ssl_tls13_cookie_xtn, ssl_ext_native_only },
{ ssl_tls13_psk_key_exchange_modes_xtn, ssl_ext_native_only },
{ ssl_tls13_ticket_early_data_info_xtn, ssl_ext_native_only },
{ ssl_tls13_certificate_authorities_xtn, ssl_ext_native },
{ ssl_next_proto_nego_xtn, ssl_ext_none },
{ ssl_renegotiation_info_xtn, ssl_ext_native }
};
Expand Down

0 comments on commit ebe9732

Please sign in to comment.