indent has problems with comments that are on the right hand side of a line.

[thirdparty/openssl.git] / ssl / s3_both.c

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index b110e3c361021c44008d09e2299c6e6e33f069b9..4ce065b3f1750b066f97f449df96e6ec84ec4688 100644 (file)
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -183,12 +183,6 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen)
                         s->s3->previous_server_finished_len=i;
                         }
 
-#ifdef OPENSSL_SYS_WIN16
-               /* MSVC 1.5 does not clear the top bytes of the word unless
-                * I do this.
-                */
-               l&=0xffff;
-#endif
                ssl_set_handshake_header(s, SSL3_MT_FINISHED, l);
                s->state=b;
                }
@@ -236,11 +230,12 @@ int ssl3_get_finished(SSL *s, int a, int b)
         */ 
 #endif
 
+       /* 64 argument should actually be 36+4 :-) */
        n=s->method->ssl_get_message(s,
                a,
                b,
                SSL3_MT_FINISHED,
-               64, /* should actually be 36+4 :-) */
+               64,
                &ok);
 
        if (!ok) return((int)n);
@@ -294,7 +289,8 @@ f_err:
        return(0);
        }
 
-/* for these 2 messages, we need to
+/*-
+ * for these 2 messages, we need to
  * ssl->enc_read_ctx                   re-init
  * ssl->s3->read_sequence              zero
  * ssl->s3->read_mac_secret            re-init
@@ -411,17 +407,6 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
                        SSLerr(SSL_F_SSL3_GET_MESSAGE,SSL_R_UNEXPECTED_MESSAGE);
                        goto f_err;
                        }
-               if ((mt < 0) && (*p == SSL3_MT_CLIENT_HELLO) &&
-                                       (st1 == SSL3_ST_SR_CERT_A) &&
-                                       (stn == SSL3_ST_SR_CERT_B))
-                       {
-                       /* At this point we have got an MS SGC second client
-                        * hello (maybe we should always allow the client to
-                        * start a new handshake?). We need to restart the mac.
-                        * Don't increment {num,total}_renegotiations because
-                        * we have not completed the handshake. */
-                       ssl3_init_finished_mac(s);
-                       }
 
                s->s3->tmp.message_type= *(p++);
 
@@ -598,7 +583,8 @@ int ssl_verify_alarm_type(long type)
        }
 
 #ifndef OPENSSL_NO_BUF_FREELISTS
-/* On some platforms, malloc() performance is bad enough that you can't just
+/*-
+ * On some platforms, malloc() performance is bad enough that you can't just
  * free() and malloc() buffers all the time, so we need to use freelists from
  * unused buffers.  Currently, each freelist holds memory chunks of only a
  * given size (list->chunklen); other sized chunks are freed and malloced.