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_srvr.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_srvr.c')
| -rw-r--r-- | ssl/s2_srvr.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index c87d84499e..5bc2095c1a 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -434,7 +434,10 @@ static int get_client_master_key(SSL *s) i = ssl2_read(s,(char *)&(p[s->init_num]),n); if (i != n) return(ssl2_part_read(s,SSL_F_GET_CLIENT_MASTER_KEY,i)); if (s->msg_callback) - s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg); /* CLIENT-MASTER-KEY */ + { + /* CLIENT-MASTER-KEY */ + s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg); + } p += 10; memcpy(s->session->key_arg,&(p[s->s2->tmp.clear+s->s2->tmp.enc]), @@ -583,7 +586,10 @@ static int get_client_hello(SSL *s) i = ssl2_read(s,(char *)&(p[s->init_num]),n); if (i != n) return(ssl2_part_read(s,SSL_F_GET_CLIENT_HELLO,i)); if (s->msg_callback) - s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg); /* CLIENT-HELLO */ + { + /* CLIENT-HELLO */ + s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg); + } p += 9; /* get session-id before cipher stuff so we can get out session @@ -856,7 +862,10 @@ static int get_client_finished(SSL *s) return(ssl2_part_read(s,SSL_F_GET_CLIENT_FINISHED,i)); } if (s->msg_callback) - s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); /* CLIENT-FINISHED */ + { + /* CLIENT-FINISHED */ + s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); + } p += 1; if (memcmp(p,s->s2->conn_id,s->s2->conn_id_length) != 0) { @@ -979,7 +988,10 @@ static int request_certificate(SSL *s) } if (s->msg_callback) - s->msg_callback(0, s->version, 0, p, 3, s, s->msg_callback_arg); /* ERROR */ + { + /* ERROR */ + s->msg_callback(0, s->version, 0, p, 3, s, s->msg_callback_arg); + } /* this is the one place where we can recover from an SSL 2.0 error */ @@ -1034,7 +1046,10 @@ static int request_certificate(SSL *s) goto end; } if (s->msg_callback) - s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); /* CLIENT-CERTIFICATE */ + { + /* CLIENT-CERTIFICATE */ + s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); + } p += 6; cp = p; |