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 | |
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')
-rw-r--r-- | ssl/s2_clnt.c | 28 | ||||
-rw-r--r-- | ssl/s2_lib.c | 5 | ||||
-rw-r--r-- | ssl/s2_srvr.c | 25 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 3 |
4 files changed, 49 insertions, 12 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 */ { diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index 359498c8e5..837d19bd37 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -462,7 +462,10 @@ void ssl2_write_error(SSL *s) if (s->error == 0) if (s->msg_callback) - s->msg_callback(1, s->version, 0, buf, 3, s, s->msg_callback_arg); /* ERROR */ + { + /* ERROR */ + s->msg_callback(1, s->version, 0, buf, 3, s, s->msg_callback_arg); + } } } 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; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 38ba566320..778c048a28 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1008,7 +1008,8 @@ int ssl3_get_client_hello(SSL *s) s->s3->tmp.new_compression=NULL; #ifndef OPENSSL_NO_COMP if (s->ctx->comp_methods != NULL) - { /* See if we have a match */ + { + /* See if we have a match */ int m,nn,o,v,done=0; nn=sk_SSL_COMP_num(s->ctx->comp_methods); |