Further comment amendments to preserve formatting prior to source reformat

(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)

Conflicts:
	crypto/x509v3/pcy_tree.c

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

7 files changed, 18 insertions, 9 deletions

diff --git a/ssl/kssl.c b/ssl/kssl.c
index fbb20e1871..7ce8111708 100644
--- a/ssl/kssl.c
+++ b/ssl/kssl.c
@@ -907,7 +907,8 @@ static size_t  *populate_cksumlens(void)
 	return cklens;
 	}
 
-/*	Return pointer to start of real authenticator within authenticator, or
+/*-
+ *	Return pointer to start of real authenticator within authenticator, or
  *	return NULL on error.
  *	Decrypted authenticator looks like this:
  *		[0 or 8 byte confounder] [4-24 byte checksum] [real authent'r]
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index b4a6a45659..bf990bf3cf 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -588,7 +588,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.
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index c904803687..76e67d0dc8 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -729,7 +729,8 @@ void tls_fips_digest_extra(
 	if (EVP_CIPHER_CTX_mode(cipher_ctx) != EVP_CIPH_CBC_MODE)
 		return;
 	block_size = EVP_MD_CTX_block_size(mac_ctx);
-	/* We are in FIPS mode if we get this far so we know we have only SHA*
+	/*-
+	 * We are in FIPS mode if we get this far so we know we have only SHA*
 	 * digests and TLS to deal with.
 	 * Minimum digest padding length is 17 for SHA384/SHA512 and 9
 	 * otherwise.
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index c44bcd255c..df51a77cce 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1912,7 +1912,8 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
 	ret->quiet_shutdown=0;
 
 /*	ret->cipher=NULL;*/
-/*	ret->s2->challenge=NULL;
+/*-
+	ret->s2->challenge=NULL;
 	ret->master_key=NULL;
 	ret->key_arg=NULL;
 	ret->s2->conn_id=NULL; */
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 75db085278..750e5b8c60 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -434,7 +434,8 @@ int ssl_get_new_session(SSL *s, int session)
 	return(1);
 	}
 
-/* ssl_get_prev attempts to find an SSL_SESSION to be used to resume this
+/*-
+ * ssl_get_prev attempts to find an SSL_SESSION to be used to resume this
  * connection. It is only called by servers.
  *
  *   session_id: points at the session ID in the ClientHello. This code will
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 7698f09b55..8b57c3028e 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -300,7 +300,8 @@ static const char *alpn_server;
 static const char *alpn_expected;
 static unsigned char *alpn_selected;
 
-/* next_protos_parse parses a comma separated list of strings into a string
+/*-
+ * next_protos_parse parses a comma separated list of strings into a string
  * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
  *   outlen: (output) set to the length of the resulting buffer on success.
  *   err: (maybe NULL) on failure, an error message line is written to this BIO.
@@ -2148,7 +2149,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
 			if (SSL_in_init(s_ssl))
 				printf("server waiting in SSL_accept - %s\n",
 					SSL_state_string_long(s_ssl));
-/*			else if (s_write)
+/*-
+			else if (s_write)
 				printf("server:SSL_write()\n");
 			else
 				printf("server:SSL_read()\n"); */
@@ -2159,7 +2161,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
 			if (SSL_in_init(c_ssl))
 				printf("client waiting in SSL_connect - %s\n",
 					SSL_state_string_long(c_ssl));
-/*			else if (c_write)
+/*-
+			else if (c_write)
 				printf("client:SSL_write()\n");
 			else
 				printf("client:SSL_read()\n"); */
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 8332467112..306232aac0 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -695,7 +695,8 @@ err:
 	return(ret);
 	}
 
-/* tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
+/*-
+ * tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
  *
  * Returns:
  *   0: (in non-constant time) if the record is publically invalid (i.e. too