summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2014-04-20 14:03:05 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2014-04-20 14:03:05 +0000
commitb12a98a4c0969a124eeeaba0536db1ed858a6180 (patch)
tree9a2516eaf06757c76957f46811ba11fcb0f5f385 /lib
parentf1bd23557d98796fc95988dc1eefe94351cfce30 (diff)
Fix indentation, adding braces and combining a nested if to reduce depth
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/src/ssl/s3_both.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/lib/libssl/src/ssl/s3_both.c b/lib/libssl/src/ssl/s3_both.c
index 12b38c4596a..9dcdd7b998f 100644
--- a/lib/libssl/src/ssl/s3_both.c
+++ b/lib/libssl/src/ssl/s3_both.c
@@ -436,18 +436,20 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
}
skip_message = 0;
- if (!s->server)
- if (p[0] == SSL3_MT_HELLO_REQUEST)
- /* The server may always send 'Hello Request' messages --
- * we are doing a handshake anyway now, so ignore them
- * if their format is correct. Does not count for
- * 'Finished' MAC. */
- if (p[1] == 0 && p[2] == 0 &&p[3] == 0) {
- s->init_num = 0;
- skip_message = 1;
-
- if (s->msg_callback)
- s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, p, 4, s, s->msg_callback_arg);
+ if (!s->server && p[0] == SSL3_MT_HELLO_REQUEST) {
+ /*
+ * The server may always send 'Hello Request'
+ * messages -- we are doing a handshake anyway
+ * now, so ignore them if their format is
+ * correct. Does not count for 'Finished' MAC.
+ */
+ if (p[1] == 0 && p[2] == 0 &&p[3] == 0) {
+ s->init_num = 0;
+ skip_message = 1;
+
+ if (s->msg_callback)
+ s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, p, 4, s, s->msg_callback_arg);
+ }
}
}
while (skip_message);