[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b1bebbcb67325593f8af247582208940a4cc0332 (commit)
       via  572fa0249d1b863f180986369735b8048ef5f57a (commit)
      from  80162ad645f8982102d6994b9ea9ca6c371e933d (commit)


- Log -----------------------------------------------------------------
commit b1bebbcb67325593f8af247582208940a4cc0332
Author: Philip Prindeville <philipp at redfish-solutions.com>
Date:   Tue Aug 14 17:37:33 2018 -0400

    Travis: don't generate git clone progress for logs
    
    The logs are usually not looked at, and when they are it's almost
    always after they've completed and returned a status.  That being
    the case, "progress" output is useless if it's always seen after
    the fact.
    
    Signed-off-by: Philip Prindeville <philipp at redfish-solutions.com>
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6928)

commit 572fa0249d1b863f180986369735b8048ef5f57a
Author: Dmitry Yakovlev <dewaffled at gmail.com>
Date:   Tue Aug 14 07:24:46 2018 -0400

    Move SSL_DEBUG md fprintf after assignment
    
    To avoid crash (same as #5138 fixed in 44f23cd)
    
    CLA: trivial
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6937)

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml             | 1 +
 ssl/statem/statem_lib.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e9e5aa2..d755d8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ language: c
 cache: ccache
 git:
     submodules: false
+    quiet: true
 
 before_install:
     - if [ -n "$COVERALLS" ]; then
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 74a2ec1..d602846 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -381,9 +381,6 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
             /* SSLfatal() already called */
             goto err;
         }
-#ifdef SSL_DEBUG
-        fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
-#endif
     } else if (!tls1_set_peer_legacy_sigalg(s, pkey)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
                      ERR_R_INTERNAL_ERROR);
@@ -396,6 +393,11 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
         goto err;
     }
 
+#ifdef SSL_DEBUG
+    if (SSL_USE_SIGALGS(s))
+        fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+#endif
+
     /* Check for broken implementations of GOST ciphersuites */
     /*
      * If key is GOST and len is exactly 64 or 128, it is signature without