diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-21 21:22:49 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:52:28 +0000 |
| commit | d26667b28f2d8c675ec02e59308712e778ae73a2 (patch) | |
| tree | 8bf2e3152a24fc7adb556afe59e2142642cfe805 /ssl/s2_clnt.c | |
| parent | 13270477f4ac286c2f86493159418a047187ccd6 (diff) | |
Tweaks for comments due to indent's inability to handle them
Conflicts:
ssl/s3_srvr.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/s2_clnt.c')
| -rw-r--r-- | ssl/s2_clnt.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index c13a640455..81981ace1e 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -386,7 +386,10 @@ static int get_server_hello(SSL *s) i = ssl2_read(s,(char *)&(buf[s->init_num]),j); if (i != j) return(ssl2_part_read(s,SSL_F_GET_SERVER_HELLO,i)); if (s->msg_callback) - s->msg_callback(0, s->version, 0, buf, (size_t)len, s, s->msg_callback_arg); /* SERVER-HELLO */ + { + /* SERVER-HELLO */ + s->msg_callback(0, s->version, 0, buf, (size_t)len, s, s->msg_callback_arg); + } /* things are looking good */ @@ -765,7 +768,10 @@ static int client_certificate(SSL *s) return(ssl2_part_read(s,SSL_F_CLIENT_CERTIFICATE,i)); s->init_num += i; if (s->msg_callback) - s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg); /* REQUEST-CERTIFICATE */ + { + /* REQUEST-CERTIFICATE */ + s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg); + } /* type=buf[0]; */ /* type eq x509 */ @@ -932,7 +938,10 @@ static int get_server_verify(SSL *s) if (i < n) return(ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i)); if (s->msg_callback) - s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); /* SERVER-VERIFY */ + { + /* SERVER-VERIFY */ + s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); + } p += 1; if (CRYPTO_memcmp(p,s->s2->challenge,s->s2->challenge_length) != 0) @@ -986,11 +995,20 @@ static int get_server_finished(SSL *s) len = 1 + SSL2_SSL_SESSION_ID_LENGTH; n = len - s->init_num; i = ssl2_read(s,(char *)&(buf[s->init_num]), n); - if (i < n) /* XXX could be shorter than SSL2_SSL_SESSION_ID_LENGTH, that's the maximum */ + if (i < n) + { + /* + * XXX could be shorter than SSL2_SSL_SESSION_ID_LENGTH, + * that's the maximum + */ return(ssl2_part_read(s,SSL_F_GET_SERVER_FINISHED,i)); + } s->init_num += i; if (s->msg_callback) - s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg); /* SERVER-FINISHED */ + { + /* SERVER-FINISHED */ + s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg); + } if (!s->hit) /* new session */ { |