From: Matt Caswell <matt@openssl.org>
Date: Wed, 21 Jan 2015 23:54:59 +0000 (+0000)
Subject: More tweaks for comments due indent issues
X-Git-Tag: OpenSSL_1_0_1-post-reformat~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e498b83fed7025eeacb4dd2ad183c3f6236467b2;p=oweals%2Fopenssl.git

More tweaks for comments due indent issues

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

diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index b33a74e373..2ade6309a0 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -975,9 +975,13 @@ static int request_certificate(SSL *s)
 	if (s->state == SSL2_ST_SEND_REQUEST_CERTIFICATE_C)
 		{
 		p=(unsigned char *)s->init_buf->data;
-		i=ssl2_read(s,(char *)&(p[s->init_num]),6-s->init_num); /* try to read 6 octets ... */
-		if (i < 3-s->init_num) /* ... but don't call ssl2_part_read now if we got at least 3
-		                        * (probably NO-CERTIFICATE-ERROR) */
+		/* try to read 6 octets ... */
+		i=ssl2_read(s,(char *)&(p[s->init_num]),6-s->init_num);
+		/*
+		 * ... but don't call ssl2_part_read now if we got at least 3
+		 * (probably NO-CERTIFICATE-ERROR)
+		 */
+		if (i < 3-s->init_num) 
 			{
 			ret=ssl2_part_read(s,SSL_F_REQUEST_CERTIFICATE,i);
 			goto end;
diff --git a/ssl/ssl.h b/ssl/ssl.h
index f43408137f..b3e1a9306b 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1813,7 +1813,8 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
 int	SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 					    const char *file);
 #ifndef OPENSSL_SYS_VMS
-#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
+/* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
+#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC
 int	SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 					   const char *dir);
 #endif
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index d8b05dce1a..1139a18c56 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -238,9 +238,12 @@ static const SSL_CIPHER cipher_aliases[]={
 	 * e.g. kEDH combines DHE_DSS and DHE_RSA) */
 	{0,SSL_TXT_kRSA,0,    SSL_kRSA,  0,0,0,0,0,0,0,0},
 
-	{0,SSL_TXT_kDHr,0,    SSL_kDHr,  0,0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
-	{0,SSL_TXT_kDHd,0,    SSL_kDHd,  0,0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
-	{0,SSL_TXT_kDH,0,     SSL_kDHr|SSL_kDHd,0,0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
+	/* no such ciphersuites supported! */
+	{0,SSL_TXT_kDHr,0,    SSL_kDHr,  0,0,0,0,0,0,0,0},
+	/* no such ciphersuites supported! */
+	{0,SSL_TXT_kDHd,0,    SSL_kDHd,  0,0,0,0,0,0,0,0},
+	/* no such ciphersuites supported! */
+	{0,SSL_TXT_kDH,0,     SSL_kDHr|SSL_kDHd,0,0,0,0,0,0,0,0},/
 	{0,SSL_TXT_kEDH,0,    SSL_kEDH,  0,0,0,0,0,0,0,0},
 	{0,SSL_TXT_DH,0,      SSL_kDHr|SSL_kDHd|SSL_kEDH,0,0,0,0,0,0,0,0},
 
@@ -262,7 +265,8 @@ static const SSL_CIPHER cipher_aliases[]={
 	{0,SSL_TXT_DSS,0,     0,SSL_aDSS,   0,0,0,0,0,0,0},
 	{0,SSL_TXT_aKRB5,0,   0,SSL_aKRB5, 0,0,0,0,0,0,0},
 	{0,SSL_TXT_aNULL,0,   0,SSL_aNULL, 0,0,0,0,0,0,0},
-	{0,SSL_TXT_aDH,0,     0,SSL_aDH,   0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
+	/* no such ciphersuites supported! */
+	{0,SSL_TXT_aDH,0,     0,SSL_aDH,   0,0,0,0,0,0,0},
 	{0,SSL_TXT_aECDH,0,   0,SSL_aECDH, 0,0,0,0,0,0,0},
 	{0,SSL_TXT_aECDSA,0,  0,SSL_aECDSA,0,0,0,0,0,0,0},
 	{0,SSL_TXT_ECDSA,0,   0,SSL_aECDSA, 0,0,0,0,0,0,0},
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 7907921b30..110e4c2f65 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -320,7 +320,8 @@
 #define SSL_aDSS 		0x00000002L
 /* no auth (i.e. use ADH or AECDH) */
 #define SSL_aNULL 		0x00000004L
-/* Fixed DH auth (kDHd or kDHr) */ /* no such ciphersuites supported! */
+/* Fixed DH auth (kDHd or kDHr) */
+/* no such ciphersuites supported! */
 #define SSL_aDH 		0x00000008L
 /* Fixed ECDH auth (kECDHe or kECDHr) */
 #define SSL_aECDH 		0x00000010L