Commit 3e9a08ec authored by Tim Hudson's avatar Tim Hudson Committed by Matt Caswell
Browse files

mark all block comments that need format preserving so that 


indent will not alter them when reformatting comments

(cherry picked from commit 1d97c843)

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: default avatarTim Hudson <tjh@openssl.org>
parent 3a9a0321

apps/apps.c

+2 −1
Original line number Diff line number Diff line
@@ -2728,7 +2728,8 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret) 
#endif



#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)

/* 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.

apps/asn1pars.c

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ 
#include <openssl/x509.h>

#include <openssl/pem.h>



/* -inform arg	- input format - default PEM (DER or PEM)

/*-

 * -inform arg	- input format - default PEM (DER or PEM)

 * -in arg	- input file - default stdin

 * -i		- indent the details by depth

 * -offset	- where in the file to start

apps/ca.c

+3 −2
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ bad: 
			oid_bio=BIO_new_file(p,"r");

			if (oid_bio == NULL) 

				{

				/*

				/*-

				BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);

				ERR_print_errors(bio_err);

				*/
@@ -2806,7 +2806,8 @@ char *make_revocation_str(int rev_type, char *rev_arg) 
	return str;

	}



/* Convert revocation field to X509_REVOKED entry 

/*-

 * Convert revocation field to X509_REVOKED entry 

 * return code:

 * 0 error

 * 1 OK

apps/crl2p7.c

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile); 
#undef PROG

#define PROG	crl2pkcs7_main



/* -inform arg	- input format - default PEM (DER or PEM)

/*-

 * -inform arg	- input format - default PEM (DER or PEM)

 * -outform arg - output format - default PEM

 * -in arg	- input file - default stdin

 * -out arg	- output file - default stdout

apps/dh.c

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ 
#undef PROG

#define PROG	dh_main



/* -inform arg	- input format - default PEM (DER or PEM)

/*-

 * -inform arg	- input format - default PEM (DER or PEM)

 * -outform arg - output format - default PEM

 * -in arg	- input file - default stdin

 * -out arg	- output file - default stdout