commit 8b368412d389af3c54ad217a808268803ca01a5d
author David Benjamin <davidben@chromium.org> Sat Mar 14 01:54:17 2015 -0400
committer Adam Langley <agl@google.com> Thu Mar 19 11:52:44 2015 +0000
tree a8e597a79ba08f1b6cd784ac4833d7a6e14ff546
parent 9e13e1a31d52d31b427db2181b95f0bcc2dbb622

Minor formatting fixes.

Noticed these as I was poking around.

Change-Id: I93833a152583feced374c9febf7485bec7abc1c7
Reviewed-on: https://boringssl-review.googlesource.com/3973
Reviewed-by: Adam Langley <agl@google.com>

ssl/s3_both.c

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 2248c9a..c3ba775 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -173,8 +173,7 @@
       return 0;
     }
 
-    /* Copy the finished so we can use it for
-     * renegotiation checks */
+    /* Copy the finished so we can use it for renegotiation checks */
     if (s->server) {
       assert(n <= EVP_MAX_MD_SIZE);
       memcpy(s->s3->previous_server_finished, s->s3->tmp.finish_md, n);

ssl/s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index d0dc2bd..00cd014 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -390,12 +390,8 @@
         s->init_num = 0;
 
         s->session->cipher = s->s3->tmp.new_cipher;
-        if (!s->enc_method->setup_key_block(s)) {
-          ret = -1;
-          goto end;
-        }
-
-        if (!s->enc_method->change_cipher_state(
+        if (!s->enc_method->setup_key_block(s) ||
+            !s->enc_method->change_cipher_state(
                 s, SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
           ret = -1;
           goto end;

ssl/test/bssl_shim.cc

diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index 3e712fc..047a475 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -204,7 +204,7 @@
 }
 
 static int NextProtoSelectCallback(SSL* ssl, uint8_t** out, uint8_t* outlen,
-                            const uint8_t* in, unsigned inlen, void* arg) {
+                                   const uint8_t* in, unsigned inlen, void* arg) {
   const TestConfig *config = GetConfigPtr(ssl);
   if (config->select_next_proto.empty()) {
     return SSL_TLSEXT_ERR_NOACK;