mark all block comments that need format preserving so that

indent will not alter them when reformatting comments

(cherry picked from commit 1d97c84351)

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>
This commit is contained in:
Tim Hudson
2014-12-28 12:48:40 +10:00
committed by Matt Caswell
parent 3a9a032163
commit 3e9a08ecb1
174 changed files with 1046 additions and 744 deletions

View File

@@ -1226,7 +1226,8 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
do
{
/* c_ssl_bio: SSL filter BIO
/*-
* c_ssl_bio: SSL filter BIO
*
* client: pseudo-I/O for SSL library
*
@@ -1651,7 +1652,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"); */
@@ -1662,7 +1664,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"); */
@@ -2048,11 +2051,12 @@ static void process_proxy_debug(int indent, const char *format, ...)
vfprintf(stderr, my_format, args);
va_end(args);
}
/* Priority levels:
0 [!]var, ()
1 & ^
2 |
*/
/*-
* Priority levels:
* 0 [!]var, ()
* 1 & ^
* 2 |
*/
static int process_proxy_cond_adders(unsigned int letters[26],
const char *cond, const char **cond_end, int *pos, int indent);
static int process_proxy_cond_val(unsigned int letters[26],
@@ -2404,7 +2408,8 @@ static void free_tmp_rsa(void)
#endif
#ifndef OPENSSL_NO_DH
/* These DH parameters have been generated as follows:
/*-
* These DH parameters have been generated as follows:
* $ openssl dhparam -C -noout 512
* $ openssl dhparam -C -noout 1024
* $ openssl dhparam -C -noout -dsaparam 1024