Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1350561 - clang-format a=bustage
  • Loading branch information
martinthomson committed Mar 25, 2017
1 parent d135643 commit 37dd462
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions gtests/ssl_gtest/ssl_extension_unittest.cc
Expand Up @@ -1005,7 +1005,8 @@ class TlsBogusExtensionTest
void AddFilter(uint8_t message, uint16_t extension) {
static uint8_t empty_buf[1] = {0};
DataBuffer empty(empty_buf, 0);
auto filter = std::make_shared<TlsExtensionAppender>(message, extension, empty);
auto filter =
std::make_shared<TlsExtensionAppender>(message, extension, empty);
if (version_ >= SSL_LIBRARY_VERSION_TLS_1_3) {
server_->SetTlsRecordFilter(filter);
filter->EnableDecryption();
Expand Down Expand Up @@ -1102,7 +1103,6 @@ TEST_P(TlsBogusExtensionTest13, AddVersionExtensionHelloRetryRequest) {
Run(kTlsHandshakeHelloRetryRequest, ssl_tls13_supported_versions_xtn);
}


// NewSessionTicket allows unknown extensions AND it isn't protected by the
// Finished. So adding an unknown extension doesn't cause an error.
TEST_P(TlsBogusExtensionTest13, AddBogusExtensionNewSessionTicket) {
Expand Down
2 changes: 1 addition & 1 deletion lib/ssl/ssl3ext.c
Expand Up @@ -256,7 +256,7 @@ ssl3_HandleParsedExtensions(sslSocket *ss,
/* HelloRetryRequest doesn't set ss->version. It might be safe to
* do so, but we weren't entirely sure. TODO(ekr@rtfm.com). */
PRBool isTLS13 = (ss->version >= SSL_LIBRARY_VERSION_TLS_1_3) ||
(handshakeMessage == hello_retry_request);
(handshakeMessage == hello_retry_request);
PRCList *cursor;

switch (handshakeMessage) {
Expand Down

0 comments on commit 37dd462

Please sign in to comment.