From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 29 Jan 2017 13:38:55 +0000 (+0000)
Subject: fix style issues
X-Git-Tag: OpenSSL_1_1_1-pre1~2521
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=91410d40cbc2f63bf6c27c01f9f002ef7bcc3277;p=oweals%2Fopenssl.git

fix style issues

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2301)
---

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 2c7fce5272..3f46156ef6 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -261,7 +261,7 @@ static int do_print_sigalgs(BIO *out, SSL *s, int shared)
             SSL_get_sigalgs(s, i, &sign_nid, &hash_nid, NULL, &rsign, &rhash);
         if (i)
             BIO_puts(out, ":");
-        sstr= get_sigtype(sign_nid);
+        sstr = get_sigtype(sign_nid);
         if (sstr)
             BIO_printf(out, "%s+", sstr);
         else
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index ca7cc6232b..d5d933cff9 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2023,8 +2023,7 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
         }
         if (SSL_USE_PSS(s)) {
             if (EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) <= 0
-                       /* -1 here means set saltlen to the digest len */
-                    || EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx,
+                || EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx,
                                                 RSA_PSS_SALTLEN_DIGEST) <= 0) {
                 al = SSL_AD_INTERNAL_ERROR;
                 SSLerr(SSL_F_TLS_PROCESS_KEY_EXCHANGE, ERR_R_EVP_LIB);