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

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

1 files changed, 7 insertions, 4 deletions

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 3e56a5f1b4..9178a81e7f 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -316,7 +316,7 @@ extern "C" {
 
 #define SSL_TXT_ALL		"ALL"
 
-/*
+/*-
  * COMPLEMENTOF* definitions. These identifiers are used to (de-select)
  * ciphers normally not being used.
  * Example: "RC4" will activate all ciphers using RC4 including ciphers
@@ -468,7 +468,8 @@ struct ssl_method_st
 	long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void));
 	};
 
-/* Lets make this into an ASN.1 type structure as follows
+/*-
+ * Lets make this into an ASN.1 type structure as follows
  * SSL_SESSION_ID ::= SEQUENCE {
  *	version 		INTEGER,	-- structure version number
  *	SSLversion 		INTEGER,	-- SSL version number
@@ -1108,14 +1109,16 @@ struct ssl_ctx_st
 	/* ALPN information
 	 * (we are in the process of transitioning from NPN to ALPN.) */
 
-	/* For a server, this contains a callback function that allows the
+	/*-
+	 * For a server, this contains a callback function that allows the
 	 * server to select the protocol for the connection.
 	 *   out: on successful return, this must point to the raw protocol
 	 *        name (without the length prefix).
 	 *   outlen: on successful return, this contains the length of |*out|.
 	 *   in: points to the client's list of supported protocols in
 	 *       wire-format.
-	 *   inlen: the length of |in|. */
+	 *   inlen: the length of |in|. 
+	 */
 	int (*alpn_select_cb)(SSL *s,
 			      const unsigned char **out,
 			      unsigned char *outlen,