diff options
| author | KaoruToda <kunnpuu@gmail.com> | 2017-10-09 20:05:58 +0900 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-10-09 13:17:09 +0100 |
| commit | 208fb891e36f16d20262710c70ef0ff3df0e885c (patch) | |
| tree | 514e6161c7c21122fced736efaddd87f5b5e0538 /ssl/s3_enc.c | |
| parent | 2e8b5d75afaff7c9b75917b750f997dc82336fac (diff) | |
Since return is inconsistent, I removed unnecessary parentheses and
unified them.
- return (0); -> return 0;
- return (1); -> return 1;
- return (-1); -> return -1;
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4500)
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index bef9f99e7d..7200766827 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -210,7 +210,7 @@ int ssl3_change_cipher_state(SSL *s, int which) OPENSSL_cleanse(exp_key, sizeof(exp_key)); OPENSSL_cleanse(exp_iv, sizeof(exp_iv)); - return (1); + return 1; err: SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_MALLOC_FAILURE); err2: @@ -229,7 +229,7 @@ int ssl3_setup_key_block(SSL *s) SSL_COMP *comp; if (s->s3->tmp.key_block_length != 0) - return (1); + return 1; if (!ssl_cipher_get_evp(s->session, &c, &hash, NULL, NULL, &comp, 0)) { SSLerr(SSL_F_SSL3_SETUP_KEY_BLOCK, SSL_R_CIPHER_OR_HASH_UNAVAILABLE); |