Whitespace cleanup in ssl folder

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1264)

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index ea1e3d5ae94f6fec3628c471a8bef6a3fafee5c8..a20f30a5c21d2b414f23f7816867db138cbe433b 100644 (file)
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -82,7 +82,7 @@ int dtls1_new(SSL *s)
     if (!DTLS_RECORD_LAYER_new(&s->rlayer)) {
         return 0;
     }
-    
+
     if (!ssl3_new(s))
         return (0);
     if ((d1 = OPENSSL_zalloc(sizeof(*d1))) == NULL) {

diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c
index 07572030e17043f11f3ac9fec08da7504b783990..ae7aff69599da4a89d4190e46e70452a96b01221 100644 (file)
--- a/ssl/d1_msg.c
+++ b/ssl/d1_msg.c
@@ -9,7 +9,7 @@
 
 #define USE_SOCKETS
 #include "ssl_locl.h"
-    
+
 int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len)
 {
     int i;

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 6699d2a3f1c44937efd5b35cf9e889ee19464287..cca5721efa26e4e893f7a24dff18737e1c024215 100644 (file)
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -18,7 +18,7 @@
 int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl)
 {
     DTLS_RECORD_LAYER *d;
-    
+
     if ((d = OPENSSL_malloc(sizeof(*d))) == NULL)
         return (0);
 
@@ -62,7 +62,7 @@ void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl)
     pqueue *buffered_app_data;
 
     d = rl->d;
-    
+
     while ((item = pqueue_pop(d->unprocessed_rcds.q)) != NULL) {
         rdata = (DTLS1_RECORD_DATA *)item->data;
         OPENSSL_free(rdata->rbuf.buf);

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index fa20b35c560d1a9692949889efb8afa865e250e8..9461284195e1e063eb6268b16cb86cbd5aa993f6 100644 (file)
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -68,7 +68,7 @@ void RECORD_LAYER_clear(RECORD_LAYER *rl)
 
     RECORD_LAYER_reset_read_sequence(rl);
     RECORD_LAYER_reset_write_sequence(rl);
-    
+
     if (rl->d)
         DTLS_RECORD_LAYER_clear(rl);
 }

diff --git a/ssl/record/record.h b/ssl/record/record.h
index cda4eff0d36251f9ca6aee86b6b26242f0820ce7..9177fb4be5210d47510ed831b11a0899a416a113 100644 (file)
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -198,7 +198,7 @@ typedef struct record_layer_st {
 
     unsigned char read_sequence[SEQ_NUM_SIZE];
     unsigned char write_sequence[SEQ_NUM_SIZE];
-    
+
     DTLS_RECORD_LAYER *d;
 } RECORD_LAYER;
 

diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c
index 72faafe4e3fbb3a3e074c21a022d84e08763962c..940b73e5833d74a2dcaf8f746de8b43099869d28 100644 (file)
--- a/ssl/record/ssl3_buffer.c
+++ b/ssl/record/ssl3_buffer.c
@@ -39,7 +39,7 @@ int ssl3_setup_read_buffer(SSL *s)
     unsigned char *p;
     size_t len, align = 0, headerlen;
     SSL3_BUFFER *b;
-    
+
     b = RECORD_LAYER_get_rbuf(&s->rlayer);
 
     if (SSL_IS_DTLS(s))

diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c
index b92b21068389634565f9207c4fabdcddb5b28036..ac9cc952678c99c18f8b7cec323ceb4c4eacc5cc 100644 (file)
--- a/ssl/ssl_mcnf.c
+++ b/ssl/ssl_mcnf.c
@@ -60,7 +60,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
     STACK_OF(CONF_VALUE) *cmd_lists;
     ssl_conf_section = CONF_imodule_get_value(md);
     cmd_lists = NCONF_get_section(cnf, ssl_conf_section);
-    if (sk_CONF_VALUE_num(cmd_lists) <= 0){
+    if (sk_CONF_VALUE_num(cmd_lists) <= 0) {
         if (cmd_lists == NULL)
             SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_SECTION_NOT_FOUND);
         else
@@ -174,7 +174,7 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name)
         if (rv <= 0) {
             if (rv == -2)
                 SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_UNKNOWN_COMMAND);
-            else 
+            else
                 SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_BAD_VALUE);
             ERR_add_error_data(6, "section=", name, ", cmd=", cmd->cmd,
                                     ", arg=", cmd->arg);

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 85523da1c2f05b1134ff519a3995f5c6bc7d3b4f..aab4e76aa86353bf665eef7f3e0c56473274f760 100644 (file)
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -974,7 +974,7 @@ int ssl_choose_client_version(SSL *s, int version)
  * or FIPS_mode() constraints and any floor imposed by the security level here,
  * so we don't advertise the wrong protocol version to only reject the outcome later.
  *
- * Computing the right floor matters.  If, e.g.,  TLS 1.0 and 1.2 are enabled,
+ * Computing the right floor matters.  If, e.g., TLS 1.0 and 1.2 are enabled,
  * TLS 1.1 is disabled, but the security level, Suite-B  and/or MinProtocol
  * only allow TLS 1.2, we want to advertise TLS1.2, *not* TLS1.
  *