mark all block comments that need format preserving so that

indent will not alter them when reformatting comments

(cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960)

Conflicts:
	crypto/bn/bn_lcl.h
	crypto/bn/bn_prime.c
	crypto/engine/eng_all.c
	crypto/rc4/rc4_utl.c
	crypto/sha/sha.h
	ssl/kssl.c
	ssl/t1_lib.c

Conflicts:
	crypto/rc4/rc4_enc.c
	crypto/x509v3/v3_scts.c
	crypto/x509v3/v3nametest.c
	ssl/d1_both.c
	ssl/s3_srvr.c
	ssl/ssl.h
	ssl/ssl_locl.h
	ssl/ssltest.c
	ssl/t1_lib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>

1 files changed, 15 insertions, 10 deletions

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index fadca74ec2..14a2ebd5eb 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1438,7 +1438,8 @@ int ssl3_get_client_hello(SSL *s)
 			}
 		}
 	
-	/* we now have the following setup. 
+	/*-
+	 * we now have the following setup. 
 	 * client_random
 	 * cipher_list 		- our prefered list of ciphers
 	 * ciphers 		- the clients prefered list of ciphers
@@ -1495,7 +1496,8 @@ int ssl3_send_server_hello(SSL *s)
 		memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
 		p+=SSL3_RANDOM_SIZE;
 
-		/* There are several cases for the session ID to send
+		/*-
+		 * There are several cases for the session ID to send
 		 * back in the server hello:
 		 * - For session reuse from the session cache,
 		 *   we send back the old session ID.
@@ -2586,11 +2588,11 @@ int ssl3_get_client_key_exchange(SSL *s)
 			}
 
 
-		/*  Was doing kssl_ctx_free() here,
-		**  but it caused problems for apache.
-		**  kssl_ctx = kssl_ctx_free(kssl_ctx);
-		**  if (s->kssl_ctx)  s->kssl_ctx = NULL;
-		*/
+		/*- Was doing kssl_ctx_free() here,
+		 *  but it caused problems for apache.
+		 *  kssl_ctx = kssl_ctx_free(kssl_ctx);
+		 *  if (s->kssl_ctx)  s->kssl_ctx = NULL;
+		 */
 		}
 	else
 #endif	/* OPENSSL_NO_KRB5 */
@@ -3482,7 +3484,8 @@ int ssl3_send_newsession_ticket(SSL *s)
 		i2d_SSL_SESSION(sess, &p);
 		SSL_SESSION_free(sess);
 
-		/* Grow buffer if need be: the length calculation is as
+		/*-
+		 * Grow buffer if need be: the length calculation is as
  		 * follows 1 (size of message name) + 3 (message length
  		 * bytes) + 4 (ticket lifetime hint) + 2 (ticket length) +
  		 * 16 (key name) + max_iv_len (iv length) +
@@ -3575,7 +3578,8 @@ int ssl3_send_cert_status(SSL *s)
 	if (s->state == SSL3_ST_SW_CERT_STATUS_A)
 		{
 		unsigned char *p;
-		/* Grow buffer if need be: the length calculation is as
+		/*-
+		 * Grow buffer if need be: the length calculation is as
  		 * follows 1 (message type) + 3 (message length) +
  		 * 1 (ocsp response type) + 3 (ocsp response length)
  		 * + (ocsp response)
@@ -3647,7 +3651,8 @@ int ssl3_get_next_proto(SSL *s)
 
 	p=(unsigned char *)s->init_msg;
 
-	/* The payload looks like:
+	/*-
+	 * The payload looks like:
 	 *   uint8 proto_len;
 	 *   uint8 proto[proto_len];
 	 *   uint8 padding_len;