More tweaks for comments due indent issues

Conflicts:
	ssl/ssl_ciph.c
	ssl/ssl_locl.h

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

diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index b33a74e373d612f707a268e701e437a95216352d..2ade6309a04bb494f294060614d9c63bec670019 100644 (file)
--- 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 a8b2ae01a96c1ba179ccd3c2662a8946ec47427f..6610bf68457c6ff1c92540fd0449b7f947bd1b8a 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2149,7 +2149,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 aae19d32c11b38e73a2ced6bd6703f28c35af421..4444c224ca3fdead04f887ec807128b29e3c0408 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -264,7 +264,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},