More tweaks for comments due indent issues OpenSSL_1_0_2-pre-auto-reformat
authorMatt Caswell <matt@openssl.org>
Wed, 21 Jan 2015 23:54:59 +0000 (23:54 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 22 Jan 2015 09:29:11 +0000 (09:29 +0000)
Conflicts:
ssl/ssl_ciph.c
ssl/ssl_locl.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
ssl/s2_srvr.c
ssl/ssl.h
ssl/ssl_ciph.c

index b33a74e..2ade630 100644 (file)
@@ -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;
index a8b2ae0..6610bf6 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
index aae19d3..4444c22 100644 (file)
@@ -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},