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

[openssl.git] / ssl / t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 2e8e149b96319ccb782f560ebb91c492fe94f4c4..7101473bc754c784efe3cba0c49a47b9ae1dd5fa 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2264,8 +2264,11 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char
                                return 0;
                                }
 
-                       if (s->s3->client_opaque_prf_input != NULL) /* shouldn't really happen */
+                       if (s->s3->client_opaque_prf_input != NULL)
+                               {
+                               /* shouldn't really happen */
                                OPENSSL_free(s->s3->client_opaque_prf_input);
+                               }
                                
                        /* dummy byte just to get non-NULL */
                        if (s->s3->client_opaque_prf_input_len == 0)
@@ -2695,12 +2698,20 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char
                                return 0;
                                }
                        
-                       if (s->s3->server_opaque_prf_input != NULL) /* shouldn't really happen */
+                       if (s->s3->server_opaque_prf_input != NULL)
+                               {
+                               /* shouldn't really happen */
                                OPENSSL_free(s->s3->server_opaque_prf_input);
+                               }
                        if (s->s3->server_opaque_prf_input_len == 0)
-                               s->s3->server_opaque_prf_input = OPENSSL_malloc(1); /* dummy byte just to get non-NULL */
+                               {
+                               /* dummy byte just to get non-NULL */
+                               s->s3->server_opaque_prf_input = OPENSSL_malloc(1);
+                               }
                        else
+                               {
                                s->s3->server_opaque_prf_input = BUF_memdup(sdata, s->s3->server_opaque_prf_input_len);
+                               }
 
                        if (s->s3->server_opaque_prf_input == NULL)
                                {
@@ -2915,13 +2926,21 @@ int ssl_prepare_clienthello_tlsext(SSL *s)
 
                if (s->tlsext_opaque_prf_input != NULL)
                        {
-                       if (s->s3->client_opaque_prf_input != NULL) /* shouldn't really happen */
+                       if (s->s3->client_opaque_prf_input != NULL)
+                               {
+                               /* shouldn't really happen */
                                OPENSSL_free(s->s3->client_opaque_prf_input);
+                               }
 
                        if (s->tlsext_opaque_prf_input_len == 0)
-                               s->s3->client_opaque_prf_input = OPENSSL_malloc(1); /* dummy byte just to get non-NULL */
+                               {
+                               /* dummy byte just to get non-NULL */
+                               s->s3->client_opaque_prf_input = OPENSSL_malloc(1);
+                               }
                        else
+                               {
                                s->s3->client_opaque_prf_input = BUF_memdup(s->tlsext_opaque_prf_input, s->tlsext_opaque_prf_input_len);
+                               }
                        if (s->s3->client_opaque_prf_input == NULL)
                                {
                                SSLerr(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT,ERR_R_MALLOC_FAILURE);
@@ -2983,8 +3002,11 @@ static int ssl_check_clienthello_tlsext_early(SSL *s)
                                }
                        }
 
-               if (s->s3->server_opaque_prf_input != NULL) /* shouldn't really happen */
+               if (s->s3->server_opaque_prf_input != NULL)
+                       {
+                       /* shouldn't really happen */
                        OPENSSL_free(s->s3->server_opaque_prf_input);
+                       }
                s->s3->server_opaque_prf_input = NULL;
 
                if (s->tlsext_opaque_prf_input != NULL)
@@ -2996,9 +3018,14 @@ static int ssl_check_clienthello_tlsext_early(SSL *s)
                                 * of the same length as the client opaque PRF input! */
 
                                if (s->tlsext_opaque_prf_input_len == 0)
-                                       s->s3->server_opaque_prf_input = OPENSSL_malloc(1); /* dummy byte just to get non-NULL */
+                                       {
+                                       /* dummy byte just to get non-NULL */
+                                       s->s3->server_opaque_prf_input = OPENSSL_malloc(1);
+                                       }
                                else
+                                       {
                                        s->s3->server_opaque_prf_input = BUF_memdup(s->tlsext_opaque_prf_input, s->tlsext_opaque_prf_input_len);
+                                       }
                                if (s->s3->server_opaque_prf_input == NULL)
                                        {
                                        ret = SSL_TLSEXT_ERR_ALERT_FATAL;