[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  147167548bb692dc1b772cf4ee1d0917e45b1aff (commit)
      from  aef84bb4efbddfd95d042f3f5f1d362ed7d4faeb (commit)


- Log -----------------------------------------------------------------
commit 147167548bb692dc1b772cf4ee1d0917e45b1aff
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Tue Dec 12 14:49:21 2017 +0100

    crypto/bio/bss_dgram.c: annotate fallthrough (-Wimplicit-fallthrough)
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.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/4916)

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

Summary of changes:
 crypto/bio/bss_dgram.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index df2203e..aad8c85 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1463,6 +1463,7 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
          * we need to deactivate an old key
          */
         data->ccs_sent = 1;
+        /* fall-through */
 
     case BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD:
         /* Returns 0 on success, -1 otherwise. */