[openssl] OpenSSL_1_1_1-stable update

Matt Caswell matt at openssl.org
Tue Jun 11 14:24:20 UTC 2019


The branch OpenSSL_1_1_1-stable has been updated
       via  c4376aed029f10b1c6cd0fd26e0c111e55bf3ab0 (commit)
      from  b658421823c997586f16d1edc4351448c90c86a8 (commit)


- Log -----------------------------------------------------------------
commit c4376aed029f10b1c6cd0fd26e0c111e55bf3ab0
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jun 11 13:27:45 2019 +0100

    Move a fall through comment
    
    When compiling with --strict-warnings using gcc 7.4.0 the compiler
    complains that a case falls through, even though there is an explicit
    comment stating this. Moving the comment outside of the conditional
    compilation section resolves this.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9131)
    
    (cherry picked from commit a2e520447e17a58b52cdf41ab1218b020f44e4a6)

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

Summary of changes:
 crypto/bio/b_addr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index 5ce473e..1619ab5 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -718,8 +718,8 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
                 hints.ai_flags &= ~AI_ADDRCONFIG;
                 goto retry;
             }
-            /* fall through */
 # endif
+            /* fall through */
         default:
             BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_SYS_LIB);
             ERR_add_error_data(1, gai_strerror(gai_ret));


More information about the openssl-commits mailing list