Bug 1350561 - clang-format a=bustage
authorMartin Thomson <martin.thomson@gmail.com>
Sat, 25 Mar 2017 13:45:57 -0500
changeset 13251 229ce7626a6a83f7c131a8d0303bf13c75710998
parent 13250 0985b120ab0247bdcbf340566ccbde69745cc22f
child 13252 a878b6b59bf7e3756138989e9629ac759f65bceb
push id2119
push usermartin.thomson@gmail.com
push dateSat, 25 Mar 2017 18:46:06 +0000
reviewersbustage
bugs1350561
Bug 1350561 - clang-format a=bustage
gtests/ssl_gtest/ssl_extension_unittest.cc
lib/ssl/ssl3ext.c
--- a/gtests/ssl_gtest/ssl_extension_unittest.cc
+++ b/gtests/ssl_gtest/ssl_extension_unittest.cc
@@ -1000,17 +1000,18 @@ class TlsBogusExtensionTest
       : TlsConnectTestBase(std::get<0>(GetParam()), std::get<1>(GetParam())) {}
 
  protected:
   virtual void ConnectAndFail(uint8_t message) = 0;
 
   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();
     } else {
       server_->SetPacketFilter(filter);
     }
   }
 
@@ -1097,17 +1098,16 @@ TEST_P(TlsBogusExtensionTest13, AddVersi
 
 TEST_P(TlsBogusExtensionTest13, AddVersionExtensionHelloRetryRequest) {
   static const std::vector<SSLNamedGroup> groups = {ssl_grp_ec_secp384r1};
   server_->ConfigNamedGroups(groups);
 
   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) {
   ConfigureSessionCache(RESUME_BOTH, RESUME_TICKET);
 
   AddFilter(kTlsHandshakeNewSessionTicket, 0xff);
   Connect();
   SendReceive();
--- a/lib/ssl/ssl3ext.c
+++ b/lib/ssl/ssl3ext.c
@@ -251,17 +251,17 @@ ssl3_FindExtension(sslSocket *ss, SSLExt
 SECStatus
 ssl3_HandleParsedExtensions(sslSocket *ss,
                             SSL3HandshakeType handshakeMessage)
 {
     const ssl3ExtensionHandler *handlers;
     /* 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) {
         case client_hello:
             handlers = clientHelloHandlers;
             break;
         case new_session_ticket:
             PORT_Assert(ss->version >= SSL_LIBRARY_VERSION_TLS_1_3);