From 72d4dcce0fe54ea0a82eb307d051b06af4aad2cf Mon Sep 17 00:00:00 2001
From: Kareem <kareem@wolfssl.com>
Date: Fri, 19 Nov 2021 14:13:02 -0700
Subject: [PATCH] Fix updated FALL_THROUGH macro.  Fix a couple of case
 statements and remove a trailing whitespace.

---
 src/tls13.c               | 2 +-
 wolfcrypt/src/evp.c       | 1 +
 wolfcrypt/src/pkcs7.c     | 2 +-
 wolfssl/wolfcrypt/types.h | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/tls13.c b/src/tls13.c
index 47510a6c1..75761f40e 100644
--- a/src/tls13.c
+++ b/src/tls13.c
@@ -9676,7 +9676,7 @@ int wolfSSL_CTX_get_max_early_data(WOLFSSL_CTX* ctx)
  *
  * ssl  The SSL/TLS object.
  * returns BAD_FUNC_ARG when ssl is NULL, or not using TLS v1.3,
- * SIDE_ERROR when not a server and 
+ * SIDE_ERROR when not a server and
  * returns the maximum amount of early data to be set
  */
 int wolfSSL_get_max_early_data(WOLFSSL* ssl)
diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c
index a604c7792..fffc35340 100644
--- a/wolfcrypt/src/evp.c
+++ b/wolfcrypt/src/evp.c
@@ -1964,6 +1964,7 @@ int wolfSSL_EVP_PKEY_keygen(WOLFSSL_EVP_PKEY_CTX *ctx,
                     pkey->ownEcc = 1;
                 }
             }
+            break;
 #endif
         default:
             break;
diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index ff4ce4327..95091d21d 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -11682,8 +11682,8 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
             wc_PKCS7_ChangeState(pkcs7, WC_PKCS7_AUTHENV_ATRBEND);
             FALL_THROUGH;
 
-authenv_atrbend:
         case WC_PKCS7_AUTHENV_ATRBEND:
+authenv_atrbend:
         #ifndef NO_PKCS7_STREAM
             if ((ret = wc_PKCS7_AddDataToStream(pkcs7, in, inSz, MAX_LENGTH_SZ +
                             ASN_TAG_SZ, &pkiMsg, &idx)) != 0) {
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
index a7dc69924..abbf1c084 100644
--- a/wolfssl/wolfcrypt/types.h
+++ b/wolfssl/wolfcrypt/types.h
@@ -315,7 +315,7 @@ decouple library dependencies with standard string, memory and so on.
                 #define FALL_THROUGH fallthrough
             #elif ((__GNUC__ > 7) || ((__GNUC__ == 7) && (__GNUC_MINOR__ >= 1)))
                 #define FALL_THROUGH ; __attribute__ ((fallthrough))
-            #elif defined(__clang__) && defined(__clang_major__) &&
+            #elif defined(__clang__) && defined(__clang_major__) && \
                     (__clang_major__ >= 4)
                 #define FALL_THROUGH ; __attribute__ ((fallthrough))
             #endif