Tweaks for comments due to indent's inability to handle them

[openssl.git] / ssl / s2_clnt.c

diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index 32adaf5e5a455925964ce78b3d7f5fe3cc92e832..11c70ee48f63e0d2ee473aec5f75fc811eaa2be7 100644 (file)
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -388,7 +388,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 */
 
@@ -417,12 +420,11 @@ static int get_server_hello(SSL *s)
                }
        else
                {
-#ifdef undef
+#if 0
                /* very bad */
                memset(s->session->session_id,0,
                        SSL_MAX_SSL_SESSION_ID_LENGTH_IN_BYTES);
                s->session->session_id_length=0;
-               */
 #endif
 
                /* we need to do this in case we were trying to reuse a 
@@ -623,7 +625,7 @@ static int client_master_key(SSL *s)
        if (s->state == SSL2_ST_SEND_CLIENT_MASTER_KEY_A)
                {
 
-               if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL))
+               if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL,NULL))
                        {
                        ssl2_return_error(s,SSL2_PE_NO_CIPHER);
                        SSLerr(SSL_F_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);
@@ -767,7 +769,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 */
@@ -936,7 +941,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)
@@ -990,11 +998,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 */
                {