diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-06-28 22:51:27 +0200 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-06-29 09:56:39 -0400 |
commit | 0485d5406a3b76dd02e73c1c7dcabebe64f9f8a2 (patch) | |
tree | ac7975fb1aa1e388a9dfedb8b0a8d4580f2447c7 | |
parent | 02e112a88579ff2592f34015f73dc85f4ed76ad5 (diff) | |
download | openssl-0485d5406a3b76dd02e73c1c7dcabebe64f9f8a2.tar.gz |
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)
-rw-r--r-- | ssl/d1_lib.c | 2 | ||||
-rw-r--r-- | ssl/d1_msg.c | 2 | ||||
-rw-r--r-- | ssl/record/rec_layer_d1.c | 4 | ||||
-rw-r--r-- | ssl/record/rec_layer_s3.c | 2 | ||||
-rw-r--r-- | ssl/record/record.h | 2 | ||||
-rw-r--r-- | ssl/record/ssl3_buffer.c | 2 | ||||
-rw-r--r-- | ssl/ssl_mcnf.c | 4 | ||||
-rw-r--r-- | ssl/statem/statem_lib.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index ea1e3d5ae9..a20f30a5c2 100644 --- 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 07572030e1..ae7aff6959 100644 --- 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 6699d2a3f1..cca5721efa 100644 --- 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 fa20b35c56..9461284195 100644 --- 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 cda4eff0d3..9177fb4be5 100644 --- 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 72faafe4e3..940b73e583 100644 --- 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 b92b210683..ac9cc95267 100644 --- 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 85523da1c2..aab4e76aa8 100644 --- 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. * |