From 7d50445d1b225be4c8175daea551d1a9841156c1 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Wed, 5 Aug 2020 22:15:23 -0500
Subject: [PATCH] Generic: Fix warnings (fallthrough mosty)

---
 kadmin/rpc.c                       | 2 +-
 lib/gssapi/krb5/init_sec_context.c | 2 +-
 lib/hx509/cms.c                    | 2 +-
 lib/kafs/rxkad_kdf.c               | 1 +
 lib/krb5/context.c                 | 3 +++
 lib/krb5/send_to_kdc.c             | 4 ++--
 lib/ntlm/digest.c                  | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/kadmin/rpc.c b/kadmin/rpc.c
index d92e1b85b..374695cc8 100644
--- a/kadmin/rpc.c
+++ b/kadmin/rpc.c
@@ -941,7 +941,7 @@ process_stream(krb5_context contextp,
 	    INSIST(gctx.ctx == NULL);
 
 	    gctx.inprogress = 1;
-	    /* FALL THOUGH */
+	    /* FALLTHROUGH */
 	case RPG_CONTINUE_INIT: {
 	    gss_name_t src_name = GSS_C_NO_NAME;
 	    krb5_data in;
diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index 59cbf7a3e..9d81074e8 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -912,7 +912,7 @@ OM_uint32 GSSAPI_CALLCONV _gsskrb5_init_sec_context
 			time_rec);
 	if (ret != GSS_S_COMPLETE)
 	    break;
-	/* FALL THOUGH */
+	/* FALLTHROUGH */
     case INITIATOR_RESTART:
 	ret = init_auth_restart(minor_status,
 				cred,
diff --git a/lib/hx509/cms.c b/lib/hx509/cms.c
index 7bc0b15e9..6e935fc40 100644
--- a/lib/hx509/cms.c
+++ b/lib/hx509/cms.c
@@ -182,7 +182,7 @@ fill_CMSIdentifier(const hx509_cert cert,
 						   &id->u.subjectKeyIdentifier);
 	if (ret == 0)
 	    break;
-	/* FALL THOUGH */
+	/* FALLTHROUGH */
     case CMS_ID_NAME: {
 	hx509_name name;
 
diff --git a/lib/kafs/rxkad_kdf.c b/lib/kafs/rxkad_kdf.c
index 21dd3543d..174fa3a61 100644
--- a/lib/kafs/rxkad_kdf.c
+++ b/lib/kafs/rxkad_kdf.c
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  */
 
+#define HC_DEPRECATED_CRYPTO
 #include "kafs_locl.h"
 
 static int rxkad_derive_des_key(const void *, size_t, char[8]);
diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index de1c3fe6e..071b2a8c1 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -33,6 +33,9 @@
  * SUCH DAMAGE.
  */
 
+#undef KRB5_DEPRECATED_FUNCTION
+#define KRB5_DEPRECATED_FUNCTION(x)
+
 #include "krb5_locl.h"
 #include <assert.h>
 #include <com_err.h>
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index 2a18fab0e..85d44b6c3 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -1176,7 +1176,7 @@ krb5_sendto_context(krb5_context context,
 		break;
 	    }
 	    action = KRB5_SENDTO_KRBHST;
-	    /* FALLTHOUGH */
+	    /* FALLTHROUGH */
 	case KRB5_SENDTO_KRBHST:
 	    if (ctx->krbhst == NULL) {
 		ret = krb5_krbhst_init_flags(context, realm, type,
@@ -1194,7 +1194,7 @@ krb5_sendto_context(krb5_context context,
 		handle = heim_retain(ctx->krbhst);
 	    }
 	    action = KRB5_SENDTO_TIMEOUT;
-	    /* FALLTHOUGH */
+	    /* FALLTHROUGH */
 	case KRB5_SENDTO_TIMEOUT:
 
 	    /*
diff --git a/lib/ntlm/digest.c b/lib/ntlm/digest.c
index 865f43662..a1d6b5f3a 100644
--- a/lib/ntlm/digest.c
+++ b/lib/ntlm/digest.c
@@ -471,7 +471,7 @@ heim_digest_generate_challenge(heim_digest_t context)
 	    break;
 	case HEIM_DIGEST_TYPE_AUTO:
 	    context->type = HEIM_DIGEST_TYPE_RFC2831;
-	    /* FALL THOUGH */
+	    /* FALLTHROUGH */
 	case HEIM_DIGEST_TYPE_RFC2831:
 	    asprintf(&challenge, "realm=\"%s\",nonce=\"%s\",qop=\"%s\",algorithm=md5-sess,charset=utf-8,maxbuf=%s",
 		     context->serverRealm, context->serverNonce, context->serverQOP, context->serverMaxbuf);