Commit c7c7a432 authored by Matt Caswell's avatar Matt Caswell
Browse files

indent has problems with comments that are on the right hand side of a line. 


Sometimes it fails to format them very well, and sometimes it corrupts them!
This commit moves some particularly problematic ones.

Conflicts:
	crypto/bn/bn.h
	crypto/ec/ec_lcl.h
	crypto/rsa/rsa.h
	demos/engines/ibmca/hw_ibmca.c
	ssl/ssl.h
	ssl/ssl3.h

Conflicts:
	crypto/ec/ec_lcl.h
	ssl/tls1.h

Conflicts:
	crypto/ec/ecp_nistp224.c
	crypto/evp/evp.h
	ssl/d1_both.c
	ssl/ssl.h
	ssl/ssl_lib.c

Conflicts:
	crypto/bio/bss_file.c
	crypto/ec/ec_lcl.h
	crypto/evp/evp.h
	crypto/store/str_mem.c
	crypto/whrlpool/wp_block.c
	crypto/x509/x509_vfy.h
	ssl/ssl.h
	ssl/ssl3.h
	ssl/ssltest.c
	ssl/t1_lib.c
	ssl/tls1.h

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 5ba9d5bb

apps/s_client.c

+3 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,9 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
		if (peer != NULL)

			{

			BIO_printf(bio,"Server certificate\n");

			if (!(c_showcerts && got_a_chain)) /* Redundant if we showed the whole chain */



			/* Redundant if we showed the whole chain */

			if (!(c_showcerts && got_a_chain))

				PEM_write_bio_X509(bio,peer);

			X509_NAME_oneline(X509_get_subject_name(peer),

				buf,sizeof buf);

crypto/asn1/a_utctm.c

+11 −8
Original line number Diff line number Diff line
@@ -291,13 +291,16 @@ time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s) 
		}

#undef g2



	return mktime(&tm)-offset*60; /* FIXME: mktime assumes the current timezone

	/*

	 * FIXME: mktime assumes the current timezone

	 * instead of UTC, and unless we rewrite OpenSSL

	 * in Lisp we cannot locally change the timezone

	 * without possibly interfering with other parts

	 * of the program. timegm, which uses UTC, is

	 * non-standard.

	 * Also time_t is inappropriate for general

	                               * UTC times because it may a 32 bit type. */

	 * UTC times because it may a 32 bit type.

	 */

	return mktime(&tm)-offset*60; 

	}

#endif

crypto/bio/bss_log.c

+5 −2
Original line number Diff line number Diff line
@@ -295,8 +295,11 @@ static void xsyslog(BIO *bp, int priority, const char *string) 
	case LOG_DEBUG:

		evtype = EVENTLOG_INFORMATION_TYPE;

		break;

	default:		/* Should never happen, but set it

				   as error anyway. */

	default:

		/*

		 * Should never happen, but set it

		 * as error anyway.

		 */

		evtype = EVENTLOG_ERROR_TYPE;

		break;

		}

crypto/bn/bn.h

+15 −9
Original line number Diff line number Diff line
@@ -245,16 +245,22 @@ extern "C" { 


#define BN_FLG_MALLOCED		0x01

#define BN_FLG_STATIC_DATA	0x02

#define BN_FLG_CONSTTIME	0x04 /* avoid leaking exponent information through timing,



/*

 * avoid leaking exponent information through timing,

 * BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,

 * BN_div() will call BN_div_no_branch,

 * BN_mod_inverse() will call BN_mod_inverse_no_branch.

 */

#define BN_FLG_CONSTTIME	0x04 



#ifndef OPENSSL_NO_DEPRECATED

#define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME /* deprecated name for the flag */

                                      /* avoid leaking exponent information through timings

                                      * (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime) */

#ifdef OPENSSL_NO_DEPRECATED

/* deprecated name for the flag */

#define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME 

/*

 * avoid leaking exponent information through timings

 * (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime)

 */

#endif



#ifndef OPENSSL_NO_DEPRECATED

crypto/bn/bn_lib.c

+6 −3
Original line number Diff line number Diff line
@@ -355,9 +355,12 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) 
		case 3:	A[2]=B[2];

		case 2:	A[1]=B[1];

		case 1:	A[0]=B[0];

		case 0: /* workaround for ultrix cc: without 'case 0', the optimizer does

		case 0:

			/*

			 * workaround for ultrix cc: without 'case 0', the optimizer does

			 * the switch table by doing a=top&3; a--; goto jump_table[a];

		         * which fails for top== 0 */

			 * which fails for top== 0

			 */

			;

			}

		}