diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index ecff9ea..40603ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,49 +1,50 @@
-krb5-1.3.4.tar.gz
-krb5-1.3.5.tar.gz
-krb5-1.3.5.tar.gz.asc
-krb5-1.3.6.tar.gz
-krb5-1.3.6.tar.gz.asc
-krb5-1.4.tar.gz
-krb5-1.4.tar.gz.asc
-krb5-1.4.1.tar.gz
-krb5-1.4.1.tar.gz.asc
-krb5-1.4.2.tar.gz
-krb5-1.4.2.tar.gz.asc
-krb5-1.4.3.tar.gz
-krb5-1.4.3.tar.gz.asc
-krb5-1.5.tar.gz
-krb5-1.5.tar.gz.asc
-krb5-1.6.tar.gz
-krb5-1.6.tar.gz.asc
-krb5-1.6-pdf.tar.gz
-krb5-1.6.1.tar.gz
-krb5-1.6.1.tar.gz.asc
-krb5-1.6.1-pdf.tar.gz
-krb5-1.6.2.tar.gz
-krb5-1.6.2.tar.gz.asc
-krb5-1.6.2-pdf.tar.gz
-krb5-1.6.3.tar.gz
-krb5-1.6.3.tar.gz.asc
-krb5-1.6.3-pdf.tar.gz
-krb5-1.7.tar.gz
-krb5-1.7.tar.gz.asc
-krb5-1.7-pdf.tar.gz
-krb5-1.7.1.tar.gz
-krb5-1.7.1.tar.gz.asc
-krb5-1.7.1-pdf.tar.gz
-krb5-1.8.tar.gz
-krb5-1.8.tar.gz.asc
-krb5-appl-1.0.tar.gz
-krb5-appl-1.0.tar.gz.asc
-krb5-1.8-pdf.tar.gz
-krb5-1.8.1.tar.gz
-krb5-1.8.1.tar.gz.asc
-krb5-1.8.1-pdf.tar.gz
-krb5-1.8.2.tar.gz.asc
-krb5-1.8.2-pdf.tar.gz
-krb5-1.8.3.tar.gz
-krb5-1.8.3.tar.gz.asc
-krb5-1.8.3-pdf.tar.gz
+/results_krb5
+/krb5-1.3.4.tar.gz
+/krb5-1.3.5.tar.gz
+/krb5-1.3.5.tar.gz.asc
+/krb5-1.3.6.tar.gz
+/krb5-1.3.6.tar.gz.asc
+/krb5-1.4.tar.gz
+/krb5-1.4.tar.gz.asc
+/krb5-1.4.1.tar.gz
+/krb5-1.4.1.tar.gz.asc
+/krb5-1.4.2.tar.gz
+/krb5-1.4.2.tar.gz.asc
+/krb5-1.4.3.tar.gz
+/krb5-1.4.3.tar.gz.asc
+/krb5-1.5.tar.gz
+/krb5-1.5.tar.gz.asc
+/krb5-1.6.tar.gz
+/krb5-1.6.tar.gz.asc
+/krb5-1.6-pdf.tar.gz
+/krb5-1.6.1.tar.gz
+/krb5-1.6.1.tar.gz.asc
+/krb5-1.6.1-pdf.tar.gz
+/krb5-1.6.2.tar.gz
+/krb5-1.6.2.tar.gz.asc
+/krb5-1.6.2-pdf.tar.gz
+/krb5-1.6.3.tar.gz
+/krb5-1.6.3.tar.gz.asc
+/krb5-1.6.3-pdf.tar.gz
+/krb5-1.7.tar.gz
+/krb5-1.7.tar.gz.asc
+/krb5-1.7-pdf.tar.gz
+/krb5-1.7.1.tar.gz
+/krb5-1.7.1.tar.gz.asc
+/krb5-1.7.1-pdf.tar.gz
+/krb5-1.8.tar.gz
+/krb5-1.8.tar.gz.asc
+/krb5-appl-1.0.tar.gz
+/krb5-appl-1.0.tar.gz.asc
+/krb5-1.8-pdf.tar.gz
+/krb5-1.8.1.tar.gz
+/krb5-1.8.1.tar.gz.asc
+/krb5-1.8.1-pdf.tar.gz
+/krb5-1.8.2.tar.gz.asc
+/krb5-1.8.2-pdf.tar.gz
+/krb5-1.8.3.tar.gz
+/krb5-1.8.3.tar.gz.asc
+/krb5-1.8.3-pdf.tar.gz
 /krb5-1.9-beta2.tar.gz
 /krb5-1.9-beta2.tar.gz.asc
 /krb5-1.9-beta2-pdf.tar.bz2
@@ -187,3 +188,23 @@ krb5-1.8.3-pdf.tar.gz
 /krb5-1.18.1.tar.gz.asc
 /krb5-1.18.2.tar.gz
 /krb5-1.18.2.tar.gz.asc
+/krb5-1.18.3.tar.gz
+/krb5-1.18.3.tar.gz.asc
+/krb5-1.19-beta1.tar.gz
+/krb5-1.19-beta1.tar.gz.asc
+/krb5-1.19-beta2.tar.gz
+/krb5-1.19-beta2.tar.gz.asc
+/krb5-1.19.tar.gz
+/krb5-1.19.tar.gz.asc
+/krb5-1.19.1.tar.gz
+/krb5-1.19.1.tar.gz.asc
+/krb5-1.19.2.tar.gz
+/krb5-1.19.2.tar.gz.asc
+/krb5-1.20.1.tar.gz
+/krb5-1.20.1.tar.gz.asc
+/krb5-1.21.tar.gz
+/krb5-1.21.tar.gz.asc
+/krb5-1.21.2.tar.gz
+/krb5-1.21.2.tar.gz.asc
+/krb5-1.21.3.tar.gz
+/krb5-1.21.3.tar.gz.asc
diff --git a/0001-downstream-Revert-Don-t-issue-session-keys-with-depr.patch b/0001-downstream-Revert-Don-t-issue-session-keys-with-depr.patch
new file mode 100644
index 0000000..84d04bf
--- /dev/null
+++ b/0001-downstream-Revert-Don-t-issue-session-keys-with-depr.patch
@@ -0,0 +1,310 @@
+From 6f7fd964539dfe4a885068f43a91db9738661870 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Tue, 9 Jul 2024 11:15:33 +0200
+Subject: [PATCH] [downstream] Revert "Don't issue session keys with
+ deprecated enctypes"
+
+This reverts commit 1b57a4d134bbd0e7c52d5885a92eccc815726463.
+---
+ doc/admin/conf_files/krb5_conf.rst | 12 ------------
+ doc/admin/enctypes.rst             | 23 +++-------------------
+ src/include/k5-int.h               |  4 ----
+ src/kdc/kdc_util.c                 | 10 ----------
+ src/lib/krb5/krb/get_in_tkt.c      | 31 +++++++++++-------------------
+ src/lib/krb5/krb/init_ctx.c        | 10 ----------
+ src/tests/gssapi/t_enctypes.py     |  3 +--
+ src/tests/t_etype_info.py          |  2 +-
+ src/tests/t_sesskeynego.py         | 28 ++-------------------------
+ src/util/k5test.py                 |  4 ++--
+ 10 files changed, 20 insertions(+), 107 deletions(-)
+
+diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
+index ecdf917501..f22d5db11b 100644
+--- a/doc/admin/conf_files/krb5_conf.rst
++++ b/doc/admin/conf_files/krb5_conf.rst
+@@ -95,18 +95,6 @@ Additionally, krb5.conf may include any of the relations described in
+ 
+ The libdefaults section may contain any of the following relations:
+ 
+-**allow_des3**
+-    Permit the KDC to issue tickets with des3-cbc-sha1 session keys.
+-    In future releases, this flag will allow des3-cbc-sha1 to be used
+-    at all.  The default value for this tag is false.  (Added in
+-    release 1.21.)
+-
+-**allow_rc4**
+-    Permit the KDC to issue tickets with arcfour-hmac session keys.
+-    In future releases, this flag will allow arcfour-hmac to be used
+-    at all.  The default value for this tag is false.  (Added in
+-    release 1.21.)
+-
+ **allow_weak_crypto**
+     If this flag is set to false, then weak encryption types (as noted
+     in :ref:`Encryption_types` in :ref:`kdc.conf(5)`) will be filtered
+diff --git a/doc/admin/enctypes.rst b/doc/admin/enctypes.rst
+index dce19ad43e..694922c0d9 100644
+--- a/doc/admin/enctypes.rst
++++ b/doc/admin/enctypes.rst
+@@ -48,15 +48,12 @@ Session key selection
+ The KDC chooses the session key enctype by taking the intersection of
+ its **permitted_enctypes** list, the list of long-term keys for the
+ most recent kvno of the service, and the client's requested list of
+-enctypes.  Starting in krb5-1.21, all services are assumed to support
+-aes256-cts-hmac-sha1-96; also, des3-cbc-sha1 and arcfour-hmac session
+-keys will not be issued by default.
++enctypes.
+ 
+ Starting in krb5-1.11, it is possible to set a string attribute on a
+ service principal to control what session key enctypes the KDC may
+-issue for service tickets for that principal, overriding the service's
+-long-term keys and the assumption of aes256-cts-hmac-sha1-96 support.
+-See :ref:`set_string` in :ref:`kadmin(1)` for details.
++issue for service tickets for that principal.  See :ref:`set_string`
++in :ref:`kadmin(1)` for details.
+ 
+ 
+ Choosing enctypes for a service
+@@ -90,20 +87,6 @@ affect how enctypes are chosen.
+     acceptable risk for your environment and the weak enctypes are
+     required for backward compatibility.
+ 
+-**allow_des3**
+-    was added in release 1.21 and defaults to *false*.  Unless this
+-    flag is set to *true*, the KDC will not issue tickets with
+-    des3-cbc-sha1 session keys.  In a future release, this flag will
+-    control whether des3-cbc-sha1 is permitted in similar fashion to
+-    weak enctypes.
+-
+-**allow_rc4**
+-    was added in release 1.21 and defaults to *false*.  Unless this
+-    flag is set to *true*, the KDC will not issue tickets with
+-    arcfour-hmac session keys.  In a future release, this flag will
+-    control whether arcfour-hmac is permitted in similar fashion to
+-    weak enctypes.
+-
+ **permitted_enctypes**
+     controls the set of enctypes that a service will permit for
+     session keys and for ticket and authenticator encryption.  The KDC
+diff --git a/src/include/k5-int.h b/src/include/k5-int.h
+index 2f7791b775..1d1c8293f4 100644
+--- a/src/include/k5-int.h
++++ b/src/include/k5-int.h
+@@ -180,8 +180,6 @@ typedef unsigned char   u_char;
+  * matches the variable name.  Keep these alphabetized. */
+ #define KRB5_CONF_ACL_FILE                     "acl_file"
+ #define KRB5_CONF_ADMIN_SERVER                 "admin_server"
+-#define KRB5_CONF_ALLOW_DES3                   "allow_des3"
+-#define KRB5_CONF_ALLOW_RC4                    "allow_rc4"
+ #define KRB5_CONF_ALLOW_WEAK_CRYPTO            "allow_weak_crypto"
+ #define KRB5_CONF_AUTH_TO_LOCAL                "auth_to_local"
+ #define KRB5_CONF_AUTH_TO_LOCAL_NAMES          "auth_to_local_names"
+@@ -1240,8 +1238,6 @@ struct _krb5_context {
+     struct _kdb_log_context *kdblog_context;
+ 
+     krb5_boolean allow_weak_crypto;
+-    krb5_boolean allow_des3;
+-    krb5_boolean allow_rc4;
+     krb5_boolean ignore_acceptor_hostname;
+     krb5_boolean enforce_ok_as_delegate;
+     enum dns_canonhost dns_canonicalize_hostname;
+diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
+index e54cc751f9..75e04b73db 100644
+--- a/src/kdc/kdc_util.c
++++ b/src/kdc/kdc_util.c
+@@ -1088,16 +1088,6 @@ select_session_keytype(krb5_context context, krb5_db_entry *server,
+         if (!krb5_is_permitted_enctype(context, ktype[i]))
+             continue;
+ 
+-        /*
+-         * Prevent these deprecated enctypes from being used as session keys
+-         * unless they are explicitly allowed.  In the future they will be more
+-         * comprehensively disabled and eventually removed.
+-         */
+-        if (ktype[i] == ENCTYPE_DES3_CBC_SHA1 && !context->allow_des3)
+-            continue;
+-        if (ktype[i] == ENCTYPE_ARCFOUR_HMAC && !context->allow_rc4)
+-            continue;
+-
+         if (dbentry_supports_enctype(context, server, ktype[i]))
+             return ktype[i];
+     }
+diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
+index ea089f0fcc..1b420a3ac2 100644
+--- a/src/lib/krb5/krb/get_in_tkt.c
++++ b/src/lib/krb5/krb/get_in_tkt.c
+@@ -1582,31 +1582,22 @@ warn_pw_expiry(krb5_context context, krb5_get_init_creds_opt *options,
+     (*prompter)(context, data, 0, banner, 0, 0);
+ }
+ 
+-/* Display a warning via the prompter if a deprecated enctype was used for
+- * either the reply key or the session key. */
++/* Display a warning via the prompter if des3-cbc-sha1 was used for either the
++ * reply key or the session key. */
+ static void
+-warn_deprecated(krb5_context context, krb5_init_creds_context ctx,
+-                krb5_enctype as_key_enctype)
++warn_des3(krb5_context context, krb5_init_creds_context ctx,
++          krb5_enctype as_key_enctype)
+ {
+-    krb5_enctype etype;
+-    char encbuf[128], banner[256];
++    const char *banner;
+ 
+-    if (ctx->prompter == NULL)
+-        return;
+-
+-    if (krb5int_c_deprecated_enctype(as_key_enctype))
+-        etype = as_key_enctype;
+-    else if (krb5int_c_deprecated_enctype(ctx->cred.keyblock.enctype))
+-        etype = ctx->cred.keyblock.enctype;
+-    else
++    if (as_key_enctype != ENCTYPE_DES3_CBC_SHA1 &&
++        ctx->cred.keyblock.enctype != ENCTYPE_DES3_CBC_SHA1)
+         return;
+-
+-    if (krb5_enctype_to_name(etype, FALSE, encbuf, sizeof(encbuf)) != 0)
++    if (ctx->prompter == NULL)
+         return;
+-    snprintf(banner, sizeof(banner),
+-             _("Warning: encryption type %s used for authentication is "
+-               "deprecated and will be disabled"), encbuf);
+ 
++    banner = _("Warning: encryption type des3-cbc-sha1 used for "
++               "authentication is weak and will be disabled");
+     /* PROMPTER_INVOCATION */
+     (*ctx->prompter)(context, ctx->prompter_data, NULL, banner, 0, NULL);
+ }
+@@ -1857,7 +1848,7 @@ init_creds_step_reply(krb5_context context,
+     ctx->complete = TRUE;
+     warn_pw_expiry(context, ctx->opt, ctx->prompter, ctx->prompter_data,
+                    ctx->in_tkt_service, ctx->reply);
+-    warn_deprecated(context, ctx, encrypting_key.enctype);
++    warn_des3(context, ctx, encrypting_key.enctype);
+ 
+ cleanup:
+     krb5_free_pa_data(context, kdc_padata);
+diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
+index a6c2bbeb54..87b486c53f 100644
+--- a/src/lib/krb5/krb/init_ctx.c
++++ b/src/lib/krb5/krb/init_ctx.c
+@@ -221,16 +221,6 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
+         goto cleanup;
+     ctx->allow_weak_crypto = tmp;
+ 
+-    retval = get_boolean(ctx, KRB5_CONF_ALLOW_DES3, 0, &tmp);
+-    if (retval)
+-        goto cleanup;
+-    ctx->allow_des3 = tmp;
+-
+-    retval = get_boolean(ctx, KRB5_CONF_ALLOW_RC4, 0, &tmp);
+-    if (retval)
+-        goto cleanup;
+-    ctx->allow_rc4 = tmp;
+-
+     retval = get_boolean(ctx, KRB5_CONF_IGNORE_ACCEPTOR_HOSTNAME, 0, &tmp);
+     if (retval)
+         goto cleanup;
+diff --git a/src/tests/gssapi/t_enctypes.py b/src/tests/gssapi/t_enctypes.py
+index f5f11842e2..7494d7fcdb 100755
+--- a/src/tests/gssapi/t_enctypes.py
++++ b/src/tests/gssapi/t_enctypes.py
+@@ -18,8 +18,7 @@ d_rc4 = 'DEPRECATED:arcfour-hmac'
+ # These tests make assumptions about the default enctype lists, so set
+ # them explicitly rather than relying on the library defaults.
+ supp='aes256-cts:normal aes128-cts:normal des3-cbc-sha1:normal rc4-hmac:normal'
+-conf = {'libdefaults': {'permitted_enctypes': 'aes des3 rc4',
+-                        'allow_des3': 'true', 'allow_rc4': 'true'},
++conf = {'libdefaults': {'permitted_enctypes': 'aes des3 rc4'},
+         'realms': {'$realm': {'supported_enctypes': supp}}}
+ realm = K5Realm(krb5_conf=conf)
+ shutil.copyfile(realm.ccache, os.path.join(realm.testdir, 'save'))
+diff --git a/src/tests/t_etype_info.py b/src/tests/t_etype_info.py
+index 38cf96ca8f..c982508d8b 100644
+--- a/src/tests/t_etype_info.py
++++ b/src/tests/t_etype_info.py
+@@ -1,7 +1,7 @@
+ from k5test import *
+ 
+ supported_enctypes = 'aes128-cts des3-cbc-sha1 rc4-hmac'
+-conf = {'libdefaults': {'allow_des3': 'true', 'allow_rc4': 'true'},
++conf = {'libdefaults': {'allow_weak_crypto': 'true'},
+         'realms': {'$realm': {'supported_enctypes': supported_enctypes}}}
+ realm = K5Realm(create_host=False, get_creds=False, krb5_conf=conf)
+ 
+diff --git a/src/tests/t_sesskeynego.py b/src/tests/t_sesskeynego.py
+index 5a213617b5..9024aee838 100755
+--- a/src/tests/t_sesskeynego.py
++++ b/src/tests/t_sesskeynego.py
+@@ -25,8 +25,6 @@ conf3 = {'libdefaults': {
+         'default_tkt_enctypes': 'aes128-cts',
+         'default_tgs_enctypes': 'rc4-hmac,aes128-cts'}}
+ conf4 = {'libdefaults': {'permitted_enctypes': 'aes256-cts'}}
+-conf5 = {'libdefaults': {'allow_rc4': 'true'}}
+-conf6 = {'libdefaults': {'allow_des3': 'true'}}
+ # Test with client request and session_enctypes preferring aes128, but
+ # aes256 long-term key.
+ realm = K5Realm(krb5_conf=conf1, create_host=False, get_creds=False)
+@@ -56,12 +54,10 @@ realm.run([kadminl, 'setstr', 'server', 'session_enctypes',
+            'aes128-cts,aes256-cts'])
+ test_kvno(realm, 'aes128-cts-hmac-sha1-96', 'aes256-cts-hmac-sha1-96')
+ 
+-# 3b: Skip RC4 (as the KDC does not allow it for session keys by
+-# default) and negotiate aes128-cts session key, with only an aes256
+-# long-term service key.
++# 3b: Negotiate rc4-hmac session key when principal only has aes256 long-term.
+ realm.run([kadminl, 'setstr', 'server', 'session_enctypes',
+            'rc4-hmac,aes128-cts,aes256-cts'])
+-test_kvno(realm, 'aes128-cts-hmac-sha1-96', 'aes256-cts-hmac-sha1-96')
++test_kvno(realm, 'DEPRECATED:arcfour-hmac', 'aes256-cts-hmac-sha1-96')
+ realm.stop()
+ 
+ # 4: Check that permitted_enctypes is a default for session key enctypes.
+@@ -71,24 +67,4 @@ realm.run([kvno, 'user'],
+           expected_trace=('etypes requested in TGS request: aes256-cts',))
+ realm.stop()
+ 
+-# 5: allow_rc4 permits negotiation of rc4-hmac session key.
+-realm = K5Realm(krb5_conf=conf5, create_host=False, get_creds=False)
+-realm.run([kadminl, 'addprinc', '-randkey', '-e', 'aes256-cts', 'server'])
+-realm.run([kadminl, 'setstr', 'server', 'session_enctypes', 'rc4-hmac'])
+-test_kvno(realm, 'DEPRECATED:arcfour-hmac', 'aes256-cts-hmac-sha1-96')
+-realm.stop()
+-
+-# 6: allow_des3 permits negotiation of des3-cbc-sha1 session key.
+-realm = K5Realm(krb5_conf=conf6, create_host=False, get_creds=False)
+-realm.run([kadminl, 'addprinc', '-randkey', '-e', 'aes256-cts', 'server'])
+-realm.run([kadminl, 'setstr', 'server', 'session_enctypes', 'des3-cbc-sha1'])
+-test_kvno(realm, 'DEPRECATED:des3-cbc-sha1', 'aes256-cts-hmac-sha1-96')
+-realm.stop()
+-
+-# 7: default config negotiates aes256-sha1 session key for RC4-only service.
+-realm = K5Realm(create_host=False, get_creds=False)
+-realm.run([kadminl, 'addprinc', '-randkey', '-e', 'rc4-hmac', 'server'])
+-test_kvno(realm, 'aes256-cts-hmac-sha1-96', 'DEPRECATED:arcfour-hmac')
+-realm.stop()
+-
+ success('sesskeynego')
+diff --git a/src/util/k5test.py b/src/util/k5test.py
+index 8e5f5ba8e9..2a86c5cdfc 100644
+--- a/src/util/k5test.py
++++ b/src/util/k5test.py
+@@ -1340,14 +1340,14 @@ _passes = [
+ 
+     # Exercise the DES3 enctype.
+     ('des3', None,
+-     {'libdefaults': {'permitted_enctypes': 'des3 aes256-sha1'}},
++     {'libdefaults': {'permitted_enctypes': 'des3'}},
+      {'realms': {'$realm': {
+                     'supported_enctypes': 'des3-cbc-sha1:normal',
+                     'master_key_type': 'des3-cbc-sha1'}}}),
+ 
+     # Exercise the arcfour enctype.
+     ('arcfour', None,
+-     {'libdefaults': {'permitted_enctypes': 'rc4 aes256-sha1'}},
++     {'libdefaults': {'permitted_enctypes': 'rc4'}},
+      {'realms': {'$realm': {
+                     'supported_enctypes': 'arcfour-hmac:normal',
+                     'master_key_type': 'arcfour-hmac'}}}),
+-- 
+2.45.1
+
diff --git a/downstream-ksu-pam-integration.patch b/0002-downstream-ksu-pam-integration.patch
similarity index 98%
rename from downstream-ksu-pam-integration.patch
rename to 0002-downstream-ksu-pam-integration.patch
index e81f2c1..9afd094 100644
--- a/downstream-ksu-pam-integration.patch
+++ b/0002-downstream-ksu-pam-integration.patch
@@ -1,4 +1,4 @@
-From 9feb7298b90d3e6a34821fce7315757c0bf81c9e Mon Sep 17 00:00:00 2001
+From de4205c45e310ceaaa7cd7958af7293322fa43a6 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:29:58 -0400
 Subject: [PATCH] [downstream] ksu pam integration
@@ -30,10 +30,10 @@ Last-updated: krb5-1.18-beta1
  create mode 100644 src/clients/ksu/pam.h
 
 diff --git a/src/aclocal.m4 b/src/aclocal.m4
-index 2394f7e33..830203683 100644
+index 3d66a876b3..ce3c5a9bac 100644
 --- a/src/aclocal.m4
 +++ b/src/aclocal.m4
-@@ -1675,3 +1675,72 @@ if test "$with_ldap" = yes; then
+@@ -1458,3 +1458,72 @@ if test "$with_ldap" = yes; then
    OPENLDAP_PLUGIN=yes
  fi
  ])dnl
@@ -107,7 +107,7 @@ index 2394f7e33..830203683 100644
 +])dnl
 +
 diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
-index 8b4edce4d..9d58f29b5 100644
+index 8b4edce4d8..9d58f29b5d 100644
 --- a/src/clients/ksu/Makefile.in
 +++ b/src/clients/ksu/Makefile.in
 @@ -3,12 +3,14 @@ BUILDTOP=$(REL)..$(S)..
@@ -145,11 +145,11 @@ index 8b4edce4d..9d58f29b5 100644
  clean:
  	$(RM) ksu
 diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
-index 57c349200..508242e0e 100644
+index af12861729..931f054041 100644
 --- a/src/clients/ksu/main.c
 +++ b/src/clients/ksu/main.c
 @@ -26,6 +26,7 @@
-  * KSU was writen by:  Ari Medvinsky, ari@isi.edu
+  * KSU was written by:  Ari Medvinsky, ari@isi.edu
   */
  
 +#include "autoconf.h"
@@ -303,7 +303,7 @@ index 57c349200..508242e0e 100644
      }
 diff --git a/src/clients/ksu/pam.c b/src/clients/ksu/pam.c
 new file mode 100644
-index 000000000..cbfe48704
+index 0000000000..cbfe487047
 --- /dev/null
 +++ b/src/clients/ksu/pam.c
 @@ -0,0 +1,389 @@
@@ -698,7 +698,7 @@ index 000000000..cbfe48704
 +#endif
 diff --git a/src/clients/ksu/pam.h b/src/clients/ksu/pam.h
 new file mode 100644
-index 000000000..0ab76569c
+index 0000000000..0ab76569cb
 --- /dev/null
 +++ b/src/clients/ksu/pam.h
 @@ -0,0 +1,57 @@
@@ -760,10 +760,10 @@ index 000000000..0ab76569c
 +void appl_pam_cleanup(void);
 +#endif
 diff --git a/src/configure.ac b/src/configure.ac
-index 234f4281c..d1f576124 100644
+index 77be7a2025..587221936e 100644
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -1390,6 +1390,8 @@ AC_SUBST([VERTO_VERSION])
+@@ -1399,6 +1399,8 @@ AC_SUBST([VERTO_VERSION])
  
  AC_PATH_PROG(GROFF, groff)
  
@@ -772,3 +772,6 @@ index 234f4281c..d1f576124 100644
  # Make localedir work in autoconf 2.5x.
  if test "${localedir+set}" != set; then
      localedir='$(datadir)/locale'
+-- 
+2.45.1
+
diff --git a/downstream-SELinux-integration.patch b/0003-downstream-SELinux-integration.patch
similarity index 93%
rename from downstream-SELinux-integration.patch
rename to 0003-downstream-SELinux-integration.patch
index e5322af..a3b32c3 100644
--- a/downstream-SELinux-integration.patch
+++ b/0003-downstream-SELinux-integration.patch
@@ -1,4 +1,4 @@
-From f8c70f6190a0573e2aca0b40964cf3b1a73ca8bb Mon Sep 17 00:00:00 2001
+From 30ff501e4b519396f5aea25e24919be817863e7c Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:30:53 -0400
 Subject: [PATCH] [downstream] SELinux integration
@@ -36,7 +36,9 @@ The selabel APIs for looking up the context should be thread-safe (per
 Red Hat #273081), so switching to using them instead of matchpathcon(),
 which we used earlier, is some improvement.
 
-Last-updated: krb5-1.18-beta1
+Last-updated: krb5-1.20.1
+[jrische@redhat.com: Replace deprecated security_context_t by char *:
+    - src/util/support/selinux.c]
 ---
  src/aclocal.m4                                |  48 +++
  src/build-tools/krb5-config.in                |   3 +-
@@ -61,16 +63,16 @@ Last-updated: krb5-1.18-beta1
  .../kdb/ldap/ldap_util/kdb5_ldap_services.c   |  11 +-
  src/util/profile/prof_file.c                  |   3 +-
  src/util/support/Makefile.in                  |   3 +-
- src/util/support/selinux.c                    | 406 ++++++++++++++++++
- 24 files changed, 573 insertions(+), 21 deletions(-)
+ src/util/support/selinux.c                    | 405 ++++++++++++++++++
+ 24 files changed, 572 insertions(+), 21 deletions(-)
  create mode 100644 src/include/k5-label.h
  create mode 100644 src/util/support/selinux.c
 
 diff --git a/src/aclocal.m4 b/src/aclocal.m4
-index 830203683..6796fec53 100644
+index ce3c5a9bac..3331970930 100644
 --- a/src/aclocal.m4
 +++ b/src/aclocal.m4
-@@ -89,6 +89,7 @@ AC_SUBST_FILE(libnodeps_frag)
+@@ -85,6 +85,7 @@ AC_SUBST_FILE(libnodeps_frag)
  dnl
  KRB5_AC_PRAGMA_WEAK_REF
  WITH_LDAP
@@ -78,7 +80,7 @@ index 830203683..6796fec53 100644
  KRB5_LIB_PARAMS
  KRB5_AC_INITFINI
  KRB5_AC_ENABLE_THREADS
-@@ -1743,4 +1744,51 @@ AC_SUBST(PAM_LIBS)
+@@ -1526,4 +1527,51 @@ AC_SUBST(PAM_LIBS)
  AC_SUBST(PAM_MAN)
  AC_SUBST(NON_PAM_MAN)
  ])dnl
@@ -131,10 +133,10 @@ index 830203683..6796fec53 100644
 +AC_SUBST(SELINUX_LIBS)
 +])dnl
 diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
-index f6184da3f..c17cb5eb5 100755
+index 8e6eb86601..7677f37359 100755
 --- a/src/build-tools/krb5-config.in
 +++ b/src/build-tools/krb5-config.in
-@@ -41,6 +41,7 @@ DL_LIB='@DL_LIB@'
+@@ -40,6 +40,7 @@ DL_LIB='@DL_LIB@'
  DEFCCNAME='@DEFCCNAME@'
  DEFKTNAME='@DEFKTNAME@'
  DEFCKTNAME='@DEFCKTNAME@'
@@ -142,7 +144,7 @@ index f6184da3f..c17cb5eb5 100755
  
  LIBS='@LIBS@'
  GEN_LIB=@GEN_LIB@
-@@ -255,7 +256,7 @@ if test -n "$do_libs"; then
+@@ -253,7 +254,7 @@ if test -n "$do_libs"; then
      fi
  
      # If we ever support a flag to generate output suitable for static
@@ -152,7 +154,7 @@ index f6184da3f..c17cb5eb5 100755
  
      echo $lib_flags
 diff --git a/src/config/pre.in b/src/config/pre.in
-index ce87e21ca..917357df9 100644
+index a0c60c70b3..7eaa2f351c 100644
 --- a/src/config/pre.in
 +++ b/src/config/pre.in
 @@ -177,6 +177,7 @@ LD = $(PURE) @LD@
@@ -163,7 +165,7 @@ index ce87e21ca..917357df9 100644
  
  INSTALL=@INSTALL@
  INSTALL_STRIP=
-@@ -402,7 +403,7 @@ SUPPORT_LIB			= -l$(SUPPORT_LIBNAME)
+@@ -379,7 +380,7 @@ SUPPORT_LIB			= -l$(SUPPORT_LIBNAME)
  # HESIOD_LIBS is -lhesiod...
  HESIOD_LIBS	= @HESIOD_LIBS@
  
@@ -173,10 +175,10 @@ index ce87e21ca..917357df9 100644
  GSS_LIBS	= $(GSS_KRB5_LIB)
  # needs fixing if ever used on macOS!
 diff --git a/src/configure.ac b/src/configure.ac
-index d1f576124..440a22bd9 100644
+index 587221936e..69be9030f8 100644
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -1392,6 +1392,8 @@ AC_PATH_PROG(GROFF, groff)
+@@ -1401,6 +1401,8 @@ AC_PATH_PROG(GROFF, groff)
  
  KRB5_WITH_PAM
  
@@ -186,7 +188,7 @@ index d1f576124..440a22bd9 100644
  if test "${localedir+set}" != set; then
      localedir='$(datadir)/locale'
 diff --git a/src/include/k5-int.h b/src/include/k5-int.h
-index 9616b24bf..0d9af3d95 100644
+index 1d1c8293f4..768110e5ef 100644
 --- a/src/include/k5-int.h
 +++ b/src/include/k5-int.h
 @@ -128,6 +128,7 @@ typedef unsigned char   u_char;
@@ -199,7 +201,7 @@ index 9616b24bf..0d9af3d95 100644
  #define KRB5_KDB_MAX_RLIFE      (60*60*24*7) /* one week */
 diff --git a/src/include/k5-label.h b/src/include/k5-label.h
 new file mode 100644
-index 000000000..dfaaa847c
+index 0000000000..dfaaa847cb
 --- /dev/null
 +++ b/src/include/k5-label.h
 @@ -0,0 +1,32 @@
@@ -236,10 +238,10 @@ index 000000000..dfaaa847c
 +#endif
 +#endif
 diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
-index 79761f6d2..e9435c693 100644
+index 4e09ed345d..09f800be52 100644
 --- a/src/include/krb5/krb5.hin
 +++ b/src/include/krb5/krb5.hin
-@@ -87,6 +87,12 @@
+@@ -83,6 +83,12 @@
  #define THREEPARAMOPEN(x,y,z) open(x,y,z)
  #endif
  
@@ -253,7 +255,7 @@ index 79761f6d2..e9435c693 100644
  
  #include <stdlib.h>
 diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
-index 301e3476d..19f2cc230 100644
+index a89b5144f6..4d6cc0bdf9 100644
 --- a/src/kadmin/dbutil/dump.c
 +++ b/src/kadmin/dbutil/dump.c
 @@ -148,12 +148,21 @@ create_ofile(char *ofile, char **tmpname)
@@ -288,10 +290,10 @@ index 301e3476d..19f2cc230 100644
          com_err(progname, errno, _("while creating 'ok' file, '%s'"), file_ok);
          goto cleanup;
 diff --git a/src/kdc/main.c b/src/kdc/main.c
-index fdcd694d7..1ede4bf2f 100644
+index bfdfef5c48..b43fe9a082 100644
 --- a/src/kdc/main.c
 +++ b/src/kdc/main.c
-@@ -872,7 +872,7 @@ write_pid_file(const char *path)
+@@ -844,7 +844,7 @@ write_pid_file(const char *path)
      FILE *file;
      unsigned long pid;
  
@@ -301,10 +303,10 @@ index fdcd694d7..1ede4bf2f 100644
          return errno;
      pid = (unsigned long) getpid();
 diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c
-index 5622d56e1..356e3e0e6 100644
+index aa3c81ea30..cb9785aaeb 100644
 --- a/src/kprop/kpropd.c
 +++ b/src/kprop/kpropd.c
-@@ -487,6 +487,9 @@ doit(int fd)
+@@ -488,6 +488,9 @@ doit(int fd)
      krb5_enctype etype;
      int database_fd;
      char host[INET6_ADDRSTRLEN + 1];
@@ -314,7 +316,7 @@ index 5622d56e1..356e3e0e6 100644
  
      signal_wrapper(SIGALRM, alarm_handler);
      alarm(params.iprop_resync_timeout);
-@@ -542,9 +545,15 @@ doit(int fd)
+@@ -543,9 +546,15 @@ doit(int fd)
          free(name);
          exit(1);
      }
@@ -331,10 +333,10 @@ index 5622d56e1..356e3e0e6 100644
                              KRB5_LOCKMODE_EXCLUSIVE | KRB5_LOCKMODE_DONTBLOCK);
      if (retval) {
 diff --git a/src/lib/kadm5/logger.c b/src/lib/kadm5/logger.c
-index c6885edf2..9aec3c05e 100644
+index e14da53790..b879a4049b 100644
 --- a/src/lib/kadm5/logger.c
 +++ b/src/lib/kadm5/logger.c
-@@ -309,7 +309,7 @@ krb5_klog_init(krb5_context kcontext, char *ename, char *whoami, krb5_boolean do
+@@ -310,7 +310,7 @@ krb5_klog_init(krb5_context kcontext, char *ename, char *whoami, krb5_boolean do
                       */
                      append = (cp[4] == ':') ? O_APPEND : 0;
                      if (append || cp[4] == '=') {
@@ -343,7 +345,7 @@ index c6885edf2..9aec3c05e 100644
                                    S_IRUSR | S_IWUSR | S_IRGRP);
                          if (fd != -1)
                              f = fdopen(fd, append ? "a" : "w");
-@@ -776,7 +776,7 @@ krb5_klog_reopen(krb5_context kcontext)
+@@ -777,7 +777,7 @@ krb5_klog_reopen(krb5_context kcontext)
               * In case the old logfile did not get moved out of the
               * way, open for append to prevent squashing the old logs.
               */
@@ -353,7 +355,7 @@ index c6885edf2..9aec3c05e 100644
                  set_cloexec_file(f);
                  log_control.log_entries[lindex].lfu_filep = f;
 diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c
-index 2659a2501..e9b95fce5 100644
+index 2659a25018..e9b95fce59 100644
 --- a/src/lib/kdb/kdb_log.c
 +++ b/src/lib/kdb/kdb_log.c
 @@ -480,7 +480,7 @@ ulog_map(krb5_context context, const char *logname, uint32_t ulogentries)
@@ -366,7 +368,7 @@ index 2659a2501..e9b95fce5 100644
              retval = errno;
              goto cleanup;
 diff --git a/src/lib/krb5/ccache/cc_dir.c b/src/lib/krb5/ccache/cc_dir.c
-index 7b100a0ec..5683a0433 100644
+index 1da40b51d0..f3ab7340a6 100644
 --- a/src/lib/krb5/ccache/cc_dir.c
 +++ b/src/lib/krb5/ccache/cc_dir.c
 @@ -183,10 +183,19 @@ write_primary_file(const char *primary_path, const char *contents)
@@ -416,7 +418,7 @@ index 7b100a0ec..5683a0433 100644
                    _("Credential cache directory %s does not exist"),
                    dirname);
 diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
-index 021c94398..aaf573439 100644
+index e510211fc5..f3ea28c8ec 100644
 --- a/src/lib/krb5/keytab/kt_file.c
 +++ b/src/lib/krb5/keytab/kt_file.c
 @@ -735,14 +735,14 @@ krb5_ktfileint_open(krb5_context context, krb5_keytab id, int mode)
@@ -437,10 +439,10 @@ index 021c94398..aaf573439 100644
                  goto report_errno;
              writevno = 1;
 diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c
-index 7073459f0..e9b99f4ca 100644
+index 4cbbbb270a..c4058ddc96 100644
 --- a/src/lib/krb5/os/trace.c
 +++ b/src/lib/krb5/os/trace.c
-@@ -458,7 +458,7 @@ krb5_set_trace_filename(krb5_context context, const char *filename)
+@@ -460,7 +460,7 @@ krb5_set_trace_filename(krb5_context context, const char *filename)
      fd = malloc(sizeof(*fd));
      if (fd == NULL)
          return ENOMEM;
@@ -450,7 +452,7 @@ index 7073459f0..e9b99f4ca 100644
          free(fd);
          return errno;
 diff --git a/src/plugins/kdb/db2/adb_openclose.c b/src/plugins/kdb/db2/adb_openclose.c
-index 7db30a33b..2b9d01921 100644
+index 9a506e9d44..f92ab47143 100644
 --- a/src/plugins/kdb/db2/adb_openclose.c
 +++ b/src/plugins/kdb/db2/adb_openclose.c
 @@ -152,7 +152,7 @@ osa_adb_init_db(osa_adb_db_t *dbp, char *filename, char *lockfilename,
@@ -463,7 +465,7 @@ index 7db30a33b..2b9d01921 100644
               * maybe someone took away write permission so we could only
               * get shared locks?
 diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c
-index 5106a5c99..e481e8121 100644
+index 2c163d91cc..9a344a603e 100644
 --- a/src/plugins/kdb/db2/kdb_db2.c
 +++ b/src/plugins/kdb/db2/kdb_db2.c
 @@ -694,8 +694,8 @@ ctx_create_db(krb5_context context, krb5_db2_context *dbc)
@@ -478,7 +480,7 @@ index 5106a5c99..e481e8121 100644
          retval = errno;
          goto cleanup;
 diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
-index 2977b17f3..d5809a5a9 100644
+index 2977b17f3a..d5809a5a93 100644
 --- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c
 +++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
 @@ -60,6 +60,7 @@ static char sccsid[] = "@(#)bt_open.c	8.11 (Berkeley) 11/2/95";
@@ -499,7 +501,7 @@ index 2977b17f3..d5809a5a9 100644
  
  	} else {
 diff --git a/src/plugins/kdb/db2/libdb2/hash/hash.c b/src/plugins/kdb/db2/libdb2/hash/hash.c
-index 862dbb164..686a960c9 100644
+index 862dbb1640..686a960c96 100644
 --- a/src/plugins/kdb/db2/libdb2/hash/hash.c
 +++ b/src/plugins/kdb/db2/libdb2/hash/hash.c
 @@ -51,6 +51,7 @@ static char sccsid[] = "@(#)hash.c	8.12 (Berkeley) 11/7/95";
@@ -520,7 +522,7 @@ index 862dbb164..686a960c9 100644
  		(void)fcntl(hashp->fp, F_SETFD, 1);
  	}
 diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_open.c b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
-index d8b26e701..b0daa7c02 100644
+index d8b26e7011..b0daa7c021 100644
 --- a/src/plugins/kdb/db2/libdb2/recno/rec_open.c
 +++ b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
 @@ -51,6 +51,7 @@ static char sccsid[] = "@(#)rec_open.c	8.12 (Berkeley) 11/18/94";
@@ -542,7 +544,7 @@ index d8b26e701..b0daa7c02 100644
  
  	if (fname != NULL && fcntl(rfd, F_SETFD, 1) == -1) {
 diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
-index b92cb58c7..0a95101ad 100644
+index e87688d666..30f7c00ab5 100644
 --- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
 +++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
 @@ -190,7 +190,7 @@ kdb5_ldap_stash_service_password(int argc, char **argv)
@@ -579,7 +581,7 @@ index b92cb58c7..0a95101ad 100644
          if (newfile == NULL) {
              com_err(me, errno, _("Error creating file %s"), tmp_file);
 diff --git a/src/util/profile/prof_file.c b/src/util/profile/prof_file.c
-index aa951df05..79f9500f6 100644
+index aa951df05f..79f9500f69 100644
 --- a/src/util/profile/prof_file.c
 +++ b/src/util/profile/prof_file.c
 @@ -33,6 +33,7 @@
@@ -600,7 +602,7 @@ index aa951df05..79f9500f6 100644
          retval = errno;
          if (retval == 0)
 diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
-index 86d5a950a..1052d53a1 100644
+index 86d5a950a6..1052d53a1e 100644
 --- a/src/util/support/Makefile.in
 +++ b/src/util/support/Makefile.in
 @@ -74,6 +74,7 @@ IPC_SYMS= \
@@ -622,10 +624,10 @@ index 86d5a950a..1052d53a1 100644
  
 diff --git a/src/util/support/selinux.c b/src/util/support/selinux.c
 new file mode 100644
-index 000000000..6d41f3244
+index 0000000000..807d039da3
 --- /dev/null
 +++ b/src/util/support/selinux.c
-@@ -0,0 +1,406 @@
+@@ -0,0 +1,405 @@
 +/*
 + * Copyright 2007,2008,2009,2011,2012,2013,2016 Red Hat, Inc.  All Rights Reserved.
 + *
@@ -724,17 +726,16 @@ index 000000000..6d41f3244
 +    }
 +}
 +
-+static security_context_t
++static char *
 +push_fscreatecon(const char *pathname, mode_t mode)
 +{
-+    security_context_t previous, configuredsc, currentsc, derivedsc;
++    char *previous, *configuredsc, *currentsc, *genpath;
++    const char *derivedsc, *fullpath, *currentuser;
 +    context_t current, derived;
-+    const char *fullpath, *currentuser;
-+    char *genpath;
 +
-+    previous = configuredsc = currentsc = derivedsc = NULL;
++    previous = configuredsc = currentsc = genpath = NULL;
++    derivedsc = NULL;
 +    current = derived = NULL;
-+    genpath = NULL;
 +
 +    fullpath = pathname;
 +
@@ -862,7 +863,7 @@ index 000000000..6d41f3244
 +}
 +
 +static void
-+pop_fscreatecon(security_context_t previous)
++pop_fscreatecon(char *previous)
 +{
 +    if (!is_selinux_enabled()) {
 +        return;
@@ -916,7 +917,7 @@ index 000000000..6d41f3244
 +{
 +    FILE *fp;
 +    int errno_save;
-+    security_context_t ctx;
++    char *ctx;
 +
 +    if ((strcmp(mode, "r") == 0) ||
 +        (strcmp(mode, "rb") == 0)) {
@@ -942,7 +943,7 @@ index 000000000..6d41f3244
 +{
 +    int fd;
 +    int errno_save;
-+    security_context_t ctx;
++    char *ctx;
 +
 +    k5_once(&labeled_once, label_mutex_init);
 +    k5_mutex_lock(&labeled_mutex);
@@ -963,7 +964,7 @@ index 000000000..6d41f3244
 +{
 +    int ret;
 +    int errno_save;
-+    security_context_t ctx;
++    char *ctx;
 +
 +    k5_once(&labeled_once, label_mutex_init);
 +    k5_mutex_lock(&labeled_mutex);
@@ -984,7 +985,7 @@ index 000000000..6d41f3244
 +{
 +    int ret;
 +    int errno_save;
-+    security_context_t ctx;
++    char *ctx;
 +
 +    k5_once(&labeled_once, label_mutex_init);
 +    k5_mutex_lock(&labeled_mutex);
@@ -1005,7 +1006,7 @@ index 000000000..6d41f3244
 +{
 +    int fd;
 +    int errno_save;
-+    security_context_t ctx;
++    char *ctx;
 +    mode_t mode;
 +    va_list ap;
 +
@@ -1032,3 +1033,6 @@ index 000000000..6d41f3244
 +}
 +
 +#endif /* USE_SELINUX */
+-- 
+2.45.1
+
diff --git a/downstream-fix-debuginfo-with-y.tab.c.patch b/0004-downstream-fix-debuginfo-with-y.tab.c.patch
similarity index 90%
rename from downstream-fix-debuginfo-with-y.tab.c.patch
rename to 0004-downstream-fix-debuginfo-with-y.tab.c.patch
index 33f61c5..c21b269 100644
--- a/downstream-fix-debuginfo-with-y.tab.c.patch
+++ b/0004-downstream-fix-debuginfo-with-y.tab.c.patch
@@ -1,4 +1,4 @@
-From c6e103db0eb02c31a13b8cbcbae296c473074991 Mon Sep 17 00:00:00 2001
+From 393830d96000ed692aa9a99ef87187d6f2863931 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:49:25 -0400
 Subject: [PATCH] [downstream] fix debuginfo with y.tab.c
@@ -14,7 +14,7 @@ Last-updated: krb5-1.9
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
-index adfea6e2b..d1327e400 100644
+index adfea6e2b5..d1327e400b 100644
 --- a/src/kadmin/cli/Makefile.in
 +++ b/src/kadmin/cli/Makefile.in
 @@ -37,3 +37,8 @@ clean-unix::
@@ -27,7 +27,7 @@ index adfea6e2b..d1327e400 100644
 +	$(YACC.y) $< 
 +	$(CP) y.tab.c $@
 diff --git a/src/plugins/kdb/ldap/ldap_util/Makefile.in b/src/plugins/kdb/ldap/ldap_util/Makefile.in
-index 8669c2436..a22f23c02 100644
+index 8669c2436c..a22f23c02c 100644
 --- a/src/plugins/kdb/ldap/ldap_util/Makefile.in
 +++ b/src/plugins/kdb/ldap/ldap_util/Makefile.in
 @@ -20,7 +20,7 @@ $(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIB) $(GETDATE)
@@ -39,3 +39,6 @@ index 8669c2436..a22f23c02 100644
  
  install:
  	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
+-- 
+2.45.1
+
diff --git a/downstream-Remove-3des-support.patch b/0005-downstream-Remove-3des-support.patch
similarity index 89%
rename from downstream-Remove-3des-support.patch
rename to 0005-downstream-Remove-3des-support.patch
index 570762d..fcdb136 100644
--- a/downstream-Remove-3des-support.patch
+++ b/0005-downstream-Remove-3des-support.patch
@@ -1,4 +1,4 @@
-From c920b585b8400ef44684c673c54264657195f3ce Mon Sep 17 00:00:00 2001
+From 7d697742abb370cfc7241c1faa78ba08d7650f6a Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 26 Mar 2019 18:51:10 -0400
 Subject: [PATCH] [downstream] Remove 3des support
@@ -8,45 +8,54 @@ des3-hmac-sha1, des3-cbc-sha1-kd).  Update all tests and documentation
 to user other enctypes.  Mark the 3DES enctypes UNSUPPORTED and retain
 their constants.
 
-Last-updated: 1.18-beta2
+Last-updated: 1.21.1-final
+[antorres@redhat.com: remove diffs for:
+     - src/kdamin/testing/proto/kdc.conf.proto
+     - src/lib/kadm5/unit-test/api.current/chpass-principal-v2.exp
+     - src/lib/kadm5/unit-test/api.current/get-principal-v2.exp
+     - src/lib/kadm5/unit-test/api.current/randkey-principal-v2.exp
+ since they were removed by Remove-TCL-based-libkadm5-API-tests.patch]
+[jrische@redhat.com: restore supportedCMSTypes (not using 3DES any more):
+    - src/plugins/preauth/pkinit/pkinit_crypto.h
+    - src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+    - src/plugins/preauth/pkinit/pkinit_clnt.c]
 ---
  doc/admin/advanced/retiring-des.rst           |  11 +
  doc/admin/conf_files/kdc_conf.rst             |   7 +-
- doc/admin/enctypes.rst                        |  13 +-
+ doc/admin/enctypes.rst                        |  10 +-
  doc/admin/troubleshoot.rst                    |   9 +-
  doc/appdev/refs/macros/index.rst              |   1 -
  doc/conf.py                                   |   2 +-
  doc/mitK5features.rst                         |   2 +-
  src/Makefile.in                               |   4 +-
- src/configure.ac                              |   1 -
+ src/configure.ac                              |   4 +-
  src/include/krb5/krb5.hin                     |  10 +-
- src/kadmin/testing/proto/kdc.conf.proto       |   4 +-
  src/kdc/kdc_util.c                            |   4 -
  src/lib/crypto/Makefile.in                    |   8 +-
- src/lib/crypto/builtin/Makefile.in            |   6 +-
+ src/lib/crypto/builtin/Makefile.in            |   4 +-
  src/lib/crypto/builtin/des/ISSUES             |  13 -
- src/lib/crypto/builtin/des/Makefile.in        |  80 ----
- src/lib/crypto/builtin/des/d3_aead.c          | 133 ------
- src/lib/crypto/builtin/des/d3_kysched.c       |  51 ---
- src/lib/crypto/builtin/des/deps               | 148 -------
+ src/lib/crypto/builtin/des/Makefile.in        |  82 ----
+ src/lib/crypto/builtin/des/d3_aead.c          | 137 ------
+ src/lib/crypto/builtin/des/d3_kysched.c       |  55 ---
+ src/lib/crypto/builtin/des/deps               | 146 -------
  src/lib/crypto/builtin/des/des_int.h          | 285 -------------
- src/lib/crypto/builtin/des/des_keys.c         |  40 --
+ src/lib/crypto/builtin/des/des_keys.c         |  38 --
  src/lib/crypto/builtin/des/destest.c          | 240 -----------
  src/lib/crypto/builtin/des/doc/libdes.doc     | 208 ---------
- src/lib/crypto/builtin/des/f_aead.c           | 173 --------
+ src/lib/crypto/builtin/des/f_aead.c           | 177 --------
  src/lib/crypto/builtin/des/f_cbc.c            | 256 ------------
- src/lib/crypto/builtin/des/f_cksum.c          | 136 ------
- src/lib/crypto/builtin/des/f_parity.c         |  56 ---
- src/lib/crypto/builtin/des/f_sched.c          | 359 ----------------
- src/lib/crypto/builtin/des/f_tables.c         | 370 ----------------
+ src/lib/crypto/builtin/des/f_cksum.c          | 141 -------
+ src/lib/crypto/builtin/des/f_parity.c         |  64 ---
+ src/lib/crypto/builtin/des/f_sched.c          | 363 ----------------
+ src/lib/crypto/builtin/des/f_tables.c         | 375 -----------------
  src/lib/crypto/builtin/des/f_tables.h         | 285 -------------
- src/lib/crypto/builtin/des/key_sched.c        |  62 ---
+ src/lib/crypto/builtin/des/key_sched.c        |  66 ---
  src/lib/crypto/builtin/des/keytest.data       | 171 --------
  src/lib/crypto/builtin/des/t_verify.c         | 395 ------------------
- src/lib/crypto/builtin/des/weak_key.c         |  86 ----
- .../crypto/builtin/enc_provider/Makefile.in   |   6 +-
- src/lib/crypto/builtin/enc_provider/deps      |  12 -
- src/lib/crypto/builtin/enc_provider/des3.c    | 105 -----
+ src/lib/crypto/builtin/des/weak_key.c         |  90 ----
+ .../crypto/builtin/enc_provider/Makefile.in   |   5 +-
+ src/lib/crypto/builtin/enc_provider/deps      |  11 -
+ src/lib/crypto/builtin/enc_provider/des3.c    | 109 -----
  src/lib/crypto/crypto_tests/t_cf2.expected    |   1 -
  src/lib/crypto/crypto_tests/t_cf2.in          |   5 -
  src/lib/crypto/crypto_tests/t_cksums.c        |  10 -
@@ -55,58 +64,52 @@ Last-updated: 1.18-beta2
  src/lib/crypto/crypto_tests/t_encrypt.c       |   1 -
  src/lib/crypto/crypto_tests/t_short.c         |   1 -
  src/lib/crypto/crypto_tests/t_str2key.c       |  52 ---
+ src/lib/crypto/crypto_tests/vectors.c         |   4 -
  src/lib/crypto/krb/Makefile.in                |   3 -
  src/lib/crypto/krb/cksumtypes.c               |   6 -
- src/lib/crypto/krb/crypto_int.h               |  16 -
+ src/lib/crypto/krb/crypto_int.h               |  11 -
  src/lib/crypto/krb/default_state.c            |  10 -
  src/lib/crypto/krb/enctype_util.c             |   3 +
  src/lib/crypto/krb/etypes.c                   |  21 -
  src/lib/crypto/krb/prf_des.c                  |  47 ---
- src/lib/crypto/krb/random_to_key.c            |  45 --
+ src/lib/crypto/krb/random_to_key.c            |  28 --
  src/lib/crypto/libk5crypto.exports            |   1 -
- src/lib/crypto/openssl/Makefile.in            |   8 +-
+ src/lib/crypto/openssl/Makefile.in            |   4 +-
  src/lib/crypto/openssl/des/Makefile.in        |  20 -
- src/lib/crypto/openssl/des/deps               |  15 -
- src/lib/crypto/openssl/des/des_keys.c         |  40 --
+ src/lib/crypto/openssl/des/deps               |  14 -
+ src/lib/crypto/openssl/des/des_keys.c         |  39 --
  .../crypto/openssl/enc_provider/Makefile.in   |   3 -
  src/lib/crypto/openssl/enc_provider/deps      |  11 -
- src/lib/crypto/openssl/enc_provider/des3.c    | 184 --------
+ src/lib/crypto/openssl/enc_provider/des3.c    | 188 ---------
+ src/lib/crypto/openssl/kdf.c                  |   2 -
  src/lib/gssapi/krb5/accept_sec_context.c      |   1 -
  src/lib/gssapi/krb5/gssapiP_krb5.h            |   6 +-
  src/lib/gssapi/krb5/k5seal.c                  |  35 +-
  src/lib/gssapi/krb5/k5sealiov.c               |  27 +-
- src/lib/gssapi/krb5/k5unseal.c                | 102 ++---
+ src/lib/gssapi/krb5/k5unseal.c                |  88 ++--
  src/lib/gssapi/krb5/k5unsealiov.c             |  38 +-
  src/lib/gssapi/krb5/util_crypt.c              |  11 -
- .../api.current/chpass-principal-v2.exp       |   4 +-
- .../api.current/get-principal-v2.exp          |   4 +-
- .../api.current/randkey-principal-v2.exp      |   4 +-
  src/lib/krb5/krb/init_ctx.c                   |   3 -
  src/lib/krb5/krb/s4u_creds.c                  |   2 -
- src/lib/krb5/krb/t_copy_context.c             |   2 +-
  src/lib/krb5/krb/t_etypes.c                   |  48 +--
  src/lib/krb5/os/t_trace.c                     |   4 +-
  src/lib/krb5/os/t_trace.ref                   |   2 +-
  src/plugins/preauth/pkinit/pkcs11.h           |   6 +-
- src/plugins/preauth/pkinit/pkinit_clnt.c      |   8 -
- src/plugins/preauth/pkinit/pkinit_crypto.h    |  12 -
- .../preauth/pkinit/pkinit_crypto_openssl.c    |  38 --
- src/plugins/preauth/pkinit/pkinit_kdf_test.c  |  31 --
+ src/plugins/preauth/pkinit/pkinit_crypto.h    |  10 +-
+ src/plugins/preauth/pkinit/pkinit_kdf_test.c  |  30 --
  src/plugins/preauth/spake/t_vectors.c         |  25 --
- src/tests/dejagnu/config/default.exp          |  78 ----
- src/tests/dejagnu/krb-standalone/kprop.exp    |   2 +-
  src/tests/gssapi/t_enctypes.py                |  33 +-
  src/tests/gssapi/t_invalid.c                  |  12 -
  src/tests/gssapi/t_pcontok.c                  |  16 +-
  src/tests/gssapi/t_prf.c                      |   7 -
  src/tests/t_authdata.py                       |   2 +-
- src/tests/t_etype_info.py                     |  18 +-
+ src/tests/t_etype_info.py                     |  21 +-
  src/tests/t_keyrollover.py                    |   8 +-
  src/tests/t_mkey.py                           |  35 --
  src/tests/t_salt.py                           |   5 +-
  src/util/k5test.py                            |   7 -
  .../leash/htmlhelp/html/Encryption_Types.htm  |  13 -
- 96 files changed, 163 insertions(+), 4834 deletions(-)
+ 89 files changed, 149 insertions(+), 4712 deletions(-)
  delete mode 100644 src/lib/crypto/builtin/des/ISSUES
  delete mode 100644 src/lib/crypto/builtin/des/Makefile.in
  delete mode 100644 src/lib/crypto/builtin/des/d3_aead.c
@@ -135,7 +138,7 @@ Last-updated: 1.18-beta2
  delete mode 100644 src/lib/crypto/openssl/enc_provider/des3.c
 
 diff --git a/doc/admin/advanced/retiring-des.rst b/doc/admin/advanced/retiring-des.rst
-index 4a964c15c..cb6258d77 100644
+index 38f76d3f45..d5e3c30c04 100644
 --- a/doc/admin/advanced/retiring-des.rst
 +++ b/doc/admin/advanced/retiring-des.rst
 @@ -10,6 +10,13 @@ ability have rendered DES vulnerable to brute force attacks on its 56-bit
@@ -164,19 +167,19 @@ index 4a964c15c..cb6258d77 100644
  -------------
  
 diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst
-index 9759756a2..cf8a12547 100644
+index 74a0a2acef..846c58ed82 100644
 --- a/doc/admin/conf_files/kdc_conf.rst
 +++ b/doc/admin/conf_files/kdc_conf.rst
-@@ -843,8 +843,6 @@ Encryption types marked as "weak" are available for compatibility but
- not recommended for use.
+@@ -854,8 +854,6 @@ Encryption types marked as "weak" and "deprecated" are available for
+ compatibility but not recommended for use.
  
  ==================================================== =========================================================
 -des3-cbc-raw                                         Triple DES cbc mode raw (weak)
--des3-cbc-sha1 des3-hmac-sha1 des3-cbc-sha1-kd        Triple DES cbc mode with HMAC/sha1
+-des3-cbc-sha1 des3-hmac-sha1 des3-cbc-sha1-kd        Triple DES cbc mode with HMAC/sha1 (deprecated)
  aes256-cts-hmac-sha1-96 aes256-cts aes256-sha1       AES-256 CTS mode with 96-bit SHA-1 HMAC
  aes128-cts-hmac-sha1-96 aes128-cts aes128-sha1       AES-128 CTS mode with 96-bit SHA-1 HMAC
  aes256-cts-hmac-sha384-192 aes256-sha2               AES-256 CTS mode with 192-bit SHA-384 HMAC
-@@ -853,7 +851,6 @@ arcfour-hmac rc4-hmac arcfour-hmac-md5               RC4 with HMAC/MD5
+@@ -864,7 +862,6 @@ arcfour-hmac rc4-hmac arcfour-hmac-md5               RC4 with HMAC/MD5 (deprecat
  arcfour-hmac-exp rc4-hmac-exp arcfour-hmac-md5-exp   Exportable RC4 with HMAC/MD5 (weak)
  camellia256-cts-cmac camellia256-cts                 Camellia-256 CTS mode with CMAC
  camellia128-cts-cmac camellia128-cts                 Camellia-128 CTS mode with CMAC
@@ -184,7 +187,7 @@ index 9759756a2..cf8a12547 100644
  aes                                                  The AES family: aes256-cts-hmac-sha1-96, aes128-cts-hmac-sha1-96, aes256-cts-hmac-sha384-192, and aes128-cts-hmac-sha256-128
  rc4                                                  The RC4 family: arcfour-hmac
  camellia                                             The Camellia family: camellia256-cts-cmac and camellia128-cts-cmac
-@@ -865,8 +862,8 @@ from the current list by prefixing them with a minus sign ("-").
+@@ -876,8 +873,8 @@ from the current list by prefixing them with a minus sign ("-").
  Types or families can be prefixed with a plus sign ("+") for symmetry;
  it has the same meaning as just listing the type or family.  For
  example, "``DEFAULT -rc4``" would be the default set of encryption
@@ -196,35 +199,35 @@ index 9759756a2..cf8a12547 100644
  
  While **aes128-cts** and **aes256-cts** are supported for all Kerberos
 diff --git a/doc/admin/enctypes.rst b/doc/admin/enctypes.rst
-index caf6d9267..65b55cdb9 100644
+index 694922c0d9..c4d5499d3b 100644
 --- a/doc/admin/enctypes.rst
 +++ b/doc/admin/enctypes.rst
-@@ -129,7 +129,7 @@ enctype                    weak? krb5     Windows
- des-cbc-crc                weak  <1.18    >=2000
- des-cbc-md4                weak  <1.18    ?
- des-cbc-md5                weak  <1.18    >=2000
--des3-cbc-sha1                    >=1.1    none
-+des3-cbc-sha1                    <1.18    none
- arcfour-hmac                     >=1.3    >=2000
- arcfour-hmac-exp           weak  >=1.3    >=2000
- aes128-cts-hmac-sha1-96          >=1.3    >=Vista
-@@ -140,7 +140,10 @@ camellia128-cts-cmac             >=1.9    none
- camellia256-cts-cmac             >=1.9    none
- ========================== ===== ======== =======
- 
--krb5 releases 1.18 and later do not support single-DES.  krb5 releases
--1.8 and later disable the single-DES enctypes by default.  Microsoft
--Windows releases Windows 7 and later disable single-DES enctypes by
--default.
-+krb5 releases 1.8 and later disable the single-DES enctypes by
-+default.  Microsoft Windows releases Windows 7 and later disable
-+single-DES enctypes by default.
+@@ -129,7 +129,7 @@ enctype                    weak?      krb5     Windows
+ des-cbc-crc                weak       <1.18    >=2000
+ des-cbc-md4                weak       <1.18    ?
+ des-cbc-md5                weak       <1.18    >=2000
+-des3-cbc-sha1              deprecated >=1.1    none
++des3-cbc-sha1              deprecated <1.18    none
+ arcfour-hmac               deprecated >=1.3    >=2000
+ arcfour-hmac-exp           weak       >=1.3    >=2000
+ aes128-cts-hmac-sha1-96               >=1.3    >=Vista
+@@ -148,9 +148,11 @@ default.
+ krb5 releases 1.17 and later flag deprecated encryption types
+ (including ``des3-cbc-sha1`` and ``arcfour-hmac``) in KDC logs and
+ kadmin output.  krb5 release 1.19 issues a warning during initial
+-authentication if ``des3-cbc-sha1`` is used.  Future releases will
+-disable ``des3-cbc-sha1`` by default and eventually remove support for
+-it.
++authentication if ``des3-cbc-sha1`` is used.
 +
 +krb5 releases 1.18 and later remove single-DES and 3DES
 +(downstream-only patch) enctype support.  Microsoft Windows never
 +supported 3DES.
+ 
+ 
+ Migrating away from older encryption types
 diff --git a/doc/admin/troubleshoot.rst b/doc/admin/troubleshoot.rst
-index 6a0c7f89b..263fc9c97 100644
+index ade5e1f87a..e4dc54f7e5 100644
 --- a/doc/admin/troubleshoot.rst
 +++ b/doc/admin/troubleshoot.rst
 @@ -73,11 +73,10 @@ credential verification failed: KDC has no support for encryption type
@@ -244,7 +247,7 @@ index 6a0c7f89b..263fc9c97 100644
  
  .. _err_cert_chain_cert_expired:
 diff --git a/doc/appdev/refs/macros/index.rst b/doc/appdev/refs/macros/index.rst
-index 68debe714..788d094bf 100644
+index 45fe160d7f..b4b1f3bd93 100644
 --- a/doc/appdev/refs/macros/index.rst
 +++ b/doc/appdev/refs/macros/index.rst
 @@ -36,7 +36,6 @@ Public
@@ -256,10 +259,10 @@ index 68debe714..788d094bf 100644
     CKSUMTYPE_NIST_SHA.rst
     CKSUMTYPE_RSA_MD4.rst
 diff --git a/doc/conf.py b/doc/conf.py
-index c32b2882a..5eeafc30f 100644
+index ecf9020a72..db7fa377ef 100644
 --- a/doc/conf.py
 +++ b/doc/conf.py
-@@ -272,7 +272,7 @@ else:
+@@ -281,7 +281,7 @@ else:
      rst_epilog += '''
  .. |krb5conf| replace:: ``/etc/krb5.conf``
  .. |defkeysalts| replace:: ``aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal``
@@ -269,7 +272,7 @@ index c32b2882a..5eeafc30f 100644
  .. |copy| unicode:: U+000A9
  '''
 diff --git a/doc/mitK5features.rst b/doc/mitK5features.rst
-index 5d286b6ee..f4594ed13 100644
+index 10effcf175..cad0855724 100644
 --- a/doc/mitK5features.rst
 +++ b/doc/mitK5features.rst
 @@ -37,7 +37,7 @@ Database backends: LDAP, DB2, LMDB
@@ -282,7 +285,7 @@ index 5d286b6ee..f4594ed13 100644
  Interoperability
  ----------------
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 56c7a4e6f..70db82a30 100644
+index 8f14e9bf2c..ba3bb18eec 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -130,7 +130,7 @@ WINMAKEFILES=Makefile \
@@ -304,22 +307,29 @@ index 56c7a4e6f..70db82a30 100644
  ##DOS##	$(WCONFIG) config < $@.in > $@
  ##DOS##lib\crypto\builtin\camellia\Makefile: lib\crypto\builtin\camellia\Makefile.in $(MKFDEP)
 diff --git a/src/configure.ac b/src/configure.ac
-index 440a22bd9..d4e4da525 100644
+index 69be9030f8..2561e917a2 100644
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -1481,7 +1481,6 @@ V5_AC_OUTPUT_MAKEFILE(.
- 	lib/crypto lib/crypto/krb lib/crypto/$CRYPTO_IMPL
- 	lib/crypto/$CRYPTO_IMPL/enc_provider
- 	lib/crypto/$CRYPTO_IMPL/hash_provider
--	lib/crypto/$CRYPTO_IMPL/des
- 	lib/crypto/$CRYPTO_IMPL/md4 lib/crypto/$CRYPTO_IMPL/md5
-         lib/crypto/$CRYPTO_IMPL/sha1 lib/crypto/$CRYPTO_IMPL/sha2
- 	lib/crypto/$CRYPTO_IMPL/aes lib/crypto/$CRYPTO_IMPL/camellia
+@@ -1513,12 +1513,12 @@ V5_AC_OUTPUT_MAKEFILE(.
+ 	lib lib/kdb
+ 
+ 	lib/crypto lib/crypto/krb lib/crypto/crypto_tests
+-	lib/crypto/builtin lib/crypto/builtin/des
++	lib/crypto/builtin
+ 	lib/crypto/builtin/aes lib/crypto/builtin/camellia
+ 	lib/crypto/builtin/md4 lib/crypto/builtin/md5
+ 	lib/crypto/builtin/sha1 lib/crypto/builtin/sha2
+ 	lib/crypto/builtin/enc_provider lib/crypto/builtin/hash_provider
+-	lib/crypto/openssl lib/crypto/openssl/des
++	lib/crypto/openssl
+ 	lib/crypto/openssl/enc_provider lib/crypto/openssl/hash_provider
+ 
+ 	lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache
 diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
-index e9435c693..6355e6540 100644
+index 09f800be52..c5a625db8f 100644
 --- a/src/include/krb5/krb5.hin
 +++ b/src/include/krb5/krb5.hin
-@@ -426,8 +426,8 @@ typedef struct _krb5_crypto_iov {
+@@ -422,8 +422,8 @@ typedef struct _krb5_crypto_iov {
  #define ENCTYPE_DES_CBC_MD4     0x0002  /**< @deprecated no longer supported */
  #define ENCTYPE_DES_CBC_MD5     0x0003  /**< @deprecated no longer supported */
  #define ENCTYPE_DES_CBC_RAW     0x0004  /**< @deprecated no longer supported */
@@ -330,7 +340,7 @@ index e9435c693..6355e6540 100644
  #define ENCTYPE_DES_HMAC_SHA1   0x0008  /**< @deprecated no longer supported */
  /* PKINIT */
  #define ENCTYPE_DSA_SHA1_CMS    0x0009  /**< DSA with SHA1, CMS signature */
-@@ -436,9 +436,9 @@ typedef struct _krb5_crypto_iov {
+@@ -432,9 +432,9 @@ typedef struct _krb5_crypto_iov {
  #define ENCTYPE_RC2_CBC_ENV     0x000c  /**< RC2 cbc mode, CMS enveloped data */
  #define ENCTYPE_RSA_ENV         0x000d  /**< RSA encryption, CMS enveloped data */
  #define ENCTYPE_RSA_ES_OAEP_ENV 0x000e  /**< RSA w/OEAP encryption, CMS enveloped data */
@@ -342,33 +352,20 @@ index e9435c693..6355e6540 100644
  #define ENCTYPE_AES128_CTS_HMAC_SHA1_96     0x0011 /**< RFC 3962 */
  #define ENCTYPE_AES256_CTS_HMAC_SHA1_96     0x0012 /**< RFC 3962 */
  #define ENCTYPE_AES128_CTS_HMAC_SHA256_128  0x0013 /**< RFC 8009 */
-@@ -458,7 +458,7 @@ typedef struct _krb5_crypto_iov {
+@@ -459,7 +459,7 @@ typedef struct _krb5_crypto_iov {
  #define CKSUMTYPE_RSA_MD5       0x0007
  #define CKSUMTYPE_RSA_MD5_DES   0x0008
  #define CKSUMTYPE_NIST_SHA      0x0009
 -#define CKSUMTYPE_HMAC_SHA1_DES3      0x000c
 +#define CKSUMTYPE_HMAC_SHA1_DES3      0x000c /* @deprecated removed */
+ #define CKSUMTYPE_SHA1          0x000e /**< RFC 3961 */
  #define CKSUMTYPE_HMAC_SHA1_96_AES128 0x000f /**< RFC 3962. Used with
                                                  ENCTYPE_AES128_CTS_HMAC_SHA1_96 */
- #define CKSUMTYPE_HMAC_SHA1_96_AES256 0x0010 /**< RFC 3962. Used with
-diff --git a/src/kadmin/testing/proto/kdc.conf.proto b/src/kadmin/testing/proto/kdc.conf.proto
-index 8a4b87de1..d7f1d076b 100644
---- a/src/kadmin/testing/proto/kdc.conf.proto
-+++ b/src/kadmin/testing/proto/kdc.conf.proto
-@@ -11,6 +11,6 @@
- 		dict_file = __K5ROOT__/ovsec_adm.dict
- 		kadmind_port = 1751
- 		kpasswd_port = 1752
--		master_key_type = des3-hmac-sha1
--		supported_enctypes = des3-hmac-sha1:normal aes256-cts:normal aes128-cts:normal aes256-sha2:normal aes128-sha2:normal
-+		master_key_type = aes256-cts
-+		supported_enctypes = aes256-cts:normal aes128-cts:normal aes256-sha2:normal aes128-sha2:normal
- 	}
 diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index ba0ce0b71..e3352f9cc 100644
+index 75e04b73db..fe4e48209a 100644
 --- a/src/kdc/kdc_util.c
 +++ b/src/kdc/kdc_util.c
-@@ -1103,8 +1103,6 @@ enctype_name(krb5_enctype ktype, char *buf, size_t buflen)
+@@ -1154,8 +1154,6 @@ enctype_name(krb5_enctype ktype, char *buf, size_t buflen)
          name = "rsaEncryption-EnvOID";
      else if (ktype == ENCTYPE_RSA_ES_OAEP_ENV)
          name = "id-RSAES-OAEP-EnvOID";
@@ -377,7 +374,7 @@ index ba0ce0b71..e3352f9cc 100644
      else
          return krb5_enctype_to_name(ktype, FALSE, buf, buflen);
  
-@@ -1826,8 +1824,6 @@ krb5_boolean
+@@ -1647,8 +1645,6 @@ krb5_boolean
  enctype_requires_etype_info_2(krb5_enctype enctype)
  {
      switch(enctype) {
@@ -387,28 +384,25 @@ index ba0ce0b71..e3352f9cc 100644
      case ENCTYPE_ARCFOUR_HMAC_EXP :
          return 0;
 diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
-index c3fcfd7e8..890d54adf 100644
+index 10e8c74cf8..25c4f40cc3 100644
 --- a/src/lib/crypto/Makefile.in
 +++ b/src/lib/crypto/Makefile.in
-@@ -13,7 +13,7 @@ STOBJLISTS=$(CRYPTO_IMPL)/enc_provider/OBJS.ST				\
- 	$(CRYPTO_IMPL)/hash_provider/OBJS.ST				\
- 	$(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST		\
- 	$(CRYPTO_IMPL)/sha1/OBJS.ST $(CRYPTO_IMPL)/sha2/OBJS.ST		\
--	$(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST		\
-+	$(CRYPTO_IMPL)/aes/OBJS.ST					\
- 	$(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST			\
- 	$(CRYPTO_IMPL)/OBJS.ST
+@@ -10,12 +10,12 @@ LIBMINOR=1
+ RELDIR=crypto
  
-@@ -21,7 +21,7 @@ SUBDIROBJLISTS=$(CRYPTO_IMPL)/enc_provider/OBJS.ST			\
- 	$(CRYPTO_IMPL)/hash_provider/OBJS.ST				\
- 	$(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST		\
- 	$(CRYPTO_IMPL)/sha1/OBJS.ST $(CRYPTO_IMPL)/sha2/OBJS.ST		\
--	$(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST		\
-+	$(CRYPTO_IMPL)/aes/OBJS.ST					\
- 	$(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST			\
- 	$(CRYPTO_IMPL)/OBJS.ST
+ STOBJLISTS=krb/OBJS.ST						\
+-	builtin/OBJS.ST builtin/des/OBJS.ST			\
++	builtin/OBJS.ST						\
+ 	builtin/aes/OBJS.ST builtin/camellia/OBJS.ST		\
+ 	builtin/md4/OBJS.ST builtin/md5/OBJS.ST			\
+ 	builtin/sha1/OBJS.ST builtin/sha2/OBJS.ST		\
+ 	builtin/enc_provider/OBJS.ST builtin/hash_provider/OBJS.ST \
+-	openssl/OBJS.ST openssl/des/OBJS.ST			\
++	openssl/OBJS.ST						\
+ 	openssl/enc_provider/OBJS.ST openssl/hash_provider/OBJS.ST
  
-@@ -34,8 +34,8 @@ SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
+ SUBDIROBJLISTS=$(STOBJLISTS)
+@@ -28,8 +28,8 @@ SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
  SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
  
  ##DOS##LIBNAME=$(OUTPRE)crypto.lib
@@ -420,7 +414,7 @@ index c3fcfd7e8..890d54adf 100644
  all-unix: all-liblinks
  install-unix: install-libs
 diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
-index baf5d974f..82adf1dec 100644
+index 243bb17ba3..30bfcd30c0 100644
 --- a/src/lib/crypto/builtin/Makefile.in
 +++ b/src/lib/crypto/builtin/Makefile.in
 @@ -1,6 +1,6 @@
@@ -428,22 +422,13 @@ index baf5d974f..82adf1dec 100644
  BUILDTOP=$(REL)..$(S)..$(S)..
 -SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
 +SUBDIRS=camellia aes md4 md5 sha1 sha2 enc_provider hash_provider
- LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)
+ LOCALINCLUDES=-I$(srcdir)/../krb $(CRYPTO_IMPL_CFLAGS)
  
  ##DOS##BUILDTOP = ..\..\..
-@@ -22,7 +22,7 @@ SRCS=\
- 	$(srcdir)/init.c	\
+@@ -25,7 +25,7 @@ SRCS=\
+ 	$(srcdir)/kdf.c		\
  	$(srcdir)/pbkdf2.c	
  
--STOBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
-+STOBJLISTS= md4/OBJS.ST 		\
- 	md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST	\
- 	enc_provider/OBJS.ST 		\
- 	hash_provider/OBJS.ST 		\
-@@ -30,7 +30,7 @@ STOBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
- 	camellia/OBJS.ST 		\
- 	OBJS.ST
- 
 -SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 +SUBDIROBJLISTS= md4/OBJS.ST	 	\
  		md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST 	\
@@ -451,7 +436,7 @@ index baf5d974f..82adf1dec 100644
  		hash_provider/OBJS.ST 		\
 diff --git a/src/lib/crypto/builtin/des/ISSUES b/src/lib/crypto/builtin/des/ISSUES
 deleted file mode 100644
-index 157891103..000000000
+index 1578911033..0000000000
 --- a/src/lib/crypto/builtin/des/ISSUES
 +++ /dev/null
 @@ -1,13 +0,0 @@
@@ -470,13 +455,13 @@ index 157891103..000000000
 -const?
 diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in
 deleted file mode 100644
-index ed25dab7c..000000000
+index 397ac87ed4..0000000000
 --- a/src/lib/crypto/builtin/des/Makefile.in
 +++ /dev/null
-@@ -1,80 +0,0 @@
+@@ -1,82 +0,0 @@
 -mydir=lib$(S)crypto$(S)builtin$(S)des
 -BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
--LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb
+-LOCALINCLUDES=-I$(srcdir)/../../krb $(CRYPTO_IMPL_CFLAGS)
 -
 -##DOS##BUILDTOP = ..\..\..\..
 -##DOS##PREFIXDIR = builtin\des
@@ -527,14 +512,16 @@ index ed25dab7c..000000000
 -verify$(EXEEXT): t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \
 -	$(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
 -	$(CC_LINK) -o $@ t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \
--		-lcom_err $(SUPPORT_LIB)
+-		$(COM_ERR_LIB) $(SUPPORT_LIB)
 -
 -destest$(EXEEXT): destest.$(OBJEXT) $(TOBJS) $(SUPPORT_DEPLIB)
 -	$(CC_LINK) -o $@ destest.$(OBJEXT) $(TOBJS) $(SUPPORT_LIB)
 -
 -all-unix: all-libobjs
 -
--check-unix: verify destest
+-check-unix: check-unix-@CRYPTO_BUILTIN_TESTS@
+-check-unix-no:
+-check-unix-yes: verify destest
 -	$(RUN_TEST) ./verify -z
 -	$(RUN_TEST) ./verify -m
 -	$(RUN_TEST) ./verify
@@ -556,10 +543,10 @@ index ed25dab7c..000000000
 -
 diff --git a/src/lib/crypto/builtin/des/d3_aead.c b/src/lib/crypto/builtin/des/d3_aead.c
 deleted file mode 100644
-index bddf75a47..000000000
+index fb83f73b43..0000000000
 --- a/src/lib/crypto/builtin/des/d3_aead.c
 +++ /dev/null
-@@ -1,133 +0,0 @@
+@@ -1,137 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/*
 - * Copyright (C) 2008 by the Massachusetts Institute of Technology.
@@ -588,6 +575,8 @@ index bddf75a47..000000000
 -#include "des_int.h"
 -#include "f_tables.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -void
 -krb5int_des3_cbc_encrypt(krb5_crypto_iov *data, unsigned long num_data,
 -                         const mit_des_key_schedule ks1,
@@ -693,12 +682,14 @@ index bddf75a47..000000000
 -        store_32_be(ocipherr, ivec + 4);
 -    }
 -}
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/d3_kysched.c b/src/lib/crypto/builtin/des/d3_kysched.c
 deleted file mode 100644
-index ebd1050b1..000000000
+index 55fb9449b5..0000000000
 --- a/src/lib/crypto/builtin/des/d3_kysched.c
 +++ /dev/null
-@@ -1,51 +0,0 @@
+@@ -1,55 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/*
 - * Copyright 1995 by Richard P. Basch.  All Rights Reserved.
@@ -722,9 +713,11 @@ index ebd1050b1..000000000
 - * express or implied warranty.
 - */
 -
--#include "k5-int.h"
+-#include "crypto_int.h"
 -#include "des_int.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -int
 -mit_des3_key_sched(mit_des3_cblock k, mit_des3_key_schedule schedule)
 -{
@@ -750,19 +743,20 @@ index ebd1050b1..000000000
 -    /* if key was good, return 0 */
 -    return 0;
 -}
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/deps b/src/lib/crypto/builtin/des/deps
 deleted file mode 100644
-index df2a31dac..000000000
+index 1c1239d696..0000000000
 --- a/src/lib/crypto/builtin/des/deps
 +++ /dev/null
-@@ -1,148 +0,0 @@
+@@ -1,146 +0,0 @@
 -#
 -# Generated makefile dependencies follow.
 -#
 -d3_aead.so d3_aead.po $(OUTPRE)d3_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
 -  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
 -  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
--  $(srcdir)/../aes/aes.h $(srcdir)/../crypto_mod.h $(srcdir)/../sha2/sha2.h \
 -  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
 -  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
 -  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -774,31 +768,28 @@ index df2a31dac..000000000
 -d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \
 -  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
 -  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
--  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
--  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
--  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
--  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
--  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
--  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
--  d3_kysched.c des_int.h
+-  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(top_srcdir)/include/k5-buf.h \
+-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h d3_kysched.c des_int.h
 -des_keys.so des_keys.po $(OUTPRE)des_keys.$(OBJEXT): \
 -  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
 -  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
--  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(srcdir)/../aes/aes.h \
--  $(srcdir)/../crypto_mod.h $(srcdir)/../sha2/sha2.h \
--  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
--  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
--  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
--  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
--  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
--  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
--  des_int.h des_keys.c
+-  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(top_srcdir)/include/k5-buf.h \
+-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h des_int.h des_keys.c
 -f_aead.so f_aead.po $(OUTPRE)f_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
 -  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
 -  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
--  $(srcdir)/../aes/aes.h $(srcdir)/../crypto_mod.h $(srcdir)/../sha2/sha2.h \
 -  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
 -  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
 -  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -809,69 +800,71 @@ index df2a31dac..000000000
 -  des_int.h f_aead.c f_tables.h
 -f_cksum.so f_cksum.po $(OUTPRE)f_cksum.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
 -  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
--  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
--  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
--  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
--  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
--  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
--  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
--  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
--  $(top_srcdir)/include/socket-utils.h des_int.h f_cksum.c \
--  f_tables.h
+-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
+-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  des_int.h f_cksum.c f_tables.h
 -f_parity.so f_parity.po $(OUTPRE)f_parity.$(OBJEXT): \
 -  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
 -  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
--  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
--  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
--  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
--  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
--  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
--  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
--  des_int.h f_parity.c
--f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
--  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
--  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+-  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(top_srcdir)/include/k5-buf.h \
 -  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
 -  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
 -  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
 -  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
 -  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
 -  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
--  $(top_srcdir)/include/socket-utils.h des_int.h f_sched.c
+-  $(top_srcdir)/include/socket-utils.h des_int.h f_parity.c
+-f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
+-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  des_int.h f_sched.c
 -f_tables.so f_tables.po $(OUTPRE)f_tables.$(OBJEXT): \
 -  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
 -  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
--  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
--  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
--  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
--  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
--  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
--  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
--  des_int.h f_tables.c f_tables.h
+-  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(top_srcdir)/include/k5-buf.h \
+-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h des_int.h f_tables.c \
+-  f_tables.h
 -key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \
 -  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
 -  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
--  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
--  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
--  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
--  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
--  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
--  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
--  des_int.h key_sched.c
+-  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(top_srcdir)/include/k5-buf.h \
+-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h des_int.h key_sched.c
 -weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \
 -  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
 -  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
--  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
--  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
--  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
--  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
--  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
--  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
--  des_int.h weak_key.c
+-  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(top_srcdir)/include/k5-buf.h \
+-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h des_int.h weak_key.c
 -destest.so destest.po $(OUTPRE)destest.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
 -  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
 -  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
@@ -906,7 +899,7 @@ index df2a31dac..000000000
 -  des_int.h t_verify.c
 diff --git a/src/lib/crypto/builtin/des/des_int.h b/src/lib/crypto/builtin/des/des_int.h
 deleted file mode 100644
-index f8dc6b296..000000000
+index f8dc6b296a..0000000000
 --- a/src/lib/crypto/builtin/des/des_int.h
 +++ /dev/null
 @@ -1,285 +0,0 @@
@@ -1197,10 +1190,10 @@ index f8dc6b296..000000000
 -#endif  /*DES_INTERNAL_DEFS*/
 diff --git a/src/lib/crypto/builtin/des/des_keys.c b/src/lib/crypto/builtin/des/des_keys.c
 deleted file mode 100644
-index 32b119aad..000000000
+index 027b09d728..0000000000
 --- a/src/lib/crypto/builtin/des/des_keys.c
 +++ /dev/null
-@@ -1,40 +0,0 @@
+@@ -1,38 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/builtin/des/des_keys.c - Key functions used by Kerberos code */
 -/*
@@ -1230,20 +1223,18 @@ index 32b119aad..000000000
 -#include "crypto_int.h"
 -#include "des_int.h"
 -
+-#ifdef K5_BUILTIN_DES_KEY_PARITY
+-
 -void
 -k5_des_fixup_key_parity(unsigned char *keybits)
 -{
 -    mit_des_fixup_key_parity(keybits);
 -}
 -
--krb5_boolean
--k5_des_is_weak_key(unsigned char *keybits)
--{
--    return mit_des_is_weak_key(keybits);
--}
+-#endif /* K5_BUILTIN_DES_KEY_PARITY */
 diff --git a/src/lib/crypto/builtin/des/destest.c b/src/lib/crypto/builtin/des/destest.c
 deleted file mode 100644
-index 52114304e..000000000
+index 52114304e3..0000000000
 --- a/src/lib/crypto/builtin/des/destest.c
 +++ /dev/null
 @@ -1,240 +0,0 @@
@@ -1489,7 +1480,7 @@ index 52114304e..000000000
 -}
 diff --git a/src/lib/crypto/builtin/des/doc/libdes.doc b/src/lib/crypto/builtin/des/doc/libdes.doc
 deleted file mode 100644
-index 19c03c1d3..000000000
+index 6e9431ed2e..0000000000
 --- a/src/lib/crypto/builtin/des/doc/libdes.doc
 +++ /dev/null
 @@ -1,208 +0,0 @@
@@ -1644,7 +1635,7 @@ index 19c03c1d3..000000000
 -	by "*key", then after getting a new key, call the des_set_key() 
 -	routine when needed.
 -
--	No meaningfull value is returned.  Void is not used for compatibility
+-	No meaningful value is returned.  Void is not used for compatibility
 -	with other compilers.
 -
 -
@@ -1703,10 +1694,10 @@ index 19c03c1d3..000000000
 -string length desired.
 diff --git a/src/lib/crypto/builtin/des/f_aead.c b/src/lib/crypto/builtin/des/f_aead.c
 deleted file mode 100644
-index 71b8dff4d..000000000
+index f887735820..0000000000
 --- a/src/lib/crypto/builtin/des/f_aead.c
 +++ /dev/null
-@@ -1,173 +0,0 @@
+@@ -1,177 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/*
 - * Copyright (C) 2008 by the Massachusetts Institute of Technology.
@@ -1735,6 +1726,8 @@ index 71b8dff4d..000000000
 -#include "des_int.h"
 -#include "f_tables.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -const mit_des_cblock mit_des_zeroblock /* = all zero */;
 -
 -void
@@ -1880,9 +1873,11 @@ index 71b8dff4d..000000000
 -    DES_DO_DECRYPT_1 (*left, *right, kp);
 -}
 -#endif
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/f_cbc.c b/src/lib/crypto/builtin/des/f_cbc.c
 deleted file mode 100644
-index 84d5382f2..000000000
+index 84d5382f22..0000000000
 --- a/src/lib/crypto/builtin/des/f_cbc.c
 +++ /dev/null
 @@ -1,256 +0,0 @@
@@ -2144,10 +2139,10 @@ index 84d5382f2..000000000
 -}
 diff --git a/src/lib/crypto/builtin/des/f_cksum.c b/src/lib/crypto/builtin/des/f_cksum.c
 deleted file mode 100644
-index cb482b009..000000000
+index 615a947f4a..0000000000
 --- a/src/lib/crypto/builtin/des/f_cksum.c
 +++ /dev/null
-@@ -1,136 +0,0 @@
+@@ -1,141 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/builtin/des/f_cksum.c */
 -/*
@@ -2179,9 +2174,12 @@ index cb482b009..000000000
 -/*
 - * des_cbc_cksum.c - compute an 8 byte checksum using DES in CBC mode
 - */
+-#include "crypto_int.h"
 -#include "des_int.h"
 -#include "f_tables.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -/*
 - * This routine performs DES cipher-block-chaining checksum operation,
 - * a.k.a.  Message Authentication Code.  It ALWAYS encrypts from input
@@ -2284,12 +2282,14 @@ index cb482b009..000000000
 -     */
 -    return right & 0xFFFFFFFFUL;
 -}
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/f_parity.c b/src/lib/crypto/builtin/des/f_parity.c
 deleted file mode 100644
-index 460b5061b..000000000
+index a658878f6f..0000000000
 --- a/src/lib/crypto/builtin/des/f_parity.c
 +++ /dev/null
-@@ -1,56 +0,0 @@
+@@ -1,64 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/*
 - * These routines check and fix parity of encryption keys for the DES
@@ -2301,9 +2301,11 @@ index 460b5061b..000000000
 - * Mark Eichin -- Cygnus Support
 - */
 -
--
+-#include "crypto_int.h"
 -#include "des_int.h"
 -
+-#ifdef K5_BUILTIN_DES_KEY_PARITY
+-
 -/*
 - * des_fixup_key_parity: Forces odd parity per byte; parity is bits
 - *                       8,16,...64 in des order, implies 0, 8, 16, ...
@@ -2326,6 +2328,10 @@ index 460b5061b..000000000
 -    return;
 -}
 -
+-#endif /* K5_BUILTIN_DES_KEY_PARITY */
+-
+-#ifdef K5_BUILTIN_DES
+-
 -/*
 - * des_check_key_parity: returns true iff key has the correct des parity.
 - *                       See des_fix_key_parity for the definition of
@@ -2346,12 +2352,14 @@ index 460b5061b..000000000
 -
 -    return(1);
 -}
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/f_sched.c b/src/lib/crypto/builtin/des/f_sched.c
 deleted file mode 100644
-index 666a510fb..000000000
+index bbc88a1c8d..0000000000
 --- a/src/lib/crypto/builtin/des/f_sched.c
 +++ /dev/null
-@@ -1,359 +0,0 @@
+@@ -1,363 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/builtin/des/f_sched.c */
 -/*
@@ -2383,9 +2391,11 @@ index 666a510fb..000000000
 -/*
 - * des_make_sched.c - permute a DES key, returning the resulting key schedule
 - */
--#include "k5-int.h"
+-#include "crypto_int.h"
 -#include "des_int.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -/*
 - * Permuted choice 1 tables.  These are used to extract bits
 - * from the left and right parts of the key to form Ci and Di.
@@ -2711,12 +2721,14 @@ index 666a510fb..000000000
 -    }
 -    return (0);
 -}
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/f_tables.c b/src/lib/crypto/builtin/des/f_tables.c
 deleted file mode 100644
-index 6308cb0d5..000000000
+index e50ab1fc60..0000000000
 --- a/src/lib/crypto/builtin/des/f_tables.c
 +++ /dev/null
-@@ -1,370 +0,0 @@
+@@ -1,375 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/builtin/des/f_tables.c */
 -/*
@@ -2753,9 +2765,12 @@ index 6308cb0d5..000000000
 - * Include the header file so something will complain if the
 - * declarations get out of sync
 - */
+-#include "crypto_int.h"
 -#include "des_int.h"
 -#include "f_tables.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -/*
 - * These tables may be declared const if you want.  Many compilers
 - * don't support this, though.
@@ -3087,9 +3102,11 @@ index 6308cb0d5..000000000
 -        0x40000000, 0x40080010, 0x40084010, 0x00084000
 -    },
 -};
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/f_tables.h b/src/lib/crypto/builtin/des/f_tables.h
 deleted file mode 100644
-index fc91b566c..000000000
+index fc91b566cf..0000000000
 --- a/src/lib/crypto/builtin/des/f_tables.h
 +++ /dev/null
 @@ -1,285 +0,0 @@
@@ -3380,10 +3397,10 @@ index fc91b566c..000000000
 -#endif  /* __DES_TABLES_H__ */
 diff --git a/src/lib/crypto/builtin/des/key_sched.c b/src/lib/crypto/builtin/des/key_sched.c
 deleted file mode 100644
-index 87f02b6a9..000000000
+index d6dedd93c6..0000000000
 --- a/src/lib/crypto/builtin/des/key_sched.c
 +++ /dev/null
-@@ -1,62 +0,0 @@
+@@ -1,66 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/builtin/des/key_sched.c */
 -/*
@@ -3429,9 +3446,11 @@ index 87f02b6a9..000000000
 - * Originally written 6/85 by Steve Miller, MIT Project Athena.
 - */
 -
--#include "k5-int.h"
+-#include "crypto_int.h"
 -#include "des_int.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -int
 -mit_des_key_sched(mit_des_cblock k, mit_des_key_schedule schedule)
 -{
@@ -3446,9 +3465,11 @@ index 87f02b6a9..000000000
 -    /* if key was good, return 0 */
 -    return 0;
 -}
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/des/keytest.data b/src/lib/crypto/builtin/des/keytest.data
 deleted file mode 100644
-index 7ff34eedc..000000000
+index 7ff34eedcf..0000000000
 --- a/src/lib/crypto/builtin/des/keytest.data
 +++ /dev/null
 @@ -1,171 +0,0 @@
@@ -3625,7 +3646,7 @@ index 7ff34eedc..000000000
 -1C587F1C13924FEF 305532286D6F295A 63FAC0D034D9F793
 diff --git a/src/lib/crypto/builtin/des/t_verify.c b/src/lib/crypto/builtin/des/t_verify.c
 deleted file mode 100644
-index f4332f5c0..000000000
+index 4a19933cad..0000000000
 --- a/src/lib/crypto/builtin/des/t_verify.c
 +++ /dev/null
 @@ -1,395 +0,0 @@
@@ -3956,7 +3977,7 @@ index f4332f5c0..000000000
 -        printf("%02x ",cipher_text[j]);
 -    printf("\n\n");
 -    if ( memcmp((char *)cipher_text, (char *)checksum, 8) ) {
--        printf("verify: error in CBC cheksum\n");
+-        printf("verify: error in CBC checksum\n");
 -        exit(-1);
 -    }
 -    else
@@ -4026,10 +4047,10 @@ index f4332f5c0..000000000
 -}
 diff --git a/src/lib/crypto/builtin/des/weak_key.c b/src/lib/crypto/builtin/des/weak_key.c
 deleted file mode 100644
-index eb41b267d..000000000
+index f8304a3638..0000000000
 --- a/src/lib/crypto/builtin/des/weak_key.c
 +++ /dev/null
-@@ -1,86 +0,0 @@
+@@ -1,90 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/builtin/des/weak_key.c */
 -/*
@@ -4065,9 +4086,11 @@ index eb41b267d..000000000
 - * Originally written 8/85 by Steve Miller, MIT Project Athena.
 - */
 -
--#include "k5-int.h"
+-#include "crypto_int.h"
 -#include "des_int.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -/*
 - * The following are the weak DES keys:
 - */
@@ -4116,20 +4139,21 @@ index eb41b267d..000000000
 -
 -    return 0;
 -}
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in
-index 3459e1d0e..af6276b96 100644
+index 6ad7cbd4e0..655966b255 100644
 --- a/src/lib/crypto/builtin/enc_provider/Makefile.in
 +++ b/src/lib/crypto/builtin/enc_provider/Makefile.in
-@@ -1,7 +1,6 @@
+@@ -1,6 +1,6 @@
  mydir=lib$(S)crypto$(S)builtin$(S)enc_provider
  BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
--LOCALINCLUDES = -I$(srcdir)/../des 	\
--		-I$(srcdir)/../aes 	\
-+LOCALINCLUDES = -I$(srcdir)/../aes 	\
- 		-I$(srcdir)/../camellia \
- 		-I$(srcdir)/../../krb 	\
- 		-I$(srcdir)/..
-@@ -11,19 +10,16 @@ LOCALINCLUDES = -I$(srcdir)/../des 	\
+-LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../aes -I$(srcdir)/../camellia \
++LOCALINCLUDES = -I$(srcdir)/../aes -I$(srcdir)/../camellia \
+ 		-I$(srcdir)/../../krb $(CRYPTO_IMPL_CFLAGS)
+ 
+ ##DOS##BUILDTOP = ..\..\..\..
+@@ -8,19 +8,16 @@ LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../aes -I$(srcdir)/../camellia \
  ##DOS##OBJFILE = ..\..\$(OUTPRE)enc_provider.lst
  
  STLIBOBJS= \
@@ -4150,18 +4174,17 @@ index 3459e1d0e..af6276b96 100644
  	$(srcdir)/camellia.c	\
  	$(srcdir)/rc4.c
 diff --git a/src/lib/crypto/builtin/enc_provider/deps b/src/lib/crypto/builtin/enc_provider/deps
-index 7a3324c44..c1201cc1a 100644
+index a3414a38ec..dc29d9fce8 100644
 --- a/src/lib/crypto/builtin/enc_provider/deps
 +++ b/src/lib/crypto/builtin/enc_provider/deps
-@@ -1,18 +1,6 @@
+@@ -1,17 +1,6 @@
  #
  # Generated makefile dependencies follow.
  #
 -des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
 -  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
 -  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
--  $(srcdir)/../aes/aes.h $(srcdir)/../crypto_mod.h $(srcdir)/../des/des_int.h \
--  $(srcdir)/../sha2/sha2.h $(top_srcdir)/include/k5-buf.h \
+-  $(srcdir)/../des/des_int.h $(top_srcdir)/include/k5-buf.h \
 -  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
 -  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
 -  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
@@ -4174,10 +4197,10 @@ index 7a3324c44..c1201cc1a 100644
    $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
 diff --git a/src/lib/crypto/builtin/enc_provider/des3.c b/src/lib/crypto/builtin/enc_provider/des3.c
 deleted file mode 100644
-index 9b8244223..000000000
+index c2634d5e10..0000000000
 --- a/src/lib/crypto/builtin/enc_provider/des3.c
 +++ /dev/null
-@@ -1,105 +0,0 @@
+@@ -1,109 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/*
 - * Copyright (C) 1998 by the FundsXpress, INC.
@@ -4208,6 +4231,8 @@ index 9b8244223..000000000
 -#include "crypto_int.h"
 -#include "des_int.h"
 -
+-#ifdef K5_BUILTIN_DES
+-
 -static krb5_error_code
 -validate_and_schedule(krb5_key key, const krb5_data *ivec,
 -                      const krb5_crypto_iov *data, size_t num_data,
@@ -4283,8 +4308,10 @@ index 9b8244223..000000000
 -    krb5int_des_init_state,
 -    krb5int_default_free_state
 -};
+-
+-#endif /* K5_BUILTIN_DES */
 diff --git a/src/lib/crypto/crypto_tests/t_cf2.expected b/src/lib/crypto/crypto_tests/t_cf2.expected
-index f8251a16c..bc6aa50c8 100644
+index f8251a16cb..bc6aa50c84 100644
 --- a/src/lib/crypto/crypto_tests/t_cf2.expected
 +++ b/src/lib/crypto/crypto_tests/t_cf2.expected
 @@ -1,6 +1,5 @@
@@ -4295,7 +4322,7 @@ index f8251a16c..bc6aa50c8 100644
  edd02a39d2dbde31611c16e610be062c
  67f6ea530aea85a37dcbb23349ea52dcc61ca8493ff557252327fd8304341584
 diff --git a/src/lib/crypto/crypto_tests/t_cf2.in b/src/lib/crypto/crypto_tests/t_cf2.in
-index 73e2f8fbc..c4d23b506 100644
+index 73e2f8fbc9..c4d23b506b 100644
 --- a/src/lib/crypto/crypto_tests/t_cf2.in
 +++ b/src/lib/crypto/crypto_tests/t_cf2.in
 @@ -8,11 +8,6 @@ key1
@@ -4311,7 +4338,7 @@ index 73e2f8fbc..c4d23b506 100644
  key1
  key2
 diff --git a/src/lib/crypto/crypto_tests/t_cksums.c b/src/lib/crypto/crypto_tests/t_cksums.c
-index 4da14ea43..84408fb68 100644
+index 557340ec5e..9f9a177ef0 100644
 --- a/src/lib/crypto/crypto_tests/t_cksums.c
 +++ b/src/lib/crypto/crypto_tests/t_cksums.c
 @@ -59,16 +59,6 @@ struct test {
@@ -4332,7 +4359,7 @@ index 4da14ea43..84408fb68 100644
          { KV5M_DATA, 37, "eight nine ten eleven twelve thirteen" },
          CKSUMTYPE_HMAC_SHA1_96_AES128, ENCTYPE_AES128_CTS_HMAC_SHA1_96, 3,
 diff --git a/src/lib/crypto/crypto_tests/t_decrypt.c b/src/lib/crypto/crypto_tests/t_decrypt.c
-index a40a85500..716f2c337 100644
+index a40a855007..716f2c337a 100644
 --- a/src/lib/crypto/crypto_tests/t_decrypt.c
 +++ b/src/lib/crypto/crypto_tests/t_decrypt.c
 @@ -39,62 +39,6 @@ struct test {
@@ -4407,7 +4434,7 @@ index a40a85500..716f2c337 100644
      ENCTYPE_ARCFOUR_HMAC_EXP,
      ENCTYPE_AES128_CTS_HMAC_SHA1_96,
 diff --git a/src/lib/crypto/crypto_tests/t_derive.c b/src/lib/crypto/crypto_tests/t_derive.c
-index afbf7477f..93ce30da2 100644
+index afbf7477f6..93ce30da20 100644
 --- a/src/lib/crypto/crypto_tests/t_derive.c
 +++ b/src/lib/crypto/crypto_tests/t_derive.c
 @@ -38,41 +38,6 @@ struct test {
@@ -4461,7 +4488,7 @@ index afbf7477f..93ce30da2 100644
      case ENCTYPE_AES256_CTS_HMAC_SHA1_96:    return &krb5int_enc_aes256;
      case ENCTYPE_CAMELLIA128_CTS_CMAC:       return &krb5int_enc_camellia128;
 diff --git a/src/lib/crypto/crypto_tests/t_encrypt.c b/src/lib/crypto/crypto_tests/t_encrypt.c
-index bd9b94691..290a72e1e 100644
+index bd9b94691c..290a72e1e0 100644
 --- a/src/lib/crypto/crypto_tests/t_encrypt.c
 +++ b/src/lib/crypto/crypto_tests/t_encrypt.c
 @@ -37,7 +37,6 @@
@@ -4473,7 +4500,7 @@ index bd9b94691..290a72e1e 100644
      ENCTYPE_ARCFOUR_HMAC_EXP,
      ENCTYPE_AES256_CTS_HMAC_SHA1_96,
 diff --git a/src/lib/crypto/crypto_tests/t_short.c b/src/lib/crypto/crypto_tests/t_short.c
-index d4c2b97df..4466b7115 100644
+index d4c2b97dfd..4466b71158 100644
 --- a/src/lib/crypto/crypto_tests/t_short.c
 +++ b/src/lib/crypto/crypto_tests/t_short.c
 @@ -34,7 +34,6 @@
@@ -4485,7 +4512,7 @@ index d4c2b97df..4466b7115 100644
      ENCTYPE_ARCFOUR_HMAC_EXP,
      ENCTYPE_AES256_CTS_HMAC_SHA1_96,
 diff --git a/src/lib/crypto/crypto_tests/t_str2key.c b/src/lib/crypto/crypto_tests/t_str2key.c
-index cdb1acc6d..ef4c4a7d3 100644
+index cdb1acc6d0..ef4c4a7d3b 100644
 --- a/src/lib/crypto/crypto_tests/t_str2key.c
 +++ b/src/lib/crypto/crypto_tests/t_str2key.c
 @@ -35,58 +35,6 @@ struct test {
@@ -4547,11 +4574,33 @@ index cdb1acc6d..ef4c4a7d3 100644
      /* Test vectors from RFC 3962 appendix B. */
      {
          ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+diff --git a/src/lib/crypto/crypto_tests/vectors.c b/src/lib/crypto/crypto_tests/vectors.c
+index bcf5c9106f..eb107dbcd2 100644
+--- a/src/lib/crypto/crypto_tests/vectors.c
++++ b/src/lib/crypto/crypto_tests/vectors.c
+@@ -190,8 +190,6 @@ test_s2k (krb5_enctype enctype)
+     }
+ }
+ 
+-static void test_des3_s2k () { test_s2k (ENCTYPE_DES3_CBC_SHA1); }
+-
+ static void
+ keyToData (krb5_keyblock *k, krb5_data *d)
+ {
+@@ -208,8 +206,6 @@ void check_error (int r, int line) {
+ }
+ #define CHECK check_error(r, __LINE__)
+ 
+-extern struct krb5_enc_provider krb5int_enc_des3;
+-struct krb5_enc_provider *enc = &krb5int_enc_des3;
+ extern struct krb5_enc_provider krb5int_enc_aes128, krb5int_enc_aes256;
+ 
+ void DK (krb5_keyblock *out, krb5_keyblock *in, const krb5_data *usage) {
 diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
-index b74e6f7cc..2b0c4163d 100644
+index cb2e40a3a5..f66698bd53 100644
 --- a/src/lib/crypto/krb/Makefile.in
 +++ b/src/lib/crypto/krb/Makefile.in
-@@ -50,7 +50,6 @@ STLIBOBJS=\
+@@ -47,7 +47,6 @@ STLIBOBJS=\
  	prf.o			\
  	prf_aes2.o		\
  	prf_cmac.o		\
@@ -4559,7 +4608,7 @@ index b74e6f7cc..2b0c4163d 100644
  	prf_dk.o		\
  	prf_rc4.o		\
  	prng.o			\
-@@ -109,7 +108,6 @@ OBJS=\
+@@ -103,7 +102,6 @@ OBJS=\
  	$(OUTPRE)prf.$(OBJEXT)			\
  	$(OUTPRE)prf_aes2.$(OBJEXT)		\
  	$(OUTPRE)prf_cmac.$(OBJEXT)		\
@@ -4567,7 +4616,7 @@ index b74e6f7cc..2b0c4163d 100644
  	$(OUTPRE)prf_dk.$(OBJEXT)		\
  	$(OUTPRE)prf_rc4.$(OBJEXT)		\
  	$(OUTPRE)prng.$(OBJEXT)			\
-@@ -168,7 +166,6 @@ SRCS=\
+@@ -159,7 +157,6 @@ SRCS=\
  	$(srcdir)/prf.c			\
  	$(srcdir)/prf_aes2.c		\
  	$(srcdir)/prf_cmac.c		\
@@ -4576,10 +4625,10 @@ index b74e6f7cc..2b0c4163d 100644
  	$(srcdir)/prf_rc4.c		\
  	$(srcdir)/prng.c 		\
 diff --git a/src/lib/crypto/krb/cksumtypes.c b/src/lib/crypto/krb/cksumtypes.c
-index ecc2e08c9..f5fbe8a2a 100644
+index f7ba322f24..25a3ffd2d2 100644
 --- a/src/lib/crypto/krb/cksumtypes.c
 +++ b/src/lib/crypto/krb/cksumtypes.c
-@@ -46,12 +46,6 @@ const struct krb5_cksumtypes krb5int_cksumtypes_list[] = {
+@@ -52,12 +52,6 @@ const struct krb5_cksumtypes krb5int_cksumtypes_list[] = {
        krb5int_unkeyed_checksum, NULL,
        20, 20, CKSUM_UNKEYED },
  
@@ -4593,21 +4642,19 @@ index ecc2e08c9..f5fbe8a2a 100644
        "hmac-md5-rc4", { "hmac-md5-enc", "hmac-md5-earcfour" },
        "Microsoft HMAC MD5",
 diff --git a/src/lib/crypto/krb/crypto_int.h b/src/lib/crypto/krb/crypto_int.h
-index ba693f8a4..5cc1f8e43 100644
+index 3629616d96..1ee4b30e02 100644
 --- a/src/lib/crypto/krb/crypto_int.h
 +++ b/src/lib/crypto/krb/crypto_int.h
-@@ -276,10 +276,6 @@ krb5_error_code krb5int_aes2_string_to_key(const struct krb5_keytypes *enc,
+@@ -332,8 +332,6 @@ krb5_error_code krb5int_aes2_string_to_key(const struct krb5_keytypes *enc,
  /* Random to key */
  krb5_error_code k5_rand2key_direct(const krb5_data *randombits,
                                     krb5_keyblock *keyblock);
--krb5_error_code k5_rand2key_des(const krb5_data *randombits,
--                                krb5_keyblock *keyblock);
 -krb5_error_code k5_rand2key_des3(const krb5_data *randombits,
 -                                 krb5_keyblock *keyblock);
  
  /* Pseudo-random function */
  krb5_error_code krb5int_des_prf(const struct krb5_keytypes *ktp,
-@@ -368,11 +364,6 @@ krb5_keyusage krb5int_arcfour_translate_usage(krb5_keyusage usage);
+@@ -411,11 +409,6 @@ krb5_keyusage krb5int_arcfour_translate_usage(krb5_keyusage usage);
  /* Ensure library initialization has occurred. */
  int krb5int_crypto_init(void);
  
@@ -4619,7 +4666,7 @@ index ba693f8a4..5cc1f8e43 100644
  /* Default state cleanup handler (used by module enc providers). */
  void krb5int_default_free_state(krb5_data *state);
  
-@@ -425,7 +416,6 @@ void k5_iov_cursor_put(struct iov_cursor *cursor, unsigned char *block);
+@@ -468,7 +461,6 @@ void k5_iov_cursor_put(struct iov_cursor *cursor, unsigned char *block);
  /* Modules must implement the k5_sha256() function prototyped in k5-int.h. */
  
  /* Modules must implement the following enc_providers and hash_providers: */
@@ -4627,21 +4674,18 @@ index ba693f8a4..5cc1f8e43 100644
  extern const struct krb5_enc_provider krb5int_enc_arcfour;
  extern const struct krb5_enc_provider krb5int_enc_aes128;
  extern const struct krb5_enc_provider krb5int_enc_aes256;
-@@ -442,12 +432,6 @@ extern const struct krb5_hash_provider krb5int_hash_sha384;
+@@ -485,9 +477,6 @@ extern const struct krb5_hash_provider krb5int_hash_sha384;
  
  /* Modules must implement the following functions. */
  
 -/* Set the parity bits to the correct values in keybits. */
 -void k5_des_fixup_key_parity(unsigned char *keybits);
--
--/* Return true if keybits is a weak or semi-weak DES key. */
--krb5_boolean k5_des_is_weak_key(unsigned char *keybits);
 -
  /* Compute an HMAC using the provided hash function, key, and data, storing the
   * result into output (caller-allocated). */
  krb5_error_code krb5int_hmac(const struct krb5_hash_provider *hash,
 diff --git a/src/lib/crypto/krb/default_state.c b/src/lib/crypto/krb/default_state.c
-index 0757c8b02..f89dc7902 100644
+index 0757c8b02c..f89dc79023 100644
 --- a/src/lib/crypto/krb/default_state.c
 +++ b/src/lib/crypto/krb/default_state.c
 @@ -32,16 +32,6 @@
@@ -4662,7 +4706,7 @@ index 0757c8b02..f89dc7902 100644
  krb5int_default_free_state(krb5_data *state)
  {
 diff --git a/src/lib/crypto/krb/enctype_util.c b/src/lib/crypto/krb/enctype_util.c
-index 1542d4062..a0037912a 100644
+index 1542d40629..a0037912a7 100644
 --- a/src/lib/crypto/krb/enctype_util.c
 +++ b/src/lib/crypto/krb/enctype_util.c
 @@ -45,6 +45,9 @@ struct {
@@ -4676,7 +4720,7 @@ index 1542d4062..a0037912a 100644
  };
  
 diff --git a/src/lib/crypto/krb/etypes.c b/src/lib/crypto/krb/etypes.c
-index fc278783b..7635393a4 100644
+index fc278783b9..7635393a41 100644
 --- a/src/lib/crypto/krb/etypes.c
 +++ b/src/lib/crypto/krb/etypes.c
 @@ -35,27 +35,6 @@
@@ -4709,7 +4753,7 @@ index fc278783b..7635393a4 100644
      { ENCTYPE_ARCFOUR_HMAC,
 diff --git a/src/lib/crypto/krb/prf_des.c b/src/lib/crypto/krb/prf_des.c
 deleted file mode 100644
-index 7a2d719c5..000000000
+index 7a2d719c5f..0000000000
 --- a/src/lib/crypto/krb/prf_des.c
 +++ /dev/null
 @@ -1,47 +0,0 @@
@@ -4761,10 +4805,10 @@ index 7a2d719c5..000000000
 -    return ktp->enc->encrypt(key, NULL, &iov, 1);
 -}
 diff --git a/src/lib/crypto/krb/random_to_key.c b/src/lib/crypto/krb/random_to_key.c
-index 157462526..863090beb 100644
+index 9394385aa0..863090beb2 100644
 --- a/src/lib/crypto/krb/random_to_key.c
 +++ b/src/lib/crypto/krb/random_to_key.c
-@@ -71,48 +71,3 @@ k5_rand2key_direct(const krb5_data *randombits, krb5_keyblock *keyblock)
+@@ -71,31 +71,3 @@ k5_rand2key_direct(const krb5_data *randombits, krb5_keyblock *keyblock)
      memcpy(keyblock->contents, randombits->data, randombits->length);
      return 0;
  }
@@ -4778,23 +4822,6 @@ index 157462526..863090beb 100644
 -}
 -
 -krb5_error_code
--k5_rand2key_des(const krb5_data *randombits, krb5_keyblock *keyblock)
--{
--    if (randombits->length != 7)
--        return(KRB5_CRYPTO_INTERNAL);
--
--    keyblock->magic = KV5M_KEYBLOCK;
--
--    /* Take the seven bytes, move them around into the top 7 bits of the
--     * 8 key bytes, then compute the parity bits. */
--    memcpy(keyblock->contents, randombits->data, randombits->length);
--    eighth_byte(keyblock->contents);
--    k5_des_fixup_key_parity(keyblock->contents);
--
--    return 0;
--}
--
--krb5_error_code
 -k5_rand2key_des3(const krb5_data *randombits, krb5_keyblock *keyblock)
 -{
 -    int i;
@@ -4814,7 +4841,7 @@ index 157462526..863090beb 100644
 -    return 0;
 -}
 diff --git a/src/lib/crypto/libk5crypto.exports b/src/lib/crypto/libk5crypto.exports
-index 451d5e035..9db181381 100644
+index 052f4d4b51..d8ffa63304 100644
 --- a/src/lib/crypto/libk5crypto.exports
 +++ b/src/lib/crypto/libk5crypto.exports
 @@ -86,7 +86,6 @@ krb5_k_verify_checksum
@@ -4823,55 +4850,38 @@ index 451d5e035..9db181381 100644
  krb5int_aes_decrypt
 -krb5int_enc_des3
  krb5int_arcfour_gsscrypt
- krb5int_camellia_cbc_mac
+ krb5int_camellia_encrypt
  krb5int_cmac_checksum
 diff --git a/src/lib/crypto/openssl/Makefile.in b/src/lib/crypto/openssl/Makefile.in
-index aa434b168..234fc0e76 100644
+index cf11f6847b..8e4cdb8bbf 100644
 --- a/src/lib/crypto/openssl/Makefile.in
 +++ b/src/lib/crypto/openssl/Makefile.in
 @@ -1,6 +1,6 @@
  mydir=lib$(S)crypto$(S)openssl
  BUILDTOP=$(REL)..$(S)..$(S)..
--SUBDIRS=camellia des aes md4 md5  sha1 sha2 enc_provider hash_provider
-+SUBDIRS=camellia aes md4 md5  sha1 sha2 enc_provider hash_provider
- LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)
+-SUBDIRS=des enc_provider hash_provider
++SUBDIRS=enc_provider hash_provider
+ LOCALINCLUDES=-I$(srcdir)/../krb $(CRYPTO_IMPL_CFLAGS)
  
  STLIBOBJS=\
-@@ -24,14 +24,14 @@ SRCS=\
- 	$(srcdir)/sha256.c	\
- 	$(srcdir)/stubs.c
- 
--STOBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
-+STOBJLISTS= md4/OBJS.ST 		\
- 	md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST 	\
- 	enc_provider/OBJS.ST 		\
- 	hash_provider/OBJS.ST 		\
- 	aes/OBJS.ST 			\
- 	OBJS.ST
+@@ -24,7 +24,7 @@ SRCS=\
+ 	$(srcdir)/pbkdf2.c	\
+ 	$(srcdir)/sha256.c
  
 -SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 +SUBDIROBJLISTS= md4/OBJS.ST 		\
  		md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST 	\
  		enc_provider/OBJS.ST 		\
  		hash_provider/OBJS.ST 		\
-@@ -42,7 +42,7 @@ includes: depend
- 
- depend: $(SRCS)
- 
--clean-unix:: clean-libobjs
-+clean-unix:: clean-libobjsn
- 
- @lib_frag@
- @libobj_frag@
 diff --git a/src/lib/crypto/openssl/des/Makefile.in b/src/lib/crypto/openssl/des/Makefile.in
 deleted file mode 100644
-index 4392fb8ea..000000000
+index a6cece1dd1..0000000000
 --- a/src/lib/crypto/openssl/des/Makefile.in
 +++ /dev/null
 @@ -1,20 +0,0 @@
 -mydir=lib$(S)crypto$(S)openssl$(S)des
 -BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
--LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
+-LOCALINCLUDES = -I$(srcdir)/../../krb $(CRYPTO_IMPL_CFLAGS)
 -
 -STLIBOBJS= des_keys.o
 -
@@ -4891,31 +4901,30 @@ index 4392fb8ea..000000000
 -
 diff --git a/src/lib/crypto/openssl/des/deps b/src/lib/crypto/openssl/des/deps
 deleted file mode 100644
-index 21b904f89..000000000
+index 723c268082..0000000000
 --- a/src/lib/crypto/openssl/des/deps
 +++ /dev/null
-@@ -1,15 +0,0 @@
+@@ -1,14 +0,0 @@
 -#
 -# Generated makefile dependencies follow.
 -#
 -des_keys.so des_keys.po $(OUTPRE)des_keys.$(OBJEXT): \
 -  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
 -  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
--  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(srcdir)/../crypto_mod.h \
--  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
--  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
--  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
--  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
--  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
--  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
--  des_keys.c
+-  $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h $(top_srcdir)/include/k5-buf.h \
+-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h des_keys.c
 diff --git a/src/lib/crypto/openssl/des/des_keys.c b/src/lib/crypto/openssl/des/des_keys.c
 deleted file mode 100644
-index 51d9db216..000000000
+index 83f1cbf22a..0000000000
 --- a/src/lib/crypto/openssl/des/des_keys.c
 +++ /dev/null
-@@ -1,40 +0,0 @@
+@@ -1,39 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/openssl/des/des_keys.c - Key functions used by Kerberos code */
 -/*
@@ -4943,6 +4952,9 @@ index 51d9db216..000000000
 - */
 -
 -#include "crypto_int.h"
+-
+-#ifdef K5_OPENSSL_DES_KEY_PARITY
+-
 -#include <openssl/des.h>
 -
 -void
@@ -4951,17 +4963,13 @@ index 51d9db216..000000000
 -    DES_set_odd_parity((DES_cblock *)keybits);
 -}
 -
--krb5_boolean
--k5_des_is_weak_key(unsigned char *keybits)
--{
--    return DES_is_weak_key((DES_cblock *)keybits);
--}
+-#endif
 diff --git a/src/lib/crypto/openssl/enc_provider/Makefile.in b/src/lib/crypto/openssl/enc_provider/Makefile.in
-index a9069d22d..2b32c3ac4 100644
+index 26827cfed5..f0d37c1213 100644
 --- a/src/lib/crypto/openssl/enc_provider/Makefile.in
 +++ b/src/lib/crypto/openssl/enc_provider/Makefile.in
 @@ -3,19 +3,16 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
- LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
+ LOCALINCLUDES = -I$(srcdir)/../../krb $(CRYPTO_IMPL_CFLAGS)
  
  STLIBOBJS= \
 -	des3.o 	\
@@ -4981,7 +4989,7 @@ index a9069d22d..2b32c3ac4 100644
  	$(srcdir)/camellia.c 	\
  	$(srcdir)/rc4.c
 diff --git a/src/lib/crypto/openssl/enc_provider/deps b/src/lib/crypto/openssl/enc_provider/deps
-index 1c28cc842..91ba48234 100644
+index 1c87a526d0..a502990a0c 100644
 --- a/src/lib/crypto/openssl/enc_provider/deps
 +++ b/src/lib/crypto/openssl/enc_provider/deps
 @@ -1,17 +1,6 @@
@@ -4991,23 +4999,23 @@ index 1c28cc842..91ba48234 100644
 -des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
 -  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
 -  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
--  $(srcdir)/../crypto_mod.h $(top_srcdir)/include/k5-buf.h \
--  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
--  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
--  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
--  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
--  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
--  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
--  $(top_srcdir)/include/socket-utils.h des3.c
+-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  des3.c
  aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
    $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
    $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/crypto_int.h \
 diff --git a/src/lib/crypto/openssl/enc_provider/des3.c b/src/lib/crypto/openssl/enc_provider/des3.c
 deleted file mode 100644
-index 1c439c2cd..000000000
+index 90fcf9acb5..0000000000
 --- a/src/lib/crypto/openssl/enc_provider/des3.c
 +++ /dev/null
-@@ -1,184 +0,0 @@
+@@ -1,188 +0,0 @@
 -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 -/* lib/crypto/openssl/enc_provider/des3.c */
 -/*
@@ -5060,8 +5068,10 @@ index 1c439c2cd..000000000
 - */
 -
 -#include "crypto_int.h"
--#include <openssl/evp.h>
 -
+-#ifdef K5_OPENSSL_DES
+-
+-#include <openssl/evp.h>
 -
 -#define DES3_BLOCK_SIZE 8
 -#define DES3_KEY_SIZE 24
@@ -5192,11 +5202,26 @@ index 1c439c2cd..000000000
 -    krb5int_des_init_state,
 -    krb5int_default_free_state
 -};
+-
+-#endif /* K5_OPENSSL_DES */
+diff --git a/src/lib/crypto/openssl/kdf.c b/src/lib/crypto/openssl/kdf.c
+index 41e845eae0..5a43c3d9eb 100644
+--- a/src/lib/crypto/openssl/kdf.c
++++ b/src/lib/crypto/openssl/kdf.c
+@@ -60,8 +60,6 @@ enc_name(const struct krb5_enc_provider *enc)
+         return "AES-128-CBC";
+     if (enc == &krb5int_enc_aes256)
+         return "AES-256-CBC";
+-    if (enc == &krb5int_enc_des3)
+-        return "DES-EDE3-CBC";
+     return NULL;
+ }
+ 
 diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
-index c821cc830..c5bddb1e8 100644
+index b35e11bfb6..d7c2ad321e 100644
 --- a/src/lib/gssapi/krb5/accept_sec_context.c
 +++ b/src/lib/gssapi/krb5/accept_sec_context.c
-@@ -1010,7 +1010,6 @@ kg_accept_krb5(minor_status, context_handle,
+@@ -1026,7 +1026,6 @@ kg_accept_krb5(minor_status, context_handle,
              }
  
              switch (negotiated_etype) {
@@ -5205,7 +5230,7 @@ index c821cc830..c5bddb1e8 100644
              case ENCTYPE_ARCFOUR_HMAC_EXP:
                  /* RFC 4121 accidentally omits RC4-HMAC-EXP as a "not-newer"
 diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
-index 2e2c775d6..f5b0fede6 100644
+index 7364607198..5aeb69aebc 100644
 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h
 +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
 @@ -125,14 +125,14 @@ enum sgn_alg {
@@ -5235,10 +5260,10 @@ index 2e2c775d6..f5b0fede6 100644
  };
  
 diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
-index d1cdce486..7f7146a0a 100644
+index 99275be53a..0e5d10b115 100644
 --- a/src/lib/gssapi/krb5/k5seal.c
 +++ b/src/lib/gssapi/krb5/k5seal.c
-@@ -136,19 +136,12 @@ make_seal_token_v1 (krb5_context context,
+@@ -142,19 +142,12 @@ make_seal_token_v1 (krb5_context context,
  
      /* pad the plaintext, encrypt if needed, and stick it in the token */
  
@@ -5264,7 +5289,7 @@ index d1cdce486..7f7146a0a 100644
  
      code = krb5_c_checksum_length(context, md5cksum.checksum_type, &sumlen);
      if (code) {
-@@ -196,20 +189,8 @@ make_seal_token_v1 (krb5_context context,
+@@ -203,20 +196,8 @@ make_seal_token_v1 (krb5_context context,
          gssalloc_free(t);
          return(code);
      }
@@ -5276,22 +5301,22 @@ index d1cdce486..7f7146a0a 100644
 -         */
 -        if (md5cksum.length != cksum_size)
 -            abort ();
--        memcpy (ptr+14, md5cksum.contents, md5cksum.length);
+-        memcpy(checksum, md5cksum.contents, md5cksum.length);
 -        break;
 -    case SGN_ALG_HMAC_MD5:
--        memcpy (ptr+14, md5cksum.contents, cksum_size);
+-        memcpy(checksum, md5cksum.contents, cksum_size);
 -        break;
 -    }
 +
-+    memcpy (ptr+14, md5cksum.contents, cksum_size);
++    memcpy(checksum, md5cksum.contents, cksum_size);
  
      krb5_free_checksum_contents(context, &md5cksum);
  
 diff --git a/src/lib/gssapi/krb5/k5sealiov.c b/src/lib/gssapi/krb5/k5sealiov.c
-index 9bb2ee109..9147bb2c7 100644
+index 7bf7609a48..d5e12cb436 100644
 --- a/src/lib/gssapi/krb5/k5sealiov.c
 +++ b/src/lib/gssapi/krb5/k5sealiov.c
-@@ -144,18 +144,11 @@ make_seal_token_v1_iov(krb5_context context,
+@@ -147,18 +147,11 @@ make_seal_token_v1_iov(krb5_context context,
      /* pad the plaintext, encrypt if needed, and stick it in the token */
  
      /* initialize the checksum */
@@ -5315,25 +5340,25 @@ index 9bb2ee109..9147bb2c7 100644
  
      code = krb5_c_checksum_length(context, md5cksum.checksum_type, &k5_trailerlen);
      if (code != 0)
-@@ -177,15 +170,7 @@ make_seal_token_v1_iov(krb5_context context,
+@@ -182,15 +175,7 @@ make_seal_token_v1_iov(krb5_context context,
      if (code != 0)
          goto cleanup;
  
 -    switch (ctx->signalg) {
 -    case SGN_ALG_HMAC_SHA1_DES3_KD:
 -        assert(md5cksum.length == ctx->cksum_size);
--        memcpy(ptr + 14, md5cksum.contents, md5cksum.length);
+-        memcpy(checksum, md5cksum.contents, md5cksum.length);
 -        break;
 -    case SGN_ALG_HMAC_MD5:
--        memcpy(ptr + 14, md5cksum.contents, ctx->cksum_size);
+-        memcpy(checksum, md5cksum.contents, ctx->cksum_size);
 -        break;
 -    }
-+    memcpy(ptr + 14, md5cksum.contents, ctx->cksum_size);
++    memcpy(checksum, md5cksum.contents, ctx->cksum_size);
  
      /* create the seq_num */
      code = kg_make_seq_num(context, ctx->seq, ctx->initiate ? 0 : 0xFF,
 diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
-index 9b183bc33..f0cc4a680 100644
+index 9b183bc337..f0cc4a6809 100644
 --- a/src/lib/gssapi/krb5/k5unseal.c
 +++ b/src/lib/gssapi/krb5/k5unseal.c
 @@ -131,28 +131,21 @@ kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer,
@@ -5398,13 +5423,15 @@ index 9b183bc33..f0cc4a680 100644
 +    if (signalg != SGN_ALG_HMAC_MD5) {
          *minor_status = 0;
          return(GSS_S_DEFECTIVE_TOKEN);
--
++    }
+ 
 -    case SGN_ALG_HMAC_SHA1_DES3_KD:
 -    case SGN_ALG_HMAC_MD5:
 -        /* compute the checksum of the message */
 -
 -        /* 8 = bytes of token body to be checksummed according to spec */
--
++    /* compute the checksum of the message */
+ 
 -        if (! (data_ptr = xmalloc(8 + plainlen))) {
 -            if (sealalg != 0xffff)
 -                xfree(plain);
@@ -5413,33 +5440,9 @@ index 9b183bc33..f0cc4a680 100644
 -            *minor_status = ENOMEM;
 -            return(GSS_S_FAILURE);
 -        }
--
--        (void) memcpy(data_ptr, ptr-2, 8);
--
--        (void) memcpy(data_ptr+8, plain, plainlen);
--
--        plaind.length = 8 + plainlen;
--        plaind.data = data_ptr;
--        code = krb5_k_make_checksum(context, md5cksum.checksum_type,
--                                    ctx->seq, sign_usage,
--                                    &plaind, &md5cksum);
--        xfree(data_ptr);
--
--        if (code) {
--            if (toktype == KG_TOK_SEAL_MSG)
--                gssalloc_free(token.value);
--            *minor_status = code;
--            return(GSS_S_FAILURE);
--        }
--
--        code = k5_bcmp(md5cksum.contents, ptr + 14, cksum_len);
--        break;
-     }
- 
-+    /* compute the checksum of the message */
-+
 +    /* 8 = bytes of token body to be checksummed according to spec */
-+
+ 
+-        (void) memcpy(data_ptr, ptr-2, 8);
 +    if (! (data_ptr = xmalloc(8 + plainlen))) {
 +        if (sealalg != 0xffff)
 +            xfree(plain);
@@ -5448,35 +5451,50 @@ index 9b183bc33..f0cc4a680 100644
 +        *minor_status = ENOMEM;
 +        return(GSS_S_FAILURE);
 +    }
-+
+ 
+-        (void) memcpy(data_ptr+8, plain, plainlen);
 +    (void) memcpy(data_ptr, ptr-2, 8);
-+
+ 
+-        plaind.length = 8 + plainlen;
+-        plaind.data = data_ptr;
+-        code = krb5_k_make_checksum(context, md5cksum.checksum_type,
+-                                    ctx->seq, sign_usage,
+-                                    &plaind, &md5cksum);
+-        xfree(data_ptr);
 +    (void) memcpy(data_ptr+8, plain, plainlen);
-+
+ 
+-        if (code) {
+-            if (toktype == KG_TOK_SEAL_MSG)
+-                gssalloc_free(token.value);
+-            *minor_status = code;
+-            return(GSS_S_FAILURE);
+-        }
 +    plaind.length = 8 + plainlen;
 +    plaind.data = data_ptr;
 +    code = krb5_k_make_checksum(context, md5cksum.checksum_type,
 +                                ctx->seq, sign_usage,
 +                                &plaind, &md5cksum);
 +    xfree(data_ptr);
-+
+ 
+-        code = k5_bcmp(md5cksum.contents, ptr + 14, cksum_len);
+-        break;
 +    if (code) {
 +        if (toktype == KG_TOK_SEAL_MSG)
 +            gssalloc_free(token.value);
 +        *minor_status = code;
 +        return(GSS_S_FAILURE);
-+    }
-+
+     }
+ 
 +    code = k5_bcmp(md5cksum.contents, ptr + 14, cksum_len);
 +
      krb5_free_checksum_contents(context, &md5cksum);
      if (sealalg != 0xffff)
          xfree(plain);
 diff --git a/src/lib/gssapi/krb5/k5unsealiov.c b/src/lib/gssapi/krb5/k5unsealiov.c
-index 85a9574f3..3ce2a90ce 100644
+index 21b501731e..6a6585d9af 100644
 --- a/src/lib/gssapi/krb5/k5unsealiov.c
 +++ b/src/lib/gssapi/krb5/k5unsealiov.c
-@@ -102,28 +102,21 @@ kg_unseal_v1_iov(krb5_context context,
+@@ -103,28 +103,21 @@ kg_unseal_v1_iov(krb5_context context,
      }
  
      if ((ctx->sealalg == SEAL_ALG_NONE && signalg > 1) ||
@@ -5510,7 +5528,7 @@ index 85a9574f3..3ce2a90ce 100644
      /* get the token parameters */
      code = kg_get_seq_num(context, ctx->seq, ptr + 14, ptr + 6, &direction,
                            &seqnum);
-@@ -181,16 +174,10 @@ kg_unseal_v1_iov(krb5_context context,
+@@ -182,16 +175,10 @@ kg_unseal_v1_iov(krb5_context context,
  
      /* initialize the checksum */
  
@@ -5530,7 +5548,7 @@ index 85a9574f3..3ce2a90ce 100644
  
      code = krb5_c_checksum_length(context, md5cksum.checksum_type, &sumlen);
      if (code != 0) {
-@@ -209,18 +196,13 @@ kg_unseal_v1_iov(krb5_context context,
+@@ -210,18 +197,13 @@ kg_unseal_v1_iov(krb5_context context,
          goto cleanup;
      }
  
@@ -5552,7 +5570,7 @@ index 85a9574f3..3ce2a90ce 100644
          code = 0;
          retval = GSS_S_BAD_SIG;
 diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c
-index 80954aff7..f7d3e92c4 100644
+index 84f1949887..32150f5e34 100644
 --- a/src/lib/gssapi/krb5/util_crypt.c
 +++ b/src/lib/gssapi/krb5/util_crypt.c
 @@ -97,17 +97,6 @@ kg_setup_keys(krb5_context context, krb5_gss_ctx_id_rec *ctx, krb5_key subkey,
@@ -5573,57 +5591,8 @@ index 80954aff7..f7d3e92c4 100644
      case ENCTYPE_ARCFOUR_HMAC:
      case ENCTYPE_ARCFOUR_HMAC_EXP:
          /* RFC 4121 accidentally omits RC4-HMAC-EXP as a "not-newer" enctype,
-diff --git a/src/lib/kadm5/unit-test/api.current/chpass-principal-v2.exp b/src/lib/kadm5/unit-test/api.current/chpass-principal-v2.exp
-index 740425c69..6b45f5f72 100644
---- a/src/lib/kadm5/unit-test/api.current/chpass-principal-v2.exp
-+++ b/src/lib/kadm5/unit-test/api.current/chpass-principal-v2.exp
-@@ -53,10 +53,10 @@ proc test200 {} {
-     }
- 
-     # XXX Perhaps I should actually check the key type returned.
--    if {$num_keys == 5} {
-+    if {$num_keys == 4} {
- 	pass "$test"
-     } else {
--	fail "$test: $num_keys keys, should be 5"
-+	fail "$test: $num_keys keys, should be 4"
-     }
-     if { ! [cmd {kadm5_destroy $server_handle}]} {
- 	perror "$test: unexpected failure in destroy"
-diff --git a/src/lib/kadm5/unit-test/api.current/get-principal-v2.exp b/src/lib/kadm5/unit-test/api.current/get-principal-v2.exp
-index 3ea1ba29b..d2c6d1afa 100644
---- a/src/lib/kadm5/unit-test/api.current/get-principal-v2.exp
-+++ b/src/lib/kadm5/unit-test/api.current/get-principal-v2.exp
-@@ -143,8 +143,8 @@ proc test101_102 {rpc} {
-     }
- 
-     set failed 0
--    if {$num_keys != 5} {
--	fail "$test: num_keys $num_keys should be 5"
-+    if {$num_keys != 4} {
-+	fail "$test: num_keys $num_keys should be 4"
- 	set failed 1
-     }
-     for {set i 0} {$i < $num_keys} {incr i} {
-diff --git a/src/lib/kadm5/unit-test/api.current/randkey-principal-v2.exp b/src/lib/kadm5/unit-test/api.current/randkey-principal-v2.exp
-index 2925c1c43..2f76c8b43 100644
---- a/src/lib/kadm5/unit-test/api.current/randkey-principal-v2.exp
-+++ b/src/lib/kadm5/unit-test/api.current/randkey-principal-v2.exp
-@@ -46,10 +46,10 @@ proc test100 {} {
-     }
- 
-     # XXX Perhaps I should actually check the key type returned.
--    if {$num_keys == 5} {
-+    if {$num_keys == 4} {
- 	pass "$test"
-     } else {
--	fail "$test: $num_keys keys, should be 5"
-+	fail "$test: $num_keys keys, should be 4"
-     }
-     if { ! [cmd {kadm5_destroy $server_handle}]} {
- 	perror "$test: unexpected failure in destroy"
 diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
-index e7d67cca4..9a4741fa6 100644
+index 87b486c53f..2b5abcd817 100644
 --- a/src/lib/krb5/krb/init_ctx.c
 +++ b/src/lib/krb5/krb/init_ctx.c
 @@ -59,7 +59,6 @@
@@ -5634,7 +5603,7 @@ index e7d67cca4..9a4741fa6 100644
      ENCTYPE_ARCFOUR_HMAC,
      ENCTYPE_CAMELLIA128_CTS_CMAC, ENCTYPE_CAMELLIA256_CTS_CMAC,
      0
-@@ -479,8 +478,6 @@ krb5int_parse_enctype_list(krb5_context context, const char *profkey,
+@@ -450,8 +449,6 @@ krb5int_parse_enctype_list(krb5_context context, const char *profkey,
              /* Set all enctypes in the default list. */
              for (i = 0; default_list[i]; i++)
                  mod_list(default_list[i], sel, weak, &list);
@@ -5644,10 +5613,10 @@ index e7d67cca4..9a4741fa6 100644
              mod_list(ENCTYPE_AES256_CTS_HMAC_SHA1_96, sel, weak, &list);
              mod_list(ENCTYPE_AES128_CTS_HMAC_SHA1_96, sel, weak, &list);
 diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c
-index 504eb557f..fc5c886d6 100644
+index 44d113e7c5..9662785783 100644
 --- a/src/lib/krb5/krb/s4u_creds.c
 +++ b/src/lib/krb5/krb/s4u_creds.c
-@@ -287,8 +287,6 @@ verify_s4u2self_reply(krb5_context context,
+@@ -288,8 +288,6 @@ verify_s4u2self_reply(krb5_context context,
      assert(req_s4u_user != NULL);
  
      switch (subkey->enctype) {
@@ -5656,21 +5625,8 @@ index 504eb557f..fc5c886d6 100644
      case ENCTYPE_ARCFOUR_HMAC:
      case ENCTYPE_ARCFOUR_HMAC_EXP :
          not_newer = TRUE;
-diff --git a/src/lib/krb5/krb/t_copy_context.c b/src/lib/krb5/krb/t_copy_context.c
-index 2970a8cea..fb82daf19 100644
---- a/src/lib/krb5/krb/t_copy_context.c
-+++ b/src/lib/krb5/krb/t_copy_context.c
-@@ -113,7 +113,7 @@ main(int argc, char **argv)
- {
-     krb5_context ctx, ctx2;
-     krb5_plugin_initvt_fn *mods;
--    const krb5_enctype etypes1[] = { ENCTYPE_DES3_CBC_SHA1, 0 };
-+    const krb5_enctype etypes1[] = { ENCTYPE_AES128_CTS_HMAC_SHA256_128, 0 };
-     const krb5_enctype etypes2[] = { ENCTYPE_AES128_CTS_HMAC_SHA1_96,
-                                      ENCTYPE_AES256_CTS_HMAC_SHA1_96, 0 };
-     krb5_prompt_type ptypes[] = { KRB5_PROMPT_TYPE_PASSWORD };
 diff --git a/src/lib/krb5/krb/t_etypes.c b/src/lib/krb5/krb/t_etypes.c
-index f609e938a..248ffea90 100644
+index 90c9f626c6..935aca12f5 100644
 --- a/src/lib/krb5/krb/t_etypes.c
 +++ b/src/lib/krb5/krb/t_etypes.c
 @@ -50,17 +50,6 @@ static struct {
@@ -5742,7 +5698,7 @@ index f609e938a..248ffea90 100644
      { NULL,
        { ENCTYPE_AES256_CTS_HMAC_SHA1_96, 0 },
 diff --git a/src/lib/krb5/os/t_trace.c b/src/lib/krb5/os/t_trace.c
-index 10ba8d0ac..24064ffcf 100644
+index 10ba8d0ac7..24064ffcfd 100644
 --- a/src/lib/krb5/os/t_trace.c
 +++ b/src/lib/krb5/os/t_trace.c
 @@ -65,8 +65,8 @@ main (int argc, char *argv[])
@@ -5757,7 +5713,7 @@ index 10ba8d0ac..24064ffcf 100644
      krb5_keytab keytab;
      krb5_creds creds;
 diff --git a/src/lib/krb5/os/t_trace.ref b/src/lib/krb5/os/t_trace.ref
-index 044a66999..98fb14f3f 100644
+index 044a66999e..98fb14f3f7 100644
 --- a/src/lib/krb5/os/t_trace.ref
 +++ b/src/lib/krb5/os/t_trace.ref
 @@ -41,7 +41,7 @@ int, krb5_principal type: ?
@@ -5770,7 +5726,7 @@ index 044a66999..98fb14f3f 100644
  krb5_ccache, display type:name: FILE:/path/to/ccache
  krb5_keytab, display name: FILE:/etc/krb5.keytab
 diff --git a/src/plugins/preauth/pkinit/pkcs11.h b/src/plugins/preauth/pkinit/pkcs11.h
-index e3d284631..586661bb7 100644
+index e3d2846315..586661bb7e 100644
 --- a/src/plugins/preauth/pkinit/pkcs11.h
 +++ b/src/plugins/preauth/pkinit/pkcs11.h
 @@ -339,9 +339,9 @@ typedef unsigned long ck_key_type_t;
@@ -5786,99 +5742,29 @@ index e3d284631..586661bb7 100644
  #define CKK_CAST		(0x16)
  #define CKK_CAST3		(0x17)
  #define CKK_CAST128		(0x18)
-diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
-index 1a642139a..2f0431991 100644
---- a/src/plugins/preauth/pkinit/pkinit_clnt.c
-+++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
-@@ -212,14 +212,6 @@ pkinit_as_req_create(krb5_context context,
-     auth_pack.clientPublicValue = &info;
-     auth_pack.supportedKDFs = (krb5_data **)supported_kdf_alg_ids;
- 
--    /* add List of CMS algorithms */
--    retval = create_krb5_supportedCMSTypes(context, plgctx->cryptoctx,
--                                           reqctx->cryptoctx,
--                                           reqctx->idctx, &cmstypes);
--    auth_pack.supportedCMSTypes = cmstypes;
--    if (retval)
--        goto cleanup;
--
-     switch(protocol) {
-     case DH_PROTOCOL:
-         TRACE_PKINIT_CLIENT_REQ_DH(context);
 diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h
-index 8064a07d0..a291889b0 100644
+index e22798f668..9fa315d7a0 100644
 --- a/src/plugins/preauth/pkinit/pkinit_crypto.h
 +++ b/src/plugins/preauth/pkinit/pkinit_crypto.h
-@@ -380,18 +380,6 @@ krb5_error_code server_process_dh
- 	unsigned int *server_key_len_out);		/* OUT
- 		    receives length of DH secret key */
- 
--/*
-- * this functions takes in crypto specific representation of
-- * supportedCMSTypes and creates a list of
-- * krb5_algorithm_identifier
-- */
--krb5_error_code create_krb5_supportedCMSTypes
+@@ -370,11 +370,11 @@ krb5_error_code server_process_dh
+  * krb5_algorithm_identifier
+  */
+ krb5_error_code create_krb5_supportedCMSTypes
 -	(krb5_context context,				/* IN */
 -	pkinit_plg_crypto_context plg_cryptoctx,	/* IN */
 -	pkinit_req_crypto_context req_cryptoctx,	/* IN */
 -	pkinit_identity_crypto_context id_cryptoctx,	/* IN */
 -	krb5_algorithm_identifier ***supportedCMSTypes); /* OUT */
--
++       (krb5_context context,                          /* IN */
++       pkinit_plg_crypto_context plg_cryptoctx,        /* IN */
++       pkinit_req_crypto_context req_cryptoctx,        /* IN */
++       pkinit_identity_crypto_context id_cryptoctx,    /* IN */
++       krb5_algorithm_identifier ***supportedCMSTypes); /* OUT */
+ 
  /*
   * this functions takes in crypto specific representation of
-  * trustedCertifiers and creates a list of
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-index 8c7fd0cca..52976895b 100644
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -5487,44 +5487,6 @@ cleanup:
-     return retval;
- }
- 
--krb5_error_code
--create_krb5_supportedCMSTypes(krb5_context context,
--                              pkinit_plg_crypto_context plg_cryptoctx,
--                              pkinit_req_crypto_context req_cryptoctx,
--                              pkinit_identity_crypto_context id_cryptoctx,
--                              krb5_algorithm_identifier ***oids)
--{
--
--    krb5_error_code retval = ENOMEM;
--    krb5_algorithm_identifier **loids = NULL;
--    krb5_data des3oid = {0, 8, "\x2A\x86\x48\x86\xF7\x0D\x03\x07" };
--
--    *oids = NULL;
--    loids = malloc(2 * sizeof(krb5_algorithm_identifier *));
--    if (loids == NULL)
--        goto cleanup;
--    loids[1] = NULL;
--    loids[0] = malloc(sizeof(krb5_algorithm_identifier));
--    if (loids[0] == NULL) {
--        free(loids);
--        goto cleanup;
--    }
--    retval = pkinit_copy_krb5_data(&loids[0]->algorithm, &des3oid);
--    if (retval) {
--        free(loids[0]);
--        free(loids);
--        goto cleanup;
--    }
--    loids[0]->parameters.length = 0;
--    loids[0]->parameters.data = NULL;
--
--    *oids = loids;
--    retval = 0;
--cleanup:
--
--    return retval;
--}
--
- krb5_error_code
- create_krb5_trustedCertifiers(krb5_context context,
-                               pkinit_plg_crypto_context plg_cryptoctx,
 diff --git a/src/plugins/preauth/pkinit/pkinit_kdf_test.c b/src/plugins/preauth/pkinit/pkinit_kdf_test.c
-index 7acbd0d28..cd998a29a 100644
+index 7f38e84910..99c93ac128 100644
 --- a/src/plugins/preauth/pkinit/pkinit_kdf_test.c
 +++ b/src/plugins/preauth/pkinit/pkinit_kdf_test.c
 @@ -49,7 +49,6 @@ char eighteen_bs[9];
@@ -5889,14 +5775,13 @@ index 7acbd0d28..cd998a29a 100644
  const krb5_data lha_data = DATA_FROM_STRING("lha");
  
  krb5_octet key1_hex[] =
-@@ -185,36 +184,6 @@ main(int argc, char **argv)
+@@ -187,35 +186,6 @@ main(int argc, char **argv)
          goto cleanup;
      }
  
 -    /* TEST 3: SHA-512/DES3 */
 -    /* set up algorithm id */
--    alg_id.algorithm.data = (char *)krb5_pkinit_sha512_oid;
--    alg_id.algorithm.length = krb5_pkinit_sha512_oid_len;
+-    alg_id.algorithm = sha512_id;
 -
 -    enctype = enctype_des3;
 -
@@ -5906,7 +5791,7 @@ index 7acbd0d28..cd998a29a 100644
 -                                              u_principal, v_principal,
 -                                              enctype, &as_req, &pk_as_rep,
 -                                              &key_block))) {
--        printf("ERROR in pkinit_kdf_test: kdf call failed, retval = %d",
+-        printf("ERROR in pkinit_kdf_test: kdf call failed, retval = %d\n",
 -               retval);
 -        goto cleanup;
 -    }
@@ -5927,7 +5812,7 @@ index 7acbd0d28..cd998a29a 100644
      /* release all allocated resources, whether good or bad return */
      free(secret.data);
 diff --git a/src/plugins/preauth/spake/t_vectors.c b/src/plugins/preauth/spake/t_vectors.c
-index 2279202d3..96b0307d7 100644
+index 2279202d3a..96b0307d78 100644
 --- a/src/plugins/preauth/spake/t_vectors.c
 +++ b/src/plugins/preauth/spake/t_vectors.c
 @@ -56,31 +56,6 @@ struct test {
@@ -5962,158 +5847,8 @@ index 2279202d3..96b0307d7 100644
      { ENCTYPE_ARCFOUR_HMAC, SPAKE_GROUP_EDWARDS25519,
        /* initial key, w, x, y, T, S, K */
        "8846F7EAEE8FB117AD06BDD830B7586C",
-diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
-index b047ef1f7..4d8c917cd 100644
---- a/src/tests/dejagnu/config/default.exp
-+++ b/src/tests/dejagnu/config/default.exp
-@@ -15,8 +15,6 @@ set timeout 100
- set stty_init {erase \^h kill \^u}
- set env(TERM) dumb
- 
--set des3_krbtgt 0
--
- if { [string length $VALGRIND] } {
-     rename spawn valgrind_aux_spawn
-     proc spawn { args } {
-@@ -105,17 +103,9 @@ if { $PRIOCNTL_HACK } {
- # particularly with regards to encryption types.
- 
- set passes {
--    {
--	des3
--	mode=udp
--	des3_krbtgt=1
--	{supported_enctypes=des3-cbc-sha1:normal}
--	{dummy=[verbose -log "DES3 TGT, DES3 enctype"]}
--    }
-     {
- 	aes-only
- 	mode=udp
--	des3_krbtgt=0
- 	{supported_enctypes=aes256-cts-hmac-sha1-96:normal}
- 	{permitted_enctypes(kdc)=aes256-cts-hmac-sha1-96}
- 	{permitted_enctypes(client)=aes256-cts-hmac-sha1-96}
-@@ -130,7 +120,6 @@ set passes {
-     {
- 	aes-sha2-only
- 	mode=udp
--	des3_krbtgt=0
- 	{supported_enctypes=aes256-sha2:normal}
- 	{permitted_enctypes(kdc)=aes256-sha2}
- 	{permitted_enctypes(replica)=aes256-sha2}
-@@ -146,7 +135,6 @@ set passes {
-     {
- 	camellia-only
- 	mode=udp
--	des3_krbtgt=0
- 	{supported_enctypes=camellia256-cts:normal}
- 	{permitted_enctypes(kdc)=camellia256-cts}
- 	{permitted_enctypes(replica)=camellia256-cts}
-@@ -159,32 +147,9 @@ set passes {
- 	{master_key_type=camellia256-cts}
- 	{dummy=[verbose -log "Camellia-256 enctype"]}
-     }
--    {
--	aes-des3
--	mode=udp
--	des3_krbtgt=0
--	{supported_enctypes=aes256-cts-hmac-sha1-96:normal des3-cbc-sha1:normal}
--	{permitted_enctypes(kdc)=aes256-cts-hmac-sha1-96 des3-cbc-sha1}
--	{permitted_enctypes(client)=aes256-cts-hmac-sha1-96 des3-cbc-sha1}
--	{permitted_enctypes(server)=aes256-cts-hmac-sha1-96 des3-cbc-sha1}
--	{master_key_type=aes256-cts-hmac-sha1-96}
--	{dummy=[verbose -log "AES + DES3 + DES enctypes"]}
--    }
--    {
--	aes-des3tgt
--	mode=udp
--	des3_krbtgt=1
--	{supported_enctypes=aes256-cts-hmac-sha1-96:normal des3-cbc-sha1:normal}
--	{permitted_enctypes(kdc)=aes256-cts-hmac-sha1-96 des3-cbc-sha1}
--	{permitted_enctypes(client)=aes256-cts-hmac-sha1-96 des3-cbc-sha1}
--	{permitted_enctypes(server)=aes256-cts-hmac-sha1-96 des3-cbc-sha1}
--	{master_key_type=aes256-cts-hmac-sha1-96}
--	{dummy=[verbose -log "AES enctypes, DES3 TGT"]}
--    }
-     {
- 	all-enctypes
- 	mode=udp
--	des3_krbtgt=0
- 	{allow_weak_crypto(kdc)=false}
- 	{allow_weak_crypto(replica)=false}
- 	{allow_weak_crypto(client)=false}
-@@ -946,7 +911,6 @@ proc setup_kerberos_db { standalone } {
-     global REALMNAME KDB5_UTIL KADMIN_LOCAL KEY
-     global tmppwd hostname
-     global spawn_id
--    global des3_krbtgt
-     global multipass_name last_passname_db
- 
-     set failall 0
-@@ -1143,48 +1107,6 @@ proc setup_kerberos_db { standalone } {
- 	}
-     }
- 
--    if $des3_krbtgt {
--	# Set the TGT key to DES3.
--	set test "kadmin.local TGT to DES3"
--	set body {
--	    if $failall {
--		break
--	    }
--	    spawn $KADMIN_LOCAL -r $REALMNAME -e des3-cbc-sha1:normal
--	    verbose "starting $test"
--	    expect_after $def_exp_after
--
--	    expect "kadmin.local: "
--	    send "cpw -randkey krbtgt/$REALMNAME@$REALMNAME\r"
--	    # It echos...
--	    expect "cpw -randkey krbtgt/$REALMNAME@$REALMNAME\r"
--	    expect {
--		"Key for \"krbtgt/$REALMNAME@$REALMNAME\" randomized." { }
--	    }
--	    expect "kadmin.local: "
--	    send "quit\r"
--	    expect eof
--	    catch expect_after
--	    if ![check_exit_status kadmin_local] {
--		break
--	    }
--	}
--	set ret [catch $body]
--	catch "expect eof"
--	catch expect_after
--	if $ret {
--	    set failall 1
--	    if $standalone {
--		fail $test
--	    } else {
--		delete_db
--	    }
--	} else {
--	    if $standalone {
--		pass $test
--	    }
--	}
--    }
-     envstack_pop
- 
-     # create the admin database lock file
-diff --git a/src/tests/dejagnu/krb-standalone/kprop.exp b/src/tests/dejagnu/krb-standalone/kprop.exp
-index f71ee8638..8c08cf42f 100644
---- a/src/tests/dejagnu/krb-standalone/kprop.exp
-+++ b/src/tests/dejagnu/krb-standalone/kprop.exp
-@@ -54,7 +54,7 @@ proc doit { } {
-     global REALMNAME KEY
-     global KADMIN_LOCAL KTUTIL KDB5_UTIL KPROPLOG KPROP kpropd_spawn_id
-     global hostname tmppwd spawn_id timeout
--    global KRBIV supported_enctypes portbase mode ulog des3_krbtgt
-+    global KRBIV supported_enctypes portbase mode ulog
- 
-     # Delete any db, ulog files
-     delete_db
 diff --git a/src/tests/gssapi/t_enctypes.py b/src/tests/gssapi/t_enctypes.py
-index 7494d7fcd..2f95d8996 100755
+index 7494d7fcdb..2f95d89967 100755
 --- a/src/tests/gssapi/t_enctypes.py
 +++ b/src/tests/gssapi/t_enctypes.py
 @@ -1,24 +1,17 @@
@@ -6182,10 +5917,10 @@ index 7494d7fcd..2f95d8996 100755
  # because the ticket session key and initiator subkey are
  # non-permitted.  (This is unfortunate if the acceptor's restriction
 diff --git a/src/tests/gssapi/t_invalid.c b/src/tests/gssapi/t_invalid.c
-index 9876a11e6..fb8fe5511 100644
+index 882e163634..8192935099 100644
 --- a/src/tests/gssapi/t_invalid.c
 +++ b/src/tests/gssapi/t_invalid.c
-@@ -84,18 +84,6 @@ struct test {
+@@ -94,18 +94,6 @@ struct test {
      size_t toklen;
      const char *token;
  } tests[] = {
@@ -6205,7 +5940,7 @@ index 9876a11e6..fb8fe5511 100644
          ENCTYPE_ARCFOUR_HMAC, ENCTYPE_ARCFOUR_HMAC,
          SEAL_ALG_MICROSOFT_RC4, SGN_ALG_HMAC_MD5, 8,
 diff --git a/src/tests/gssapi/t_pcontok.c b/src/tests/gssapi/t_pcontok.c
-index 7368f752f..bf22bd3da 100644
+index 7368f752f0..bf22bd3da1 100644
 --- a/src/tests/gssapi/t_pcontok.c
 +++ b/src/tests/gssapi/t_pcontok.c
 @@ -43,7 +43,6 @@
@@ -6240,7 +5975,7 @@ index 7368f752f..bf22bd3da 100644
      tlen = 20 + mech_krb5.length + cksize;
      token = malloc(tlen);
 diff --git a/src/tests/gssapi/t_prf.c b/src/tests/gssapi/t_prf.c
-index f71774cdc..d1857c433 100644
+index f71774cdc9..d1857c433f 100644
 --- a/src/tests/gssapi/t_prf.c
 +++ b/src/tests/gssapi/t_prf.c
 @@ -41,13 +41,6 @@ static struct {
@@ -6258,10 +5993,10 @@ index f71774cdc..d1857c433 100644
        "3BB3AE288C12B3B9D06B208A4151B3B6",
        "9AEA11A3BCF3C53F1F91F5A0BA2132E2501ADF5F3C28"
 diff --git a/src/tests/t_authdata.py b/src/tests/t_authdata.py
-index c589adf2a..4fbdbec05 100644
+index bde1c36844..8fcd30db51 100644
 --- a/src/tests/t_authdata.py
 +++ b/src/tests/t_authdata.py
-@@ -174,7 +174,7 @@ realm.run([kvno, 'restricted'])
+@@ -179,7 +179,7 @@ realm.run([kvno, 'restricted'])
  # preferred krbtgt enctype changes.
  mark('#8139 regression test')
  realm.kinit(realm.user_princ, password('user'), ['-f'])
@@ -6271,18 +6006,21 @@ index c589adf2a..4fbdbec05 100644
  realm.run(['./forward'])
  realm.run([kvno, realm.host_princ])
 diff --git a/src/tests/t_etype_info.py b/src/tests/t_etype_info.py
-index 2a052fc17..ace0edc3c 100644
+index c982508d8b..a6f538b66d 100644
 --- a/src/tests/t_etype_info.py
 +++ b/src/tests/t_etype_info.py
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,7 @@
  from k5test import *
  
 -supported_enctypes = 'aes128-cts des3-cbc-sha1 rc4-hmac'
+-conf = {'libdefaults': {'allow_weak_crypto': 'true'},
+-        'realms': {'$realm': {'supported_enctypes': supported_enctypes}}}
 +supported_enctypes = 'aes128-cts rc4-hmac'
- conf = {'libdefaults': {'allow_weak_crypto': 'true'},
-         'realms': {'$realm': {'supported_enctypes': supported_enctypes}}}
++conf = {'realms': {'$realm': {'supported_enctypes': supported_enctypes}}}
  realm = K5Realm(create_host=False, get_creds=False, krb5_conf=conf)
-@@ -24,9 +24,9 @@ def test_etinfo(princ, enctypes, expected_lines):
+ 
+ realm.run([kadminl, 'addprinc', '-pw', 'pw', '+requires_preauth',
+@@ -26,9 +25,9 @@ def test_etinfo(princ, enctypes, expected_lines):
  # With no newer enctypes in the request, PA-ETYPE-INFO2,
  # PA-ETYPE-INFO, and PA-PW-SALT appear in the AS-REP, each listing one
  # key for the most preferred matching enctype.
@@ -6295,7 +6033,7 @@ index 2a052fc17..ace0edc3c 100644
               'asrep pw_salt KRBTEST.COMuser'])
  
  # With a newer enctype in the request (even if it is not the most
-@@ -37,9 +37,9 @@ test_etinfo('user', 'rc4 aes256-cts',
+@@ -39,9 +38,9 @@ test_etinfo('user', 'rc4 aes256-cts',
  
  # In preauth-required errors, PA-PW-SALT does not appear, but the same
  # etype-info2 values are expected.
@@ -6308,7 +6046,7 @@ index 2a052fc17..ace0edc3c 100644
  test_etinfo('preauthuser', 'rc4 aes256-cts',
              ['error etype_info2 rc4-hmac KRBTEST.COMpreauthuser'])
  
-@@ -48,8 +48,8 @@ test_etinfo('preauthuser', 'rc4 aes256-cts',
+@@ -50,8 +49,8 @@ test_etinfo('preauthuser', 'rc4 aes256-cts',
  # (to allow for preauth mechs which don't depend on long-term keys).
  # An AS-REP cannot be generated without preauth as there is no reply
  # key.
@@ -6320,7 +6058,7 @@ index 2a052fc17..ace0edc3c 100644
  # Verify that etype-info2 is included in a MORE_PREAUTH_DATA_REQUIRED
  # error if the client does optimistic preauth.
 diff --git a/src/tests/t_keyrollover.py b/src/tests/t_keyrollover.py
-index 2c825a692..f29e0d550 100755
+index e9840dfae8..583c2fa27e 100755
 --- a/src/tests/t_keyrollover.py
 +++ b/src/tests/t_keyrollover.py
 @@ -37,9 +37,9 @@ realm.run([klist, '-e'], expected_msg=msg)
@@ -6348,7 +6086,7 @@ index 2c825a692..f29e0d550 100755
  
  realm.stop()
 diff --git a/src/tests/t_mkey.py b/src/tests/t_mkey.py
-index 99273c907..f84041ca4 100755
+index 32f4070bcb..da0ed1831e 100755
 --- a/src/tests/t_mkey.py
 +++ b/src/tests/t_mkey.py
 @@ -7,7 +7,6 @@ import struct
@@ -6401,7 +6139,7 @@ index 99273c907..f84041ca4 100755
  # master key fetch does not segfault.
  mark('#8395 regression test')
 diff --git a/src/tests/t_salt.py b/src/tests/t_salt.py
-index 65084bbf3..55ca89745 100755
+index 65084bbf35..55ca897459 100755
 --- a/src/tests/t_salt.py
 +++ b/src/tests/t_salt.py
 @@ -16,13 +16,12 @@ def test_salt(realm, e1, salt, e2):
@@ -6421,10 +6159,10 @@ index 65084bbf3..55ca89745 100755
  # Test using different salt types in a principal's key list.
  # Parameters from one key in the list must not leak over to later ones.
 diff --git a/src/util/k5test.py b/src/util/k5test.py
-index 442a4e4f7..eea92275d 100644
+index 2a86c5cdfc..d823653aa0 100644
 --- a/src/util/k5test.py
 +++ b/src/util/k5test.py
-@@ -1299,13 +1299,6 @@ _passes = [
+@@ -1338,13 +1338,6 @@ _passes = [
      # No special settings; exercises AES256.
      ('default', None, None, None),
  
@@ -6439,7 +6177,7 @@ index 442a4e4f7..eea92275d 100644
      ('arcfour', None,
       {'libdefaults': {'permitted_enctypes': 'rc4'}},
 diff --git a/src/windows/leash/htmlhelp/html/Encryption_Types.htm b/src/windows/leash/htmlhelp/html/Encryption_Types.htm
-index 1aebdd0b4..c38eefd2b 100644
+index 1aebdd0b4a..c38eefd2bd 100644
 --- a/src/windows/leash/htmlhelp/html/Encryption_Types.htm
 +++ b/src/windows/leash/htmlhelp/html/Encryption_Types.htm
 @@ -79,19 +79,6 @@ will have an entry in the Encryption type column. <br>
@@ -6462,3 +6200,6 @@ index 1aebdd0b4..c38eefd2b 100644
  <th id="th2"> aes </th>
       <td>The AES Advanced Encryption Standard
  family, like 3DES, is a symmetric block cipher and was designed
+-- 
+2.45.1
+
diff --git a/downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch b/0006-downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
similarity index 90%
rename from downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
rename to 0006-downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
index 08b78b1..989b501 100644
--- a/downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
+++ b/0006-downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
@@ -1,4 +1,4 @@
-From bf8521bfaa4a4d54f6eb94f785c68942f4afa055 Mon Sep 17 00:00:00 2001
+From 7b6453903c248a761d3ceb538dfacebbf3d3a9ff Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Fri, 9 Nov 2018 15:12:21 -0500
 Subject: [PATCH] [downstream] FIPS with PRNG and RADIUS and MD4
@@ -19,10 +19,12 @@ post6 restores MD4 (and therefore keygen-only RC4).
 
 post7 restores MD5 and adds radius_md5_fips_override.
 
-Last-updated: krb5-1.17
+post8 silences a static analyzer warning.
+
+Last-updated: krb5-1.20
 ---
  doc/admin/conf_files/krb5_conf.rst            |  6 +++
- src/lib/crypto/krb/prng.c                     | 11 ++++-
+ src/lib/crypto/krb/prng.c                     | 15 +++++-
  .../crypto/openssl/enc_provider/camellia.c    |  6 +++
  src/lib/crypto/openssl/enc_provider/rc4.c     | 13 +++++-
  .../crypto/openssl/hash_provider/hash_evp.c   | 12 +++++
@@ -36,13 +38,13 @@ Last-updated: krb5-1.17
  src/lib/krad/t_attrset.c                      |  4 +-
  src/plugins/preauth/spake/spake_client.c      |  6 +++
  src/plugins/preauth/spake/spake_kdc.c         |  6 +++
- 15 files changed, 151 insertions(+), 33 deletions(-)
+ 15 files changed, 155 insertions(+), 33 deletions(-)
 
 diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
-index 1d2aa7f68..3a8b9cf47 100644
+index f22d5db11b..a33711d918 100644
 --- a/doc/admin/conf_files/krb5_conf.rst
 +++ b/doc/admin/conf_files/krb5_conf.rst
-@@ -331,6 +331,12 @@ The libdefaults section may contain any of the following relations:
+@@ -330,6 +330,12 @@ The libdefaults section may contain any of the following relations:
      qualification of shortnames, set this relation to the empty string
      with ``qualify_shortname = ""``.  (New in release 1.18.)
  
@@ -56,22 +58,26 @@ index 1d2aa7f68..3a8b9cf47 100644
      If this flag is true, reverse name lookup will be used in addition
      to forward name lookup to canonicalizing hostnames for use in
 diff --git a/src/lib/crypto/krb/prng.c b/src/lib/crypto/krb/prng.c
-index cb9ca9b98..f0e9984ca 100644
+index d6b79e2dea..9e80a03d21 100644
 --- a/src/lib/crypto/krb/prng.c
 +++ b/src/lib/crypto/krb/prng.c
-@@ -26,6 +26,8 @@
+@@ -26,6 +26,12 @@
  
  #include "crypto_int.h"
  
 +#include <openssl/rand.h>
++
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
++#include <openssl/crypto.h>
++#endif
 +
  krb5_error_code KRB5_CALLCONV
  krb5_c_random_seed(krb5_context context, krb5_data *data)
  {
-@@ -99,9 +101,16 @@ krb5_boolean
- k5_get_os_entropy(unsigned char *buf, size_t len, int strong)
+@@ -96,9 +102,16 @@ cleanup:
+ static krb5_boolean
+ get_os_entropy(unsigned char *buf, size_t len)
  {
-     const char *device;
 -#if defined(__linux__) && defined(SYS_getrandom)
      int r;
  
@@ -87,10 +93,10 @@ index cb9ca9b98..f0e9984ca 100644
          /*
           * Pull from the /dev/urandom pool, but require it to have been seeded.
 diff --git a/src/lib/crypto/openssl/enc_provider/camellia.c b/src/lib/crypto/openssl/enc_provider/camellia.c
-index 2da691329..f79679a0b 100644
+index 01920e6ce1..d9f327add6 100644
 --- a/src/lib/crypto/openssl/enc_provider/camellia.c
 +++ b/src/lib/crypto/openssl/enc_provider/camellia.c
-@@ -304,6 +304,9 @@ krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data,
+@@ -387,6 +387,9 @@ krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data,
      unsigned char blockY[CAMELLIA_BLOCK_SIZE], blockB[CAMELLIA_BLOCK_SIZE];
      struct iov_cursor cursor;
  
@@ -100,7 +106,7 @@ index 2da691329..f79679a0b 100644
      if (output->length < CAMELLIA_BLOCK_SIZE)
          return KRB5_BAD_MSIZE;
  
-@@ -331,6 +334,9 @@ static krb5_error_code
+@@ -418,6 +421,9 @@ static krb5_error_code
  krb5int_camellia_init_state (const krb5_keyblock *key, krb5_keyusage usage,
                               krb5_data *state)
  {
@@ -111,10 +117,10 @@ index 2da691329..f79679a0b 100644
      state->data = (void *) malloc(16);
      if (state->data == NULL)
 diff --git a/src/lib/crypto/openssl/enc_provider/rc4.c b/src/lib/crypto/openssl/enc_provider/rc4.c
-index a65d57b7a..6ccaca94a 100644
+index 448d563348..ce63cb5f1b 100644
 --- a/src/lib/crypto/openssl/enc_provider/rc4.c
 +++ b/src/lib/crypto/openssl/enc_provider/rc4.c
-@@ -66,6 +66,9 @@ k5_arcfour_docrypt(krb5_key key, const krb5_data *state, krb5_crypto_iov *data,
+@@ -69,6 +69,9 @@ k5_arcfour_docrypt(krb5_key key, const krb5_data *state, krb5_crypto_iov *data,
      EVP_CIPHER_CTX *ctx = NULL;
      struct arcfour_state *arcstate;
  
@@ -124,7 +130,7 @@ index a65d57b7a..6ccaca94a 100644
      arcstate = (state != NULL) ? (void *)state->data : NULL;
      if (arcstate != NULL) {
          ctx = arcstate->ctx;
-@@ -113,7 +116,12 @@ k5_arcfour_docrypt(krb5_key key, const krb5_data *state, krb5_crypto_iov *data,
+@@ -116,7 +119,12 @@ k5_arcfour_docrypt(krb5_key key, const krb5_data *state, krb5_crypto_iov *data,
  static void
  k5_arcfour_free_state(krb5_data *state)
  {
@@ -138,7 +144,7 @@ index a65d57b7a..6ccaca94a 100644
  
      EVP_CIPHER_CTX_free(arcstate->ctx);
      free(arcstate);
-@@ -125,6 +133,9 @@ k5_arcfour_init_state(const krb5_keyblock *key,
+@@ -128,6 +136,9 @@ k5_arcfour_init_state(const krb5_keyblock *key,
  {
      struct arcfour_state *arcstate;
  
@@ -149,10 +155,10 @@ index a65d57b7a..6ccaca94a 100644
       * The cipher state here is a saved pointer to a struct arcfour_state
       * object, rather than a flat byte array as in most enc providers.  The
 diff --git a/src/lib/crypto/openssl/hash_provider/hash_evp.c b/src/lib/crypto/openssl/hash_provider/hash_evp.c
-index 1e0fb8fc3..2eb5139c0 100644
+index f2fbffdb29..11659908bb 100644
 --- a/src/lib/crypto/openssl/hash_provider/hash_evp.c
 +++ b/src/lib/crypto/openssl/hash_provider/hash_evp.c
-@@ -49,6 +49,11 @@ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
+@@ -60,6 +60,11 @@ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
      if (ctx == NULL)
          return ENOMEM;
  
@@ -164,7 +170,7 @@ index 1e0fb8fc3..2eb5139c0 100644
      ok = EVP_DigestInit_ex(ctx, type, NULL);
      for (i = 0; i < num_data; i++) {
          if (!SIGN_IOV(&data[i]))
-@@ -64,12 +69,19 @@ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
+@@ -78,6 +83,11 @@ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
  static krb5_error_code
  hash_md4(const krb5_crypto_iov *data, size_t num_data, krb5_data *output)
  {
@@ -176,6 +182,7 @@ index 1e0fb8fc3..2eb5139c0 100644
      return hash_evp(EVP_md4(), data, num_data, output);
  }
  
+@@ -90,6 +100,8 @@ const struct krb5_hash_provider krb5int_hash_md4 = {
  static krb5_error_code
  hash_md5(const krb5_crypto_iov *data, size_t num_data, krb5_data *output)
  {
@@ -185,24 +192,24 @@ index 1e0fb8fc3..2eb5139c0 100644
  }
  
 diff --git a/src/lib/crypto/openssl/hmac.c b/src/lib/crypto/openssl/hmac.c
-index 7dc59dcc0..769a50c00 100644
+index bf12b8d6a0..f21e268f7f 100644
 --- a/src/lib/crypto/openssl/hmac.c
 +++ b/src/lib/crypto/openssl/hmac.c
-@@ -103,7 +103,11 @@ map_digest(const struct krb5_hash_provider *hash)
+@@ -111,7 +111,11 @@ map_digest(const struct krb5_hash_provider *hash)
          return EVP_sha256();
-     else if (!strncmp(hash->hash_name, "SHA-384",7))
+     else if (hash == &krb5int_hash_sha384)
          return EVP_sha384();
--    else if (!strncmp(hash->hash_name, "MD5", 3))
+-    else if (hash == &krb5int_hash_md5)
 +
 +    if (FIPS_mode())
 +        return NULL;
 +
-+    if (!strncmp(hash->hash_name, "MD5", 3))
++    if (hash == &krb5int_hash_md5)
          return EVP_md5();
-     else if (!strncmp(hash->hash_name, "MD4", 3))
+     else if (hash == &krb5int_hash_md4)
          return EVP_md4();
 diff --git a/src/lib/krad/attr.c b/src/lib/krad/attr.c
-index 9c13d9d75..42d354a3b 100644
+index 9c13d9d755..42d354a3b5 100644
 --- a/src/lib/krad/attr.c
 +++ b/src/lib/krad/attr.c
 @@ -38,7 +38,8 @@
@@ -326,7 +333,7 @@ index 9c13d9d75..42d354a3b 100644
  
  krad_attr
 diff --git a/src/lib/krad/attrset.c b/src/lib/krad/attrset.c
-index 03c613716..d89982a13 100644
+index f309f1581c..6ec031e320 100644
 --- a/src/lib/krad/attrset.c
 +++ b/src/lib/krad/attrset.c
 @@ -167,7 +167,8 @@ krad_attrset_copy(const krad_attrset *set, krad_attrset **copy)
@@ -349,7 +356,7 @@ index 03c613716..d89982a13 100644
              return retval;
  
 diff --git a/src/lib/krad/internal.h b/src/lib/krad/internal.h
-index 996a89372..312dc8258 100644
+index 7619563fc5..e123763954 100644
 --- a/src/lib/krad/internal.h
 +++ b/src/lib/krad/internal.h
 @@ -39,6 +39,8 @@
@@ -395,7 +402,7 @@ index 996a89372..312dc8258 100644
  
  /* Decode attributes from a buffer. */
  krb5_error_code
-@@ -152,4 +163,17 @@ gai_error_code(int err)
+@@ -156,4 +167,17 @@ gai_error_code(int err)
      }
  }
  
@@ -407,14 +414,14 @@ index 996a89372..312dc8258 100644
 +    if (!FIPS_mode())
 +        return 0;
 +
-+    profile_get_boolean(ctx->profile, "libdefaults",
-+                        "radius_md5_fips_override", NULL, 0, &val);
++    (void)profile_get_boolean(ctx->profile, "libdefaults",
++                              "radius_md5_fips_override", NULL, 0, &val);
 +    return !val;
 +}
 +
  #endif /* INTERNAL_H_ */
 diff --git a/src/lib/krad/packet.c b/src/lib/krad/packet.c
-index c597174b6..fc2d24800 100644
+index c597174b65..fc2d248001 100644
 --- a/src/lib/krad/packet.c
 +++ b/src/lib/krad/packet.c
 @@ -53,12 +53,6 @@ typedef unsigned char uchar;
@@ -475,7 +482,7 @@ index c597174b6..fc2d24800 100644
  }
  
 diff --git a/src/lib/krad/remote.c b/src/lib/krad/remote.c
-index 437f7e91a..0f90443ce 100644
+index 06ae751bc8..929f1cef67 100644
 --- a/src/lib/krad/remote.c
 +++ b/src/lib/krad/remote.c
 @@ -263,7 +263,7 @@ on_io_write(krad_remote *rr)
@@ -496,7 +503,7 @@ index 437f7e91a..0f90443ce 100644
                  request_finish(r, 0, rsp);
                  break;
              }
-@@ -455,6 +455,12 @@ kr_remote_send(krad_remote *rr, krad_code code, krad_attrset *attrs,
+@@ -460,6 +460,12 @@ kr_remote_send(krad_remote *rr, krad_code code, krad_attrset *attrs,
                                       (krad_packet_iter_cb)iterator, &r, &tmp);
      if (retval != 0)
          goto error;
@@ -510,7 +517,7 @@ index 437f7e91a..0f90443ce 100644
      K5_TAILQ_FOREACH(r, &rr->list, list) {
          if (r->request == tmp) {
 diff --git a/src/lib/krad/t_attr.c b/src/lib/krad/t_attr.c
-index eb2a780c8..4d285ad9d 100644
+index eb2a780c89..4d285ad9de 100644
 --- a/src/lib/krad/t_attr.c
 +++ b/src/lib/krad/t_attr.c
 @@ -50,6 +50,7 @@ main()
@@ -531,7 +538,7 @@ index eb2a780c8..4d285ad9d 100644
      insist(len == sizeof(encoded));
      insist(memcmp(outbuf, encoded, len) == 0);
 diff --git a/src/lib/krad/t_attrset.c b/src/lib/krad/t_attrset.c
-index 7928335ca..0f9576253 100644
+index 7928335ca4..0f95762534 100644
 --- a/src/lib/krad/t_attrset.c
 +++ b/src/lib/krad/t_attrset.c
 @@ -49,6 +49,7 @@ main()
@@ -553,7 +560,7 @@ index 7928335ca..0f9576253 100644
  
      /* Manually encode User-Name. */
 diff --git a/src/plugins/preauth/spake/spake_client.c b/src/plugins/preauth/spake/spake_client.c
-index 00734a13b..a3ce22b70 100644
+index 00734a13b5..a3ce22b70f 100644
 --- a/src/plugins/preauth/spake/spake_client.c
 +++ b/src/plugins/preauth/spake/spake_client.c
 @@ -38,6 +38,8 @@
@@ -577,7 +584,7 @@ index 00734a13b..a3ce22b70 100644
      vt->name = "spake";
      vt->pa_type_list = pa_types;
 diff --git a/src/plugins/preauth/spake/spake_kdc.c b/src/plugins/preauth/spake/spake_kdc.c
-index 88c964ce1..c7df0392f 100644
+index 1a772d450f..232e78bc05 100644
 --- a/src/plugins/preauth/spake/spake_kdc.c
 +++ b/src/plugins/preauth/spake/spake_kdc.c
 @@ -41,6 +41,8 @@
@@ -589,7 +596,7 @@ index 88c964ce1..c7df0392f 100644
  /*
   * The SPAKE kdcpreauth module uses a secure cookie containing the following
   * concatenated fields (all integer fields are big-endian):
-@@ -571,6 +573,10 @@ kdcpreauth_spake_initvt(krb5_context context, int maj_ver, int min_ver,
+@@ -551,6 +553,10 @@ kdcpreauth_spake_initvt(krb5_context context, int maj_ver, int min_ver,
  
      if (maj_ver != 1)
          return KRB5_PLUGIN_VER_NOTSUPP;
@@ -600,3 +607,6 @@ index 88c964ce1..c7df0392f 100644
      vt = (krb5_kdcpreauth_vtable)vtable;
      vt->name = "spake";
      vt->pa_type_list = pa_types;
+-- 
+2.45.1
+
diff --git a/0007-downstream-Allow-krad-UDP-TCP-localhost-connection-w.patch b/0007-downstream-Allow-krad-UDP-TCP-localhost-connection-w.patch
new file mode 100644
index 0000000..b339700
--- /dev/null
+++ b/0007-downstream-Allow-krad-UDP-TCP-localhost-connection-w.patch
@@ -0,0 +1,82 @@
+From 707fa7bd2be6327343dc8fc5c20dc77645524518 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 5 May 2022 17:15:12 +0200
+Subject: [PATCH] [downstream] Allow krad UDP/TCP localhost connection
+ with FIPS
+
+libkrad allows to establish connections only to UNIX socket in FIPS
+mode, because MD5 digest is not considered safe enough to be used for
+network communication. However, FreeRadius requires connection on TCP or
+UDP ports.
+
+This commit allows TCP or UDP connections in FIPS mode if destination is
+localhost.
+
+Resolves: rhbz#2082189
+---
+ src/lib/krad/remote.c | 35 +++++++++++++++++++++++++++++++++--
+ 1 file changed, 33 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/krad/remote.c b/src/lib/krad/remote.c
+index 929f1cef67..063f17a613 100644
+--- a/src/lib/krad/remote.c
++++ b/src/lib/krad/remote.c
+@@ -33,6 +33,7 @@
+ 
+ #include <string.h>
+ #include <unistd.h>
++#include <stdbool.h>
+ 
+ #include <sys/un.h>
+ 
+@@ -74,6 +75,35 @@ on_io(verto_ctx *ctx, verto_ev *ev);
+ static void
+ on_timeout(verto_ctx *ctx, verto_ev *ev);
+ 
++static in_addr_t get_in_addr(struct addrinfo *info)
++{ return ((struct sockaddr_in *)(info->ai_addr))->sin_addr.s_addr; }
++
++static struct in6_addr *get_in6_addr(struct addrinfo *info)
++{ return &(((struct sockaddr_in6 *)(info->ai_addr))->sin6_addr); }
++
++static bool is_inet_localhost(struct addrinfo *info)
++{
++    struct addrinfo *p;
++
++    for (p = info; p; p = p->ai_next) {
++        switch (p->ai_family) {
++            case AF_INET:
++                if (IN_LOOPBACKNET != (get_in_addr(p) & IN_CLASSA_NET
++                                                      >> IN_CLASSA_NSHIFT))
++                    return false;
++                break;
++            case AF_INET6:
++                if (!IN6_IS_ADDR_LOOPBACK(get_in6_addr(p)))
++                    return false;
++                break;
++            default:
++                return false;
++        }
++    }
++
++    return true;
++}
++
+ /* Iterate over the set of outstanding packets. */
+ static const krad_packet *
+ iterator(request **out)
+@@ -460,8 +490,9 @@ kr_remote_send(krad_remote *rr, krad_code code, krad_attrset *attrs,
+                                      (krad_packet_iter_cb)iterator, &r, &tmp);
+     if (retval != 0)
+         goto error;
+-    else if (tmp->is_fips && rr->info->ai_family != AF_LOCAL &&
+-        rr->info->ai_family != AF_UNIX) {
++    else if (tmp->is_fips && rr->info->ai_family != AF_LOCAL
++                          && rr->info->ai_family != AF_UNIX
++                          && !is_inet_localhost(rr->info)) {
+         /* This would expose cleartext passwords, so abort. */
+         retval = ESOCKTNOSUPPORT;
+         goto error;
+-- 
+2.45.1
+
diff --git a/0008-downstream-Make-tests-compatible-with-sssd_krb5_loca.patch b/0008-downstream-Make-tests-compatible-with-sssd_krb5_loca.patch
new file mode 100644
index 0000000..ceb9595
--- /dev/null
+++ b/0008-downstream-Make-tests-compatible-with-sssd_krb5_loca.patch
@@ -0,0 +1,41 @@
+From 1da88bea558348be2974470774aa688f8be634c0 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Wed, 7 Dec 2022 13:22:42 +0100
+Subject: [PATCH] [downstream] Make tests compatible with
+ sssd_krb5_locator_plugin.so
+
+The sssd_krb5_locator_plugin.so plugin provided by sssd-client conflicts
+with the upstream test t_discover_uri.py. The test has to be modified in
+order to avoid false positive.
+---
+ src/lib/krb5/os/t_discover_uri.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/krb5/os/t_discover_uri.py b/src/lib/krb5/os/t_discover_uri.py
+index 87bac17929..26bc95a8dc 100644
+--- a/src/lib/krb5/os/t_discover_uri.py
++++ b/src/lib/krb5/os/t_discover_uri.py
+@@ -1,3 +1,4 @@
++from os.path import exists
+ from k5test import *
+ 
+ entries = ('URI _kerberos.TEST krb5srv::kkdcp:https://kdc1 1 1\n',
+@@ -37,8 +38,14 @@ realm.env['RESOLV_WRAPPER_HOSTS'] = hosts_filename
+ out = realm.run(['./t_locate_kdc', 'TEST'], env=realm.env)
+ l = out.splitlines()
+ 
++if (exists('/usr/lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so')
++    or exists('/usr/lib64/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so')):
++    line_range = range(6, 14)
++else:
++    line_range = range(4, 12)
++
+ j = 0
+-for i in range(4, 12):
++for i in line_range:
+     if l[i].strip() != expected[j]:
+         fail('URI answers do not match')
+     j += 1
+-- 
+2.45.1
+
diff --git a/0009-downstream-Include-missing-OpenSSL-FIPS-header.patch b/0009-downstream-Include-missing-OpenSSL-FIPS-header.patch
new file mode 100644
index 0000000..ef6f825
--- /dev/null
+++ b/0009-downstream-Include-missing-OpenSSL-FIPS-header.patch
@@ -0,0 +1,120 @@
+From 775ed8588cc21385fb16a4cec4a861f0d578ce04 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 5 Jan 2023 20:06:47 +0100
+Subject: [PATCH] [downstream] Include missing OpenSSL FIPS header
+
+The inclusion of openssl/fips.h, which provides the declaration of
+FIPS_mode(), was removed from openssl/crypto.h. As a consequence, this
+header file has to be included explicitly in krb5 code.
+---
+ src/lib/crypto/krb/prng.c                      | 4 +++-
+ src/lib/crypto/openssl/enc_provider/camellia.c | 1 +
+ src/lib/crypto/openssl/enc_provider/rc4.c      | 4 ++++
+ src/lib/crypto/openssl/hmac.c                  | 1 +
+ src/lib/krad/internal.h                        | 4 ++++
+ src/plugins/preauth/spake/spake_client.c       | 4 ++++
+ src/plugins/preauth/spake/spake_kdc.c          | 4 ++++
+ 7 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/crypto/krb/prng.c b/src/lib/crypto/krb/prng.c
+index 9e80a03d21..ae37c77518 100644
+--- a/src/lib/crypto/krb/prng.c
++++ b/src/lib/crypto/krb/prng.c
+@@ -28,7 +28,9 @@
+ 
+ #include <openssl/rand.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x30000000L
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/fips.h>
++#else
+ #include <openssl/crypto.h>
+ #endif
+ 
+diff --git a/src/lib/crypto/openssl/enc_provider/camellia.c b/src/lib/crypto/openssl/enc_provider/camellia.c
+index d9f327add6..3dd3b0624f 100644
+--- a/src/lib/crypto/openssl/enc_provider/camellia.c
++++ b/src/lib/crypto/openssl/enc_provider/camellia.c
+@@ -32,6 +32,7 @@
+ #include <openssl/camellia.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #include <openssl/core_names.h>
++#include <openssl/fips.h>
+ #else
+ #include <openssl/modes.h>
+ #endif
+diff --git a/src/lib/crypto/openssl/enc_provider/rc4.c b/src/lib/crypto/openssl/enc_provider/rc4.c
+index ce63cb5f1b..6a83f10d27 100644
+--- a/src/lib/crypto/openssl/enc_provider/rc4.c
++++ b/src/lib/crypto/openssl/enc_provider/rc4.c
+@@ -38,6 +38,10 @@
+ 
+ #include <openssl/evp.h>
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/fips.h>
++#endif
++
+ /*
+  * The loopback field is a pointer to the structure.  If the application copies
+  * the state (not a valid operation, but one which happens to works with some
+diff --git a/src/lib/crypto/openssl/hmac.c b/src/lib/crypto/openssl/hmac.c
+index f21e268f7f..25a419d73a 100644
+--- a/src/lib/crypto/openssl/hmac.c
++++ b/src/lib/crypto/openssl/hmac.c
+@@ -59,6 +59,7 @@
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #include <openssl/params.h>
+ #include <openssl/core_names.h>
++#include <openssl/fips.h>
+ #else
+ #include <openssl/hmac.h>
+ #endif
+diff --git a/src/lib/krad/internal.h b/src/lib/krad/internal.h
+index e123763954..a17b6f39b1 100644
+--- a/src/lib/krad/internal.h
++++ b/src/lib/krad/internal.h
+@@ -41,6 +41,10 @@
+ 
+ #include <openssl/crypto.h>
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/fips.h>
++#endif
++
+ #ifndef UCHAR_MAX
+ #define UCHAR_MAX 255
+ #endif
+diff --git a/src/plugins/preauth/spake/spake_client.c b/src/plugins/preauth/spake/spake_client.c
+index a3ce22b70f..13c699071f 100644
+--- a/src/plugins/preauth/spake/spake_client.c
++++ b/src/plugins/preauth/spake/spake_client.c
+@@ -40,6 +40,10 @@
+ 
+ #include <openssl/crypto.h>
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/fips.h>
++#endif
++
+ typedef struct reqstate_st {
+     krb5_pa_spake *msg;         /* set in prep_questions, used in process */
+     krb5_keyblock *initial_key;
+diff --git a/src/plugins/preauth/spake/spake_kdc.c b/src/plugins/preauth/spake/spake_kdc.c
+index 232e78bc05..3394f8a58e 100644
+--- a/src/plugins/preauth/spake/spake_kdc.c
++++ b/src/plugins/preauth/spake/spake_kdc.c
+@@ -43,6 +43,10 @@
+ 
+ #include <openssl/crypto.h>
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#include <openssl/fips.h>
++#endif
++
+ /*
+  * The SPAKE kdcpreauth module uses a secure cookie containing the following
+  * concatenated fields (all integer fields are big-endian):
+-- 
+2.45.1
+
diff --git a/0010-downstream-Do-not-set-root-as-ksu-file-owner.patch b/0010-downstream-Do-not-set-root-as-ksu-file-owner.patch
new file mode 100644
index 0000000..bd4ab77
--- /dev/null
+++ b/0010-downstream-Do-not-set-root-as-ksu-file-owner.patch
@@ -0,0 +1,31 @@
+From 4fd20741afcf76085ea62eb015cd589bb9392a7b Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Mon, 9 Jan 2023 22:39:52 +0100
+Subject: [PATCH] [downstream] Do not set root as ksu file owner
+
+Upstream Makefile uses the install command to set root as owner of the
+ksu executable file. However, this is no longer supported on latest
+versions of the Mock build environment.
+
+In case of ksu, the owner, group, and mode are already set using %attr()
+in the specfile.
+---
+ src/config/pre.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config/pre.in b/src/config/pre.in
+index 7eaa2f351c..e9ae71471e 100644
+--- a/src/config/pre.in
++++ b/src/config/pre.in
+@@ -185,7 +185,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
+ INSTALL_SCRIPT=@INSTALL_PROGRAM@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_SHLIB=@INSTALL_SHLIB@
+-INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
++INSTALL_SETUID=$(INSTALL)
+ ## This is needed because autoconf will sometimes define @exec_prefix@ to be
+ ## ${prefix}.
+ prefix=@prefix@
+-- 
+2.45.1
+
diff --git a/0011-downstream-Allow-KRB5KDF-MD5-and-MD4-in-FIPS-mode.patch b/0011-downstream-Allow-KRB5KDF-MD5-and-MD4-in-FIPS-mode.patch
new file mode 100644
index 0000000..5e45141
--- /dev/null
+++ b/0011-downstream-Allow-KRB5KDF-MD5-and-MD4-in-FIPS-mode.patch
@@ -0,0 +1,165 @@
+From 16f90c007036789d8d9343e8a0cbabfd21853b5a Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 19 Jan 2023 19:22:27 +0100
+Subject: [PATCH] [downstream] Allow KRB5KDF, MD5, and MD4 in FIPS mode
+
+OpenSSL's restrictions to use KRB5KDF, MD5, and MD4 in FIPS mode are
+bypassed in case AES SHA-1 HMAC or RC4 encryption types are allowed by
+the crypto policy.
+---
+ .../crypto/openssl/hash_provider/hash_evp.c   | 97 +++++++++++++++++--
+ src/lib/crypto/openssl/kdf.c                  |  2 +-
+ 2 files changed, 89 insertions(+), 10 deletions(-)
+
+diff --git a/src/lib/crypto/openssl/hash_provider/hash_evp.c b/src/lib/crypto/openssl/hash_provider/hash_evp.c
+index 11659908bb..eb2e693e9f 100644
+--- a/src/lib/crypto/openssl/hash_provider/hash_evp.c
++++ b/src/lib/crypto/openssl/hash_provider/hash_evp.c
+@@ -44,6 +44,49 @@
+ #define EVP_MD_CTX_free EVP_MD_CTX_destroy
+ #endif
+ 
++#include <openssl/provider.h>
++#include <openssl/fips.h>
++#include <threads.h>
++
++typedef struct ossl_lib_md_context {
++    OSSL_LIB_CTX *libctx;
++    OSSL_PROVIDER *default_provider;
++    OSSL_PROVIDER *legacy_provider;
++} ossl_md_context_t;
++
++static thread_local ossl_md_context_t *ossl_md_ctx = NULL;
++
++static krb5_error_code
++init_ossl_md_ctx(ossl_md_context_t *ctx, const char *algo)
++{
++    ctx->libctx = OSSL_LIB_CTX_new();
++    if (!ctx->libctx)
++        return KRB5_CRYPTO_INTERNAL;
++
++    /* Load both legacy and default provider as both may be needed. */
++    ctx->default_provider = OSSL_PROVIDER_load(ctx->libctx, "default");
++    ctx->legacy_provider = OSSL_PROVIDER_load(ctx->libctx, "legacy");
++
++    if (!(ctx->default_provider && ctx->legacy_provider))
++        return KRB5_CRYPTO_INTERNAL;
++
++    return 0;
++}
++
++static void
++deinit_ossl_ctx(ossl_md_context_t *ctx)
++{
++    if (ctx->legacy_provider)
++        OSSL_PROVIDER_unload(ctx->legacy_provider);
++
++    if (ctx->default_provider)
++        OSSL_PROVIDER_unload(ctx->default_provider);
++
++    if (ctx->libctx)
++        OSSL_LIB_CTX_free(ctx->libctx);
++}
++
++
+ static krb5_error_code
+ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
+          krb5_data *output)
+@@ -60,11 +103,6 @@ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
+     if (ctx == NULL)
+         return ENOMEM;
+ 
+-    if (type == EVP_md4() || type == EVP_md5()) {
+-        /* See comments below in hash_md4() and hash_md5(). */
+-        EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+-    }
+-
+     ok = EVP_DigestInit_ex(ctx, type, NULL);
+     for (i = 0; i < num_data; i++) {
+         if (!SIGN_IOV(&data[i]))
+@@ -77,6 +115,43 @@ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
+     return ok ? 0 : KRB5_CRYPTO_INTERNAL;
+ }
+ 
++static krb5_error_code
++hash_legacy_evp(const char *algo, const krb5_crypto_iov *data, size_t num_data,
++                krb5_data *output)
++{
++    krb5_error_code err;
++    EVP_MD *md = NULL;
++
++    if (!ossl_md_ctx) {
++        ossl_md_ctx = malloc(sizeof(ossl_md_context_t));
++        if (!ossl_md_ctx) {
++            err = ENOMEM;
++            goto end;
++        }
++
++        err = init_ossl_md_ctx(ossl_md_ctx, algo);
++        if (err) {
++            deinit_ossl_ctx(ossl_md_ctx);
++            free(ossl_md_ctx);
++            ossl_md_ctx = NULL;
++            goto end;
++        }
++    }
++
++    md = EVP_MD_fetch(ossl_md_ctx->libctx, algo, NULL);
++    if (!md) {
++        err = KRB5_CRYPTO_INTERNAL;
++        goto end;
++    }
++
++    err = hash_evp(md, data, num_data, output);
++
++end:
++    if (md)
++        EVP_MD_free(md);
++
++    return err;
++}
+ #endif
+ 
+ #ifdef K5_OPENSSL_MD4
+@@ -88,7 +163,8 @@ hash_md4(const krb5_crypto_iov *data, size_t num_data, krb5_data *output)
+      * by IPA.  These keys are only used along a (separately) secured channel
+      * for legacy reasons when performing trusts to Active Directory.
+      */
+-    return hash_evp(EVP_md4(), data, num_data, output);
++    return FIPS_mode() ? hash_legacy_evp("MD4", data, num_data, output)
++                       : hash_evp(EVP_md4(), data, num_data, output);
+ }
+ 
+ const struct krb5_hash_provider krb5int_hash_md4 = {
+@@ -100,9 +176,12 @@ const struct krb5_hash_provider krb5int_hash_md4 = {
+ static krb5_error_code
+ hash_md5(const krb5_crypto_iov *data, size_t num_data, krb5_data *output)
+ {
+-    /* MD5 is needed in FIPS mode for communication with RADIUS servers.  This
+-     * is gated in libkrad by libdefaults->radius_md5_fips_override. */
+-    return hash_evp(EVP_md5(), data, num_data, output);
++    /*
++     * MD5 is needed in FIPS mode for communication with RADIUS servers.  This
++     * is gated in libkrad by libdefaults->radius_md5_fips_override.
++     */
++    return FIPS_mode() ? hash_legacy_evp("MD5", data, num_data, output)
++                       : hash_evp(EVP_md5(), data, num_data, output);
+ }
+ 
+ const struct krb5_hash_provider krb5int_hash_md5 = {
+diff --git a/src/lib/crypto/openssl/kdf.c b/src/lib/crypto/openssl/kdf.c
+index 5a43c3d9eb..8528ddc4a9 100644
+--- a/src/lib/crypto/openssl/kdf.c
++++ b/src/lib/crypto/openssl/kdf.c
+@@ -198,7 +198,7 @@ k5_derive_random_rfc3961(const struct krb5_enc_provider *enc, krb5_key key,
+         goto done;
+     }
+ 
+-    kdf = EVP_KDF_fetch(NULL, "KRB5KDF", NULL);
++    kdf = EVP_KDF_fetch(NULL, "KRB5KDF", "-fips");
+     if (kdf == NULL) {
+         ret = KRB5_CRYPTO_INTERNAL;
+         goto done;
+-- 
+2.45.1
+
diff --git a/0012-downstream-Allow-to-set-PAC-ticket-signature-as-opti.patch b/0012-downstream-Allow-to-set-PAC-ticket-signature-as-opti.patch
new file mode 100644
index 0000000..57b4a76
--- /dev/null
+++ b/0012-downstream-Allow-to-set-PAC-ticket-signature-as-opti.patch
@@ -0,0 +1,280 @@
+From 23b58199db429603802e338db530677b61561335 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Wed, 15 Mar 2023 15:56:34 +0100
+Subject: [PATCH] [downstream] Allow to set PAC ticket signature as
+ optional
+
+MS-PAC states that "The ticket signature SHOULD be included in tickets
+that are not encrypted to the krbtgt account". However, the
+implementation of krb5_kdc_verify_ticket() will require the ticket
+signature to be present in case the target of the request is a service
+principal.
+
+In gradual upgrade environments, it results in S4U2Proxy requests
+against a 1.20 KDC using a service ticket generated by an older version
+KDC to fail.
+
+This commit adds a krb5_kdc_verify_ticket_ext() function with an extra
+switch parameter to tolerate the absence of ticket signature in this
+scenario. If the ticket signature is present, it has to be valid,
+regardless of this parameter.
+
+This parameter is set based on the "optional_pac_tkt_chksum" string
+attribute of the TGT KDB entry.
+---
+ doc/admin/admin_commands/kadmin_local.rst |  6 ++++
+ doc/appdev/refs/api/index.rst             |  1 +
+ src/include/kdb.h                         |  1 +
+ src/include/krb5/krb5.hin                 | 40 +++++++++++++++++++++++
+ src/kdc/kdc_util.c                        | 32 ++++++++++++++----
+ src/lib/krb5/krb/pac.c                    | 31 +++++++++++++++---
+ src/lib/krb5/libkrb5.exports              |  1 +
+ src/man/kadmin.man                        |  6 ++++
+ 8 files changed, 108 insertions(+), 10 deletions(-)
+
+diff --git a/doc/admin/admin_commands/kadmin_local.rst b/doc/admin/admin_commands/kadmin_local.rst
+index 2435b3c361..58ac79549f 100644
+--- a/doc/admin/admin_commands/kadmin_local.rst
++++ b/doc/admin/admin_commands/kadmin_local.rst
+@@ -658,6 +658,12 @@ KDC:
+     Directory realm when using aes-sha2 keys on the local krbtgt
+     entry.
+ 
++**optional_pac_tkt_chksum**
++    Boolean value defining the behavior of the KDC in case an expected
++    ticket checksum signed with one of this principal keys is not
++    present in the PAC. This is typically the case for TGS or
++    cross-realm TGS principals when processing S4U2Proxy requests.
++
+ This command requires the **modify** privilege.
+ 
+ Alias: **setstr**
+diff --git a/doc/appdev/refs/api/index.rst b/doc/appdev/refs/api/index.rst
+index d12be47c3c..9b95ebd0f9 100644
+--- a/doc/appdev/refs/api/index.rst
++++ b/doc/appdev/refs/api/index.rst
+@@ -225,6 +225,7 @@ Rarely used public interfaces
+    krb5_is_referral_realm.rst
+    krb5_kdc_sign_ticket.rst
+    krb5_kdc_verify_ticket.rst
++   krb5_kdc_verify_ticket_ext.rst
+    krb5_kt_add_entry.rst
+    krb5_kt_end_seq_get.rst
+    krb5_kt_get_entry.rst
+diff --git a/src/include/kdb.h b/src/include/kdb.h
+index 745b24f351..6075349e5e 100644
+--- a/src/include/kdb.h
++++ b/src/include/kdb.h
+@@ -136,6 +136,7 @@
+ #define KRB5_KDB_SK_PAC_PRIVSVR_ENCTYPE         "pac_privsvr_enctype"
+ #define KRB5_KDB_SK_SESSION_ENCTYPES            "session_enctypes"
+ #define KRB5_KDB_SK_REQUIRE_AUTH                "require_auth"
++#define KRB5_KDB_SK_OPTIONAL_PAC_TKT_CHKSUM     "optional_pac_tkt_chksum"
+ 
+ #if !defined(_WIN32)
+ 
+diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
+index c5a625db8f..2d9b64dc85 100644
+--- a/src/include/krb5/krb5.hin
++++ b/src/include/krb5/krb5.hin
+@@ -8329,6 +8329,46 @@ krb5_kdc_verify_ticket(krb5_context context, const krb5_enc_tkt_part *enc_tkt,
+                        const krb5_keyblock *server,
+                        const krb5_keyblock *privsvr, krb5_pac *pac_out);
+ 
++/**
++ * Verify a PAC, possibly including ticket signature
++ *
++ * @param [in] context              Library context
++ * @param [in] enc_tkt              Ticket enc-part, possibly containing a PAC
++ * @param [in] server_princ         Canonicalized name of ticket server
++ * @param [in] server               Key to validate server checksum (or NULL)
++ * @param [in] privsvr              Key to validate KDC checksum (or NULL)
++ * @paran [in] optional_tkt_chksum  Whether to require a ticket checksum
++ * @param [out] pac_out             Verified PAC (NULL if no PAC included)
++ *
++ * This function is an extension of krb5_kdc_verify_ticket(), adding the @a
++ * optional_tkt_chksum parameter allowing to tolerate the absence of the PAC
++ * ticket signature.
++ *
++ * If a PAC is present in @a enc_tkt, verify its signatures.  If @a privsvr is
++ * not NULL and @a server_princ is not a krbtgt or kadmin/changepw service and
++ * @a optional_tkt_chksum is FALSE, require a ticket signature over @a enc_tkt
++ * in addition to the KDC signature. Place the verified PAC in @a pac_out.  If
++ * an invalid PAC signature is found, return an error matching the Windows KDC
++ * protocol code for that condition as closely as possible.
++ *
++ * If no PAC is present in @a enc_tkt, set @a pac_out to NULL and return
++ * successfully.
++ *
++ * @note This function does not validate the PAC_CLIENT_INFO buffer.  If a
++ * specific value is expected, the caller can make a separate call to
++ * krb5_pac_verify_ext() with a principal but no keys.
++ *
++ * @retval 0 Success; otherwise - Kerberos error codes
++ */
++krb5_error_code KRB5_CALLCONV
++krb5_kdc_verify_ticket_ext(krb5_context context,
++                           const krb5_enc_tkt_part *enc_tkt,
++                           krb5_const_principal server_princ,
++                           const krb5_keyblock *server,
++                           const krb5_keyblock *privsvr,
++                           krb5_boolean optional_tkt_chksum,
++                           krb5_pac *pac_out);
++
+ /** @deprecated Use krb5_kdc_sign_ticket() instead. */
+ krb5_error_code KRB5_CALLCONV
+ krb5_pac_sign(krb5_context context, krb5_pac pac, krb5_timestamp authtime,
+diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
+index fe4e48209a..93415ba862 100644
+--- a/src/kdc/kdc_util.c
++++ b/src/kdc/kdc_util.c
+@@ -560,16 +560,36 @@ cleanup:
+ static krb5_error_code
+ try_verify_pac(krb5_context context, const krb5_enc_tkt_part *enc_tkt,
+                krb5_db_entry *server, krb5_keyblock *server_key,
+-               const krb5_keyblock *tgt_key, krb5_pac *pac_out)
++               krb5_db_entry *tgt, const krb5_keyblock *tgt_key,
++               krb5_pac *pac_out)
+ {
+     krb5_error_code ret;
++    krb5_boolean optional_tkt_chksum;
++    char *str = NULL;
+     krb5_keyblock *privsvr_key;
+ 
+     ret = pac_privsvr_key(context, server, tgt_key, &privsvr_key);
+     if (ret)
+         return ret;
+-    ret = krb5_kdc_verify_ticket(context, enc_tkt, server->princ, server_key,
+-                                 privsvr_key, pac_out);
++
++    /* Check if the absence of ticket signature is tolerated for this realm */
++    ret = krb5_dbe_get_string(context, tgt,
++                              KRB5_KDB_SK_OPTIONAL_PAC_TKT_CHKSUM, &str);
++    /* TODO: should be using _krb5_conf_boolean(), but os-proto.h is not
++     * available here.
++     */
++    optional_tkt_chksum = !ret && str && (strncasecmp(str, "true", 4) == 0
++                                       || strncasecmp(str, "t",    1) == 0
++                                       || strncasecmp(str, "yes",  3) == 0
++                                       || strncasecmp(str, "y",    1) == 0
++                                       || strncasecmp(str, "1",    1) == 0
++                                       || strncasecmp(str, "on",   2) == 0);
++
++    krb5_dbe_free_string(context, str);
++
++    ret = krb5_kdc_verify_ticket_ext(context, enc_tkt, server->princ,
++                                     server_key, privsvr_key,
++                                     optional_tkt_chksum, pac_out);
+     krb5_free_keyblock(context, privsvr_key);
+     return ret;
+ }
+@@ -599,7 +619,7 @@ get_verified_pac(krb5_context context, const krb5_enc_tkt_part *enc_tkt,
+                                       server_key, NULL, pac_out);
+     }
+ 
+-    ret = try_verify_pac(context, enc_tkt, server, server_key, tgt_key,
++    ret = try_verify_pac(context, enc_tkt, server, server_key, tgt, tgt_key,
+                          pac_out);
+     if (ret != KRB5KRB_AP_ERR_MODIFIED && ret != KRB5_BAD_ENCTYPE)
+         return ret;
+@@ -613,8 +633,8 @@ get_verified_pac(krb5_context context, const krb5_enc_tkt_part *enc_tkt,
+         ret = krb5_dbe_decrypt_key_data(context, NULL, kd, &old_key, NULL);
+         if (ret)
+             return ret;
+-        ret = try_verify_pac(context, enc_tkt, server, server_key, &old_key,
+-                             pac_out);
++        ret = try_verify_pac(context, enc_tkt, server, server_key, tgt,
++                             &old_key, pac_out);
+         krb5_free_keyblock_contents(context, &old_key);
+         if (!ret)
+             return 0;
+diff --git a/src/lib/krb5/krb/pac.c b/src/lib/krb5/krb/pac.c
+index 5d1fdf1ba0..0c0e2ada68 100644
+--- a/src/lib/krb5/krb/pac.c
++++ b/src/lib/krb5/krb/pac.c
+@@ -594,6 +594,19 @@ krb5_kdc_verify_ticket(krb5_context context, const krb5_enc_tkt_part *enc_tkt,
+                        krb5_const_principal server_princ,
+                        const krb5_keyblock *server,
+                        const krb5_keyblock *privsvr, krb5_pac *pac_out)
++{
++    return krb5_kdc_verify_ticket_ext(context, enc_tkt, server_princ, server,
++                                      privsvr, FALSE, pac_out);
++}
++
++krb5_error_code KRB5_CALLCONV
++krb5_kdc_verify_ticket_ext(krb5_context context,
++                           const krb5_enc_tkt_part *enc_tkt,
++                           krb5_const_principal server_princ,
++                           const krb5_keyblock *server,
++                           const krb5_keyblock *privsvr,
++                           krb5_boolean optional_tkt_chksum,
++                           krb5_pac *pac_out)
+ {
+     krb5_error_code ret;
+     krb5_pac pac = NULL;
+@@ -602,7 +615,7 @@ krb5_kdc_verify_ticket(krb5_context context, const krb5_enc_tkt_part *enc_tkt,
+     krb5_authdata *orig, **ifrel = NULL, **recoded_ifrel = NULL;
+     uint8_t z = 0;
+     krb5_authdata zpac = { KV5M_AUTHDATA, KRB5_AUTHDATA_WIN2K_PAC, 1, &z };
+-    krb5_boolean is_service_tkt;
++    krb5_boolean is_service_tkt, has_tkt_chksum = FALSE;
+     size_t i, j;
+ 
+     *pac_out = NULL;
+@@ -667,11 +680,21 @@ krb5_kdc_verify_ticket(krb5_context context, const krb5_enc_tkt_part *enc_tkt,
+ 
+         ret = verify_checksum(context, pac, KRB5_PAC_TICKET_CHECKSUM, privsvr,
+                               KRB5_KEYUSAGE_APP_DATA_CKSUM, recoded_tkt);
+-        if (ret)
+-            goto cleanup;
++        if (ret) {
++            if (!optional_tkt_chksum)
++                goto cleanup;
++            else if (ret != ENOENT)
++                goto cleanup;
++            /* Otherwise ticket signature is absent but optional. Proceed... */
++        } else {
++            has_tkt_chksum = TRUE;
++        }
+     }
++    /* Else, we make the assumption the ticket signature is absent in case this
++     * is not a service ticket.
++     */
+ 
+-    ret = verify_pac_checksums(context, pac, is_service_tkt, server, privsvr);
++    ret = verify_pac_checksums(context, pac, has_tkt_chksum, server, privsvr);
+     if (ret)
+         goto cleanup;
+ 
+diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
+index 4c50e935a2..d4b0455c8c 100644
+--- a/src/lib/krb5/libkrb5.exports
++++ b/src/lib/krb5/libkrb5.exports
+@@ -463,6 +463,7 @@ krb5_is_thread_safe
+ krb5_kdc_rep_decrypt_proc
+ krb5_kdc_sign_ticket
+ krb5_kdc_verify_ticket
++krb5_kdc_verify_ticket_ext
+ krb5_kt_add_entry
+ krb5_kt_client_default
+ krb5_kt_close
+diff --git a/src/man/kadmin.man b/src/man/kadmin.man
+index 8413e70ccd..f68eb0569d 100644
+--- a/src/man/kadmin.man
++++ b/src/man/kadmin.man
+@@ -724,6 +724,12 @@ encryption type.  It may be necessary to set this value to
+ "aes256\-sha1" on the cross\-realm krbtgt entry for an Active
+ Directory realm when using aes\-sha2 keys on the local krbtgt
+ entry.
++.TP
++\fBoptional_pac_tkt_chksum\fP
++Boolean value defining the behavior of the KDC in case an expected ticket
++checksum signed with one of this principal keys is not present in the PAC. This
++is typically the case for TGS or cross-realm TGS principals when processing
++S4U2Proxy requests.
+ .UNINDENT
+ .sp
+ This command requires the \fBmodify\fP privilege.
+-- 
+2.45.1
+
diff --git a/0013-downstream-Make-PKINIT-CMS-SHA-1-signature-verificat.patch b/0013-downstream-Make-PKINIT-CMS-SHA-1-signature-verificat.patch
new file mode 100644
index 0000000..68a2a6d
--- /dev/null
+++ b/0013-downstream-Make-PKINIT-CMS-SHA-1-signature-verificat.patch
@@ -0,0 +1,47 @@
+From 31b9debcf2cbd558f8f315fefb69fc8206b115b4 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Tue, 23 May 2023 12:19:54 +0200
+Subject: [PATCH] [downstream] Make PKINIT CMS SHA-1 signature
+ verification available in FIPS mode
+
+We recommend using the SHA1 crypto-module in order to allow the
+verification of SHA-1 signature for CMS messages. However, this module
+does not work in FIPS mode, because the SHA-1 algorithm is absent from
+the OpenSSL FIPS provider.
+
+This commit enables the signature verification process to fetch the
+algorithm from a non-FIPS OpenSSL provider.
+
+Support for SHA-1 CMS signature is still required, especially in order
+to interoperate with Active Directory. At least it is until elliptic
+curve cryptography is implemented for PKINIT in MIT krb5.
+---
+ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index cb9c79626c..17dd18e37d 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -1844,8 +1844,17 @@ cms_signeddata_verify(krb5_context context,
+     if (oid == NULL)
+         goto cleanup;
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++    /* Do not use FIPS provider (even in FIPS mode) because it keeps from
++     * allowing SHA-1 signature verification using the SHA1 crypto-module
++     */
++    cms = CMS_ContentInfo_new_ex(NULL, "-fips");
++    if (!cms)
++        goto cleanup;
++#endif
++
+     /* decode received CMS message */
+-    if ((cms = d2i_CMS_ContentInfo(NULL, &p, (int)signed_data_len)) == NULL) {
++    if (!d2i_CMS_ContentInfo(&cms, &p, (int)signed_data_len)) {
+         retval = oerr(context, 0, _("Failed to decode CMS message"));
+         goto cleanup;
+     }
+-- 
+2.45.1
+
diff --git a/0014-Enable-PKINIT-if-at-least-one-group-is-available.patch b/0014-Enable-PKINIT-if-at-least-one-group-is-available.patch
new file mode 100644
index 0000000..30646aa
--- /dev/null
+++ b/0014-Enable-PKINIT-if-at-least-one-group-is-available.patch
@@ -0,0 +1,218 @@
+From c24c9faf859ddc04910a6bc591d8ddb2ada93e80 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Tue, 30 May 2023 01:21:48 -0400
+Subject: [PATCH] Enable PKINIT if at least one group is available
+
+OpenSSL may no longer allow decoding of non-well-known Diffie-Hellman
+group parameters as EVP_PKEY objects in FIPS mode.  However, OpenSSL
+does not know about MODP group 2 (1024-bit), which is considered as a
+custom group.  As a consequence, the PKINIT kdcpreauth module fails to
+load in FIPS mode.
+
+Allow initialization of PKINIT plugin if at least one of the MODP
+well-known group parameters successfully decodes.
+
+[ghudson@mit.edu: minor commit message and code edits]
+
+ticket: 9096 (new)
+(cherry picked from commit 509d8db922e9ad6f108883838473b6178f89874a)
+---
+ src/plugins/preauth/pkinit/pkinit_clnt.c      |  2 +-
+ src/plugins/preauth/pkinit/pkinit_crypto.h    |  3 +-
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 76 +++++++++++--------
+ src/plugins/preauth/pkinit/pkinit_srv.c       |  2 +-
+ src/plugins/preauth/pkinit/pkinit_trace.h     |  3 +
+ 5 files changed, 51 insertions(+), 35 deletions(-)
+
+diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
+index 725d5bc438..ea9ba454df 100644
+--- a/src/plugins/preauth/pkinit/pkinit_clnt.c
++++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
+@@ -1378,7 +1378,7 @@ pkinit_client_plugin_init(krb5_context context,
+     if (retval)
+         goto errout;
+ 
+-    retval = pkinit_init_plg_crypto(&ctx->cryptoctx);
++    retval = pkinit_init_plg_crypto(context, &ctx->cryptoctx);
+     if (retval)
+         goto errout;
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h
+index 9fa315d7a0..8bdbea8e95 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto.h
++++ b/src/plugins/preauth/pkinit/pkinit_crypto.h
+@@ -103,7 +103,8 @@ typedef struct _pkinit_cert_matching_data {
+ /*
+  * Functions to initialize and cleanup crypto contexts
+  */
+-krb5_error_code pkinit_init_plg_crypto(pkinit_plg_crypto_context *);
++krb5_error_code pkinit_init_plg_crypto(krb5_context,
++				       pkinit_plg_crypto_context *);
+ void pkinit_fini_plg_crypto(pkinit_plg_crypto_context);
+ 
+ krb5_error_code pkinit_init_req_crypto(pkinit_req_crypto_context *);
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 17dd18e37d..8cdc40bfb4 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -47,7 +47,8 @@
+ static krb5_error_code pkinit_init_pkinit_oids(pkinit_plg_crypto_context );
+ static void pkinit_fini_pkinit_oids(pkinit_plg_crypto_context );
+ 
+-static krb5_error_code pkinit_init_dh_params(pkinit_plg_crypto_context );
++static krb5_error_code pkinit_init_dh_params(krb5_context,
++                                             pkinit_plg_crypto_context);
+ static void pkinit_fini_dh_params(pkinit_plg_crypto_context );
+ 
+ static krb5_error_code pkinit_init_certs(pkinit_identity_crypto_context ctx);
+@@ -951,7 +952,8 @@ oerr_cert(krb5_context context, krb5_error_code code, X509_STORE_CTX *certctx,
+ }
+ 
+ krb5_error_code
+-pkinit_init_plg_crypto(pkinit_plg_crypto_context *cryptoctx)
++pkinit_init_plg_crypto(krb5_context context,
++                       pkinit_plg_crypto_context *cryptoctx)
+ {
+     krb5_error_code retval = ENOMEM;
+     pkinit_plg_crypto_context ctx = NULL;
+@@ -969,7 +971,7 @@ pkinit_init_plg_crypto(pkinit_plg_crypto_context *cryptoctx)
+     if (retval)
+         goto out;
+ 
+-    retval = pkinit_init_dh_params(ctx);
++    retval = pkinit_init_dh_params(context, ctx);
+     if (retval)
+         goto out;
+ 
+@@ -1278,30 +1280,36 @@ pkinit_fini_pkinit_oids(pkinit_plg_crypto_context ctx)
+     ASN1_OBJECT_free(ctx->id_kp_serverAuth);
+ }
+ 
+-static krb5_error_code
+-pkinit_init_dh_params(pkinit_plg_crypto_context plgctx)
++static int
++try_import_group(krb5_context context, const krb5_data *params,
++                 const char *name, EVP_PKEY **pkey_out)
+ {
+-    krb5_error_code retval = ENOMEM;
+-
+-    plgctx->dh_1024 = decode_dh_params(&oakley_1024);
+-    if (plgctx->dh_1024 == NULL)
+-        goto cleanup;
+-
+-    plgctx->dh_2048 = decode_dh_params(&oakley_2048);
+-    if (plgctx->dh_2048 == NULL)
+-        goto cleanup;
++    *pkey_out = decode_dh_params(params);
++    if (*pkey_out == NULL)
++        TRACE_PKINIT_DH_GROUP_UNAVAILABLE(context, name);
++    return (*pkey_out != NULL) ? 1 : 0;
++}
+ 
+-    plgctx->dh_4096 = decode_dh_params(&oakley_4096);
+-    if (plgctx->dh_4096 == NULL)
+-        goto cleanup;
++static krb5_error_code
++pkinit_init_dh_params(krb5_context context, pkinit_plg_crypto_context plgctx)
++{
++    int n = 0;
+ 
+-    retval = 0;
++    n += try_import_group(context, &oakley_1024, "MODP 2 (1024-bit)",
++                          &plgctx->dh_1024);
++    n += try_import_group(context, &oakley_2048, "MODP 14 (2048-bit)",
++                          &plgctx->dh_2048);
++    n += try_import_group(context, &oakley_4096, "MODP 16 (4096-bit)",
++                          &plgctx->dh_4096);
+ 
+-cleanup:
+-    if (retval)
++    if (n == 0) {
+         pkinit_fini_dh_params(plgctx);
++        k5_setmsg(context, ENOMEM,
++                  _("PKINIT cannot initialize any key exchange groups"));
++        return ENOMEM;
++    }
+ 
+-    return retval;
++    return 0;
+ }
+ 
+ static void
+@@ -2912,11 +2920,11 @@ client_create_dh(krb5_context context,
+ 
+     if (cryptoctx->received_params != NULL)
+         params = cryptoctx->received_params;
+-    else if (dh_size == 1024)
++    else if (plg_cryptoctx->dh_1024 != NULL && dh_size == 1024)
+         params = plg_cryptoctx->dh_1024;
+-    else if (dh_size == 2048)
++    else if (plg_cryptoctx->dh_2048 != NULL && dh_size == 2048)
+         params = plg_cryptoctx->dh_2048;
+-    else if (dh_size == 4096)
++    else if (plg_cryptoctx->dh_4096 != NULL && dh_size == 4096)
+         params = plg_cryptoctx->dh_4096;
+     else
+         goto cleanup;
+@@ -3212,19 +3220,23 @@ pkinit_create_td_dh_parameters(krb5_context context,
+     krb5_algorithm_identifier alg_4096 = { dh_oid, oakley_4096 };
+     krb5_algorithm_identifier *alglist[4];
+ 
+-    if (opts->dh_min_bits > 4096) {
+-        ret = KRB5KRB_ERR_GENERIC;
+-        goto cleanup;
+-    }
+-
+     i = 0;
+-    if (opts->dh_min_bits <= 2048)
++    if (plg_cryptoctx->dh_2048 != NULL && opts->dh_min_bits <= 2048)
+         alglist[i++] = &alg_2048;
+-    alglist[i++] = &alg_4096;
+-    if (opts->dh_min_bits <= 1024)
++    if (plg_cryptoctx->dh_4096 != NULL && opts->dh_min_bits <= 4096)
++        alglist[i++] = &alg_4096;
++    if (plg_cryptoctx->dh_1024 != NULL && opts->dh_min_bits <= 1024)
+         alglist[i++] = &alg_1024;
+     alglist[i] = NULL;
+ 
++    if (i == 0) {
++        ret = KRB5KRB_ERR_GENERIC;
++        k5_setmsg(context, ret,
++                  _("OpenSSL has no supported key exchange groups for "
++                    "pkinit_dh_min_bits=%d"), opts->dh_min_bits);
++        goto cleanup;
++    }
++
+     ret = k5int_encode_krb5_td_dh_parameters(alglist, &der_alglist);
+     if (ret)
+         goto cleanup;
+diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
+index 1b3bf6d4d0..768a4e559f 100644
+--- a/src/plugins/preauth/pkinit/pkinit_srv.c
++++ b/src/plugins/preauth/pkinit/pkinit_srv.c
+@@ -1222,7 +1222,7 @@ pkinit_server_plugin_init_realm(krb5_context context, const char *realmname,
+         goto errout;
+     plgctx->realmname_len = strlen(plgctx->realmname);
+ 
+-    retval = pkinit_init_plg_crypto(&plgctx->cryptoctx);
++    retval = pkinit_init_plg_crypto(context, &plgctx->cryptoctx);
+     if (retval)
+         goto errout;
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
+index 259e95c6c2..5ee39c085c 100644
+--- a/src/plugins/preauth/pkinit/pkinit_trace.h
++++ b/src/plugins/preauth/pkinit/pkinit_trace.h
+@@ -90,6 +90,9 @@
+ #define TRACE_PKINIT_CLIENT_TRYAGAIN(c)                                 \
+     TRACE(c, "PKINIT client trying again with KDC-provided parameters")
+ 
++#define TRACE_PKINIT_DH_GROUP_UNAVAILABLE(c, name)                      \
++    TRACE(c, "PKINIT key exchange group {str} unsupported", name)
++
+ #define TRACE_PKINIT_OPENSSL_ERROR(c, msg)              \
+     TRACE(c, "PKINIT OpenSSL error: {str}", msg)
+ 
+-- 
+2.45.1
+
diff --git a/0015-Replace-ssl.wrap_socket-for-tests.patch b/0015-Replace-ssl.wrap_socket-for-tests.patch
new file mode 100644
index 0000000..34cef96
--- /dev/null
+++ b/0015-Replace-ssl.wrap_socket-for-tests.patch
@@ -0,0 +1,64 @@
+From e92365b510a2407eaceaec90836f5c713403d75f Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Wed, 19 Jul 2023 13:43:17 +0200
+Subject: [PATCH] Replace ssl.wrap_socket() for tests
+
+The ssl.wrap_socket() function was deprecated in Python 3.7 and is
+removed in Python 3.12.  The ssl.SSLContext.wrap_socket() method
+replaces it.
+
+Bump the required Python version for tests to 3.4 for
+ssl.create_default_context().
+
+[ghudson@mit.edu: changed minimum Python version]
+
+(cherry picked from commit 0ceab6c363e65fb21d3312a663f2b9b569ecc415)
+---
+ src/configure.ac             | 9 ++++-----
+ src/util/wsgiref-kdcproxy.py | 4 +++-
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/configure.ac b/src/configure.ac
+index 2561e917a2..487f393146 100644
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -1157,10 +1157,9 @@ AC_SUBST(PKINIT)
+ # for lib/apputils
+ AC_REPLACE_FUNCS(daemon)
+ 
+-# For Python tests.  Python version 3.2.4 is required as prior
+-# versions do not accept string input to subprocess.Popen.communicate
+-# when universal_newlines is set.
+-PYTHON_MINVERSION=3.2.4
++# For Python tests.  Python version 3.4 is required for
++# ssl.create_default_context().
++PYTHON_MINVERSION=3.4
+ AC_SUBST(PYTHON_MINVERSION)
+ AC_CHECK_PROG(PYTHON,python3,python3)
+ if test x"$PYTHON" = x; then
+@@ -1168,7 +1167,7 @@ if test x"$PYTHON" = x; then
+ fi
+ HAVE_PYTHON=no
+ if test x"$PYTHON" != x; then
+-	wantver="(sys.hexversion >= 0x30204F0)"
++	wantver="(sys.hexversion >= 0x30400F0)"
+ 	if "$PYTHON" -c "import sys; sys.exit(not $wantver and 1 or 0)"; then
+ 		HAVE_PYTHON=yes
+ 	fi
+diff --git a/src/util/wsgiref-kdcproxy.py b/src/util/wsgiref-kdcproxy.py
+index 58759696b6..d1d10d733c 100755
+--- a/src/util/wsgiref-kdcproxy.py
++++ b/src/util/wsgiref-kdcproxy.py
+@@ -14,6 +14,8 @@ else:
+     pem = '*'
+ 
+ server = make_server('localhost', port, kdcproxy.Application())
+-server.socket = ssl.wrap_socket(server.socket, certfile=pem, server_side=True)
++sslctx = ssl.create_default_context(purpose=ssl.Purpose.CLIENT_AUTH)
++sslctx.load_cert_chain(certfile=pem)
++server.socket = sslctx.wrap_socket(server.socket, server_side=True)
+ os.write(sys.stdout.fileno(), b'proxy server ready\n')
+ server.serve_forever()
+-- 
+2.45.1
+
diff --git a/0016-Eliminate-old-style-function-declarations.patch b/0016-Eliminate-old-style-function-declarations.patch
new file mode 100644
index 0000000..2b07a72
--- /dev/null
+++ b/0016-Eliminate-old-style-function-declarations.patch
@@ -0,0 +1,10685 @@
+From 1ad0abf12b212d19ac7b3903deeaf7fff4e2c3cf Mon Sep 17 00:00:00 2001
+From: Ken Hornstein <kenh@cmf.nrl.navy.mil>
+Date: Fri, 9 Jun 2023 23:53:53 -0400
+Subject: [PATCH] Eliminate old-style function declarations
+
+The C2x standard removes support for non-prototype function
+declarations, and clang 15 issues warnings for them
+(https://reviews.llvm.org/D122895).  Add -Werror=strict-prototypes to
+the build and fix all of the non-prototype declarations and
+definitions.
+
+For RPC code, try to be consistent with libtirpc and recent *BSD
+versions of rpcgen.  This includes casting each time a concrete
+function is used as an xdrproc_t value, since each XDR per-type
+function accepts a different object pointer type.  A few invocations
+of xdrproc_t values pass a third argument with value LASTUNSIGNED,
+even though XDR per-type functions accept only two parameters.
+libtirpc has removed these third arguments; do so here as well.
+
+[ghudson@mit.edu: added -Werror=strict-prototypes and fixed
+declarations it breaks under gcc and clang; added xdrproc_t changes;
+rewrote commit message; style changes]
+
+(cherry picked from commit 4b9d7f7c107f01a61600fddcd8cde3812d0366a2)
+---
+ src/aclocal.m4                                |   2 +-
+ src/appl/gss-sample/gss-client.c              |  29 +---
+ src/appl/gss-sample/gss-misc.c                |  26 +--
+ src/appl/gss-sample/gss-server.c              |   2 +-
+ src/appl/user_user/server.c                   |   5 +-
+ src/clients/kdestroy/kdestroy.c               |   2 +-
+ src/clients/kinit/kinit.c                     |   4 +-
+ src/clients/klist/klist.c                     |   2 +-
+ src/clients/ksu/authorization.c               |  95 ++++------
+ src/clients/ksu/ccache.c                      | 108 ++++--------
+ src/clients/ksu/heuristic.c                   |  94 ++++------
+ src/clients/ksu/krb_auth_su.c                 |  49 ++----
+ src/clients/ksu/main.c                        |  40 ++---
+ src/clients/kvno/kvno.c                       |   2 +-
+ src/include/gssrpc/auth_gssapi.h              |  10 +-
+ src/include/gssrpc/xdr.h                      |   3 +-
+ src/include/k5-int.h                          |   2 +-
+ src/include/k5-plugin.h                       |   2 +-
+ src/include/net-server.h                      |   6 +-
+ src/kadmin/cli/getdate.y                      |   3 -
+ src/kadmin/cli/kadmin.c                       |   6 +-
+ src/kadmin/cli/keytab.c                       |   4 +-
+ src/kadmin/dbutil/kdb5_create.c               |  16 +-
+ src/kadmin/dbutil/kdb5_destroy.c              |   4 +-
+ src/kadmin/dbutil/kdb5_stash.c                |   4 +-
+ src/kadmin/dbutil/kdb5_util.c                 |  24 +--
+ src/kadmin/dbutil/ovload.c                    |  14 +-
+ src/kadmin/dbutil/strtok.c                    |   4 +-
+ src/kadmin/ktutil/ktutil.c                    |  45 ++---
+ src/kadmin/ktutil/ktutil_funcs.c              |  37 ++--
+ src/kadmin/server/ipropd_svc.c                |  24 +--
+ src/kadmin/server/kadm_rpc_svc.c              | 162 +++++++++---------
+ src/kadmin/server/ovsec_kadmd.c               |   4 +-
+ src/kdc/t_ndr.c                               |   2 +-
+ src/kdc/t_replay.c                            |   6 +-
+ src/kprop/kpropd.c                            |   2 +-
+ src/kprop/kproplog.c                          |   4 +-
+ src/lib/apputils/net-server.c                 |   7 +-
+ src/lib/crypto/builtin/aes/aes-gen.c          |  18 +-
+ .../crypto/builtin/camellia/camellia-gen.c    |  18 +-
+ src/lib/crypto/builtin/sha1/t_shs.c           |   7 +-
+ src/lib/crypto/builtin/sha1/t_shs3.c          |   7 +-
+ src/lib/crypto/crypto_tests/aes-test.c        |   8 +-
+ src/lib/crypto/crypto_tests/camellia-test.c   |   8 +-
+ src/lib/crypto/crypto_tests/t_cf2.c           |   4 +-
+ src/lib/crypto/crypto_tests/t_cts.c           |   2 +-
+ src/lib/crypto/crypto_tests/t_encrypt.c       |   2 +-
+ src/lib/crypto/crypto_tests/t_fork.c          |   2 +-
+ src/lib/crypto/crypto_tests/t_hmac.c          |   3 +-
+ src/lib/crypto/crypto_tests/t_mddriver.c      |  25 ++-
+ src/lib/crypto/crypto_tests/t_nfold.c         |  16 +-
+ src/lib/crypto/crypto_tests/t_prf.c           |   2 +-
+ src/lib/crypto/crypto_tests/t_sha2.c          |   2 +-
+ src/lib/gssapi/generic/t_seqstate.c           |   2 +-
+ src/lib/gssapi/krb5/accept_sec_context.c      |  76 +++-----
+ src/lib/gssapi/krb5/compare_name.c            |   7 +-
+ src/lib/gssapi/krb5/context_time.c            |   6 +-
+ src/lib/gssapi/krb5/delete_sec_context.c      |   7 +-
+ src/lib/gssapi/krb5/disp_name.c               |   9 +-
+ src/lib/gssapi/krb5/disp_status.c             |  11 +-
+ src/lib/gssapi/krb5/export_sec_context.c      |   7 +-
+ src/lib/gssapi/krb5/gssapi_krb5.c             |   4 +-
+ src/lib/gssapi/krb5/import_name.c             |   8 +-
+ src/lib/gssapi/krb5/import_sec_context.c      |  10 +-
+ src/lib/gssapi/krb5/indicate_mechs.c          |   4 +-
+ src/lib/gssapi/krb5/init_sec_context.c        |  55 ++----
+ src/lib/gssapi/krb5/inq_context.c             |  17 +-
+ src/lib/gssapi/krb5/inq_cred.c                |  26 +--
+ src/lib/gssapi/krb5/inq_names.c               |   6 +-
+ src/lib/gssapi/krb5/k5seal.c                  |  38 ++--
+ src/lib/gssapi/krb5/k5unseal.c                |  51 ++----
+ src/lib/gssapi/krb5/process_context_token.c   |   8 +-
+ src/lib/gssapi/krb5/rel_cred.c                |   4 +-
+ src/lib/gssapi/krb5/rel_name.c                |   4 +-
+ src/lib/gssapi/krb5/rel_oid.c                 |   8 +-
+ src/lib/gssapi/krb5/ser_sctx.c                |  16 +-
+ src/lib/gssapi/krb5/util_cksum.c              |   6 +-
+ src/lib/gssapi/krb5/util_seed.c               |   5 +-
+ src/lib/gssapi/krb5/util_seqnum.c             |  19 +-
+ src/lib/gssapi/krb5/val_cred.c                |   4 +-
+ src/lib/gssapi/krb5/wrap_size_limit.c         |  11 +-
+ .../gssapi/mechglue/g_accept_sec_context.c    |  31 +---
+ src/lib/gssapi/mechglue/g_acquire_cred.c      |  95 +++-------
+ .../gssapi/mechglue/g_acquire_cred_with_pw.c  |  56 ++----
+ src/lib/gssapi/mechglue/g_canon_name.c        |  10 +-
+ src/lib/gssapi/mechglue/g_compare_name.c      |  12 +-
+ src/lib/gssapi/mechglue/g_context_time.c      |  10 +-
+ .../gssapi/mechglue/g_delete_sec_context.c    |  10 +-
+ src/lib/gssapi/mechglue/g_dsp_name.c          |  12 +-
+ src/lib/gssapi/mechglue/g_dsp_status.c        |  22 +--
+ src/lib/gssapi/mechglue/g_dup_name.c          |   8 +-
+ src/lib/gssapi/mechglue/g_exp_sec_context.c   |  10 +-
+ src/lib/gssapi/mechglue/g_export_name.c       |   8 +-
+ src/lib/gssapi/mechglue/g_glue.c              |  75 +++-----
+ src/lib/gssapi/mechglue/g_imp_name.c          |  18 +-
+ src/lib/gssapi/mechglue/g_imp_sec_context.c   |  11 +-
+ src/lib/gssapi/mechglue/g_init_sec_context.c  |  37 +---
+ src/lib/gssapi/mechglue/g_initialize.c        |  22 +--
+ src/lib/gssapi/mechglue/g_inq_cred.c          |  31 +---
+ src/lib/gssapi/mechglue/g_inq_names.c         |   8 +-
+ src/lib/gssapi/mechglue/g_mechname.c          |  14 +-
+ src/lib/gssapi/mechglue/g_oid_ops.c           |  27 +--
+ src/lib/gssapi/mechglue/g_process_context.c   |  10 +-
+ src/lib/gssapi/mechglue/g_rel_buffer.c        |   6 +-
+ src/lib/gssapi/mechglue/g_rel_cred.c          |   7 +-
+ src/lib/gssapi/mechglue/g_rel_name.c          |   7 +-
+ src/lib/gssapi/mechglue/g_rel_oid_set.c       |   6 +-
+ src/lib/gssapi/mechglue/g_sign.c              |  29 +---
+ src/lib/gssapi/mechglue/g_store_cred.c        |  48 ++----
+ src/lib/gssapi/mechglue/g_unseal.c            |  35 +---
+ src/lib/gssapi/mechglue/g_unwrap_aead.c       |  19 +-
+ src/lib/gssapi/mechglue/g_unwrap_iov.c        |  15 +-
+ src/lib/gssapi/mechglue/g_verify.c            |  30 +---
+ src/lib/gssapi/mechglue/g_wrap_aead.c         |  39 ++---
+ src/lib/gssapi/mechglue/g_wrap_iov.c          |  43 +----
+ src/lib/kadm5/clnt/client_rpc.c               |   1 +
+ src/lib/kadm5/kadm_rpc.h                      |  45 -----
+ src/lib/kadm5/kadm_rpc_xdr.c                  |  37 ++--
+ src/lib/kadm5/misc_free.c                     |   5 +-
+ src/lib/kadm5/srv/adb_xdr.c                   |   6 +-
+ src/lib/kadm5/srv/svr_principal.c             |  12 +-
+ src/lib/kadm5/str_conv.c                      |  18 +-
+ src/lib/kadm5/t_kadm5.c                       |  22 +--
+ src/lib/kdb/kdb5.c                            |   8 +-
+ src/lib/kdb/kdb_cpw.c                         |  32 +---
+ src/lib/kdb/keytab.c                          |  19 +-
+ src/lib/kdb/t_stringattr.c                    |   2 +-
+ src/lib/krad/packet.c                         |   2 +-
+ src/lib/krad/t_attr.c                         |   2 +-
+ src/lib/krad/t_attrset.c                      |   2 +-
+ src/lib/krad/t_code.c                         |   2 +-
+ src/lib/krb5/ccache/cc_keyring.c              |   2 +-
+ src/lib/krb5/krb/plugin.c                     |   2 +-
+ src/lib/krb5/krb/t_authdata.c                 |   2 +-
+ src/lib/krb5/krb/t_response_items.c           |   2 +-
+ src/lib/krb5/krb/t_ser.c                      |   8 +-
+ src/lib/krb5/krb/t_sname_match.c              |   2 +-
+ src/lib/krb5/krb/t_valid_times.c              |   2 +-
+ src/lib/krb5/rcache/t_memrcache.c             |   2 +-
+ src/lib/rpc/auth_gss.c                        |   4 +-
+ src/lib/rpc/auth_gssapi.c                     |  14 +-
+ src/lib/rpc/auth_gssapi_misc.c                |   4 +-
+ src/lib/rpc/authunix_prot.c                   |   3 +-
+ src/lib/rpc/clnt_perror.c                     |   1 -
+ src/lib/rpc/clnt_raw.c                        |   2 +-
+ src/lib/rpc/dyn.c                             |  85 ++++-----
+ src/lib/rpc/pmap_clnt.c                       |   9 +-
+ src/lib/rpc/pmap_getmaps.c                    |   5 +-
+ src/lib/rpc/pmap_getport.c                    |   6 +-
+ src/lib/rpc/pmap_prot2.c                      |   3 +-
+ src/lib/rpc/pmap_rmt.c                        |  10 +-
+ src/lib/rpc/rpc_prot.c                        |   4 +-
+ src/lib/rpc/svc.c                             |   4 +-
+ src/lib/rpc/svc_auth_gss.c                    |  10 +-
+ src/lib/rpc/svc_auth_gssapi.c                 |  28 +--
+ src/lib/rpc/svc_simple.c                      |   4 +-
+ src/lib/rpc/unit-test/client.c                |  18 +-
+ src/lib/rpc/unit-test/rpc_test_clnt.c         |   4 +-
+ src/lib/rpc/unit-test/rpc_test_svc.c          |  16 +-
+ src/lib/rpc/unit-test/server.c                |   2 +-
+ src/lib/rpc/xdr.c                             |   4 +-
+ src/lib/rpc/xdr_array.c                       |   4 +-
+ src/lib/rpc/xdr_rec.c                         |  13 +-
+ src/lib/rpc/xdr_reference.c                   |   4 +-
+ src/lib/rpc/xdr_sizeof.c                      |  29 +---
+ src/plugins/kdb/db2/db2_exp.c                 |   4 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_close.c   |  10 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_conv.c    |  13 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_delete.c  |  34 +---
+ src/plugins/kdb/db2/libdb2/btree/bt_get.c     |   6 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_open.c    |  12 +-
+ .../kdb/db2/libdb2/btree/bt_overflow.c        |  16 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_page.c    |   8 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_put.c     |  11 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_search.c  |  17 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_seq.c     |  27 +--
+ src/plugins/kdb/db2/libdb2/btree/bt_split.c   |  42 +----
+ src/plugins/kdb/db2/libdb2/btree/bt_utils.c   |  18 +-
+ src/plugins/kdb/db2/libdb2/db/db.c            |  26 ++-
+ src/plugins/kdb/db2/libdb2/hash/dbm.c         |  50 ++----
+ src/plugins/kdb/db2/libdb2/hash/hash.c        |  94 +++-------
+ src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c |  35 +---
+ src/plugins/kdb/db2/libdb2/hash/hash_func.c   |  16 +-
+ src/plugins/kdb/db2/libdb2/hash/hash_log2.c   |   3 +-
+ src/plugins/kdb/db2/libdb2/hash/hash_page.c   | 121 ++++---------
+ src/plugins/kdb/db2/libdb2/hash/hsearch.c     |   9 +-
+ src/plugins/kdb/db2/libdb2/mpool/mpool.c      |  54 ++----
+ src/plugins/kdb/db2/libdb2/recno/rec_close.c  |   7 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_delete.c |  14 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_get.c    |  22 +--
+ src/plugins/kdb/db2/libdb2/recno/rec_open.c   |   9 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_put.c    |  12 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_search.c |   5 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_seq.c    |   5 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_utils.c  |   6 +-
+ src/plugins/kdb/db2/libdb2/test/dbtest.c      |  59 ++-----
+ src/plugins/kdb/db2/pol_xdr.c                 |   2 +-
+ .../kdb/ldap/ldap_util/kdb5_ldap_util.c       |   4 +-
+ src/plugins/kdb/lmdb/kdb_lmdb.c               |   4 +-
+ src/plugins/kdb/test/kdb_test.c               |   4 +-
+ .../preauth/pkinit/pkinit_crypto_openssl.c    |   4 +-
+ src/plugins/preauth/spake/t_vectors.c         |   2 +-
+ src/tests/asn.1/krb5_decode_test.c            |   5 +-
+ src/tests/asn.1/krb5_encode_test.c            |  13 +-
+ src/tests/asn.1/t_trval.c                     |  14 +-
+ src/tests/asn.1/trval.c                       |  73 +++-----
+ src/tests/conccache.c                         |   4 +-
+ src/tests/create/kdb5_mkdums.c                |  16 +-
+ src/tests/forward.c                           |   2 +-
+ src/tests/gss-threads/gss-client.c            |   4 +-
+ src/tests/gss-threads/gss-server.c            |   2 +-
+ src/tests/gssapi/reload.c                     |   2 +-
+ src/tests/gssapi/t_add_cred.c                 |   2 +-
+ src/tests/gssapi/t_enctypes.c                 |   2 +-
+ src/tests/gssapi/t_invalid.c                  |   2 +-
+ src/tests/gssapi/t_oid.c                      |   2 +-
+ src/tests/gssapi/t_spnego.c                   |   2 +-
+ src/tests/hammer/kdc5_hammer.c                |  36 ++--
+ src/tests/kdbtest.c                           |   2 +-
+ src/tests/misc/test_getpw.c                   |   2 +-
+ src/tests/plugorder.c                         |   2 +-
+ src/tests/shlib/t_loader.c                    |   2 +-
+ src/tests/softpkcs11/main.c                   |   2 +-
+ src/tests/t_inetd.c                           |   7 +-
+ src/tests/test1.c                             |   4 +-
+ src/tests/verify/kdb5_verify.c                |  17 +-
+ src/util/et/error_message.c                   |   2 +-
+ src/util/et/test_et.c                         |   3 +-
+ src/util/profile/prof_init.c                  |   2 +-
+ src/util/profile/t_profile.c                  |  22 +--
+ src/util/profile/test_load.c                  |   2 +-
+ src/util/profile/test_parse.c                 |   5 +-
+ src/util/profile/test_profile.c               |  10 +-
+ src/util/profile/test_vtable.c                |   3 +-
+ src/util/ss/error.c                           |  13 +-
+ src/util/ss/execute_cmd.c                     |  23 +--
+ src/util/ss/help.c                            | 115 ++++++-------
+ src/util/ss/invocation.c                      |  13 +-
+ src/util/ss/list_rqs.c                        |  11 +-
+ src/util/ss/listen.c                          |  32 ++--
+ src/util/ss/pager.c                           |  10 +-
+ src/util/ss/parse.c                           |   6 +-
+ src/util/ss/prompt.c                          |   7 +-
+ src/util/ss/request_tbl.c                     |  11 +-
+ src/util/ss/requests.c                        |   2 +-
+ src/util/ss/ss.h                              |   1 -
+ src/util/ss/ss_internal.h                     |   3 +-
+ src/util/support/plugins.c                    |  10 +-
+ src/util/support/t_hashtab.c                  |   6 +-
+ src/util/support/t_hex.c                      |   3 +-
+ src/util/support/t_json.c                     |   2 +-
+ src/util/support/t_k5buf.c                    |  16 +-
+ src/util/support/t_unal.c                     |   3 +-
+ 253 files changed, 1379 insertions(+), 2717 deletions(-)
+
+diff --git a/src/aclocal.m4 b/src/aclocal.m4
+index 3331970930..040d5bdd0c 100644
+--- a/src/aclocal.m4
++++ b/src/aclocal.m4
+@@ -546,7 +546,7 @@ if test "$GCC" = yes ; then
+     TRY_WARN_CC_FLAG(-Wno-format-zero-length)
+     # Other flags here may not be supported on some versions of
+     # gcc that people want to use.
+-    for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized no-maybe-uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers error=implicit-int ; do
++    for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized no-maybe-uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers error=implicit-int error=strict-prototypes; do
+       TRY_WARN_CC_FLAG(-W$flag)
+     done
+     #  old-style-definition? generates many, many warnings
+diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c
+index 6e2aa33690..0722ae196f 100644
+--- a/src/appl/gss-sample/gss-client.c
++++ b/src/appl/gss-sample/gss-client.c
+@@ -75,7 +75,7 @@ static gss_OID_desc gss_spnego_mechanism_oid_desc =
+ {6, (void *)"\x2b\x06\x01\x05\x05\x02"};
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-client [-port port] [-mech mechanism] "
+             "[-spnego] [-d]\n");
+@@ -359,9 +359,7 @@ client_establish_context(int s, char *service_name, OM_uint32 gss_flags,
+ }
+ 
+ static void
+-read_file(file_name, in_buf)
+-    char   *file_name;
+-    gss_buffer_t in_buf;
++read_file(char *file_name, gss_buffer_t in_buf)
+ {
+     int     fd, count;
+     struct stat stat_buf;
+@@ -431,21 +429,10 @@ read_file(file_name, in_buf)
+  * verifies it with gss_verify.  -1 is returned if any step fails,
+  * otherwise 0 is returned.  */
+ static int
+-call_server(host, port, oid, service_name, gss_flags, auth_flag,
+-            wrap_flag, encrypt_flag, mic_flag, v1_format, msg, use_file,
+-            mcount, username, password)
+-    char   *host;
+-    u_short port;
+-    gss_OID oid;
+-    char   *service_name;
+-    OM_uint32 gss_flags;
+-    int     auth_flag, wrap_flag, encrypt_flag, mic_flag;
+-    int     v1_format;
+-    char   *msg;
+-    int     use_file;
+-    int     mcount;
+-    char    *username;
+-    char    *password;
++call_server(char *host, u_short port, gss_OID oid, char *service_name,
++            OM_uint32 gss_flags, int auth_flag, int wrap_flag,
++            int encrypt_flag, int mic_flag, int v1_format, char *msg,
++            int use_file, int mcount, char *username, char *password)
+ {
+     gss_ctx_id_t context = GSS_C_NO_CONTEXT;
+     gss_buffer_desc in_buf, out_buf;
+@@ -774,9 +761,7 @@ worker_bee(void *unused)
+ }
+ 
+ int
+-main(argc, argv)
+-    int     argc;
+-    char  **argv;
++main(int argc, char **argv)
+ {
+     int     i;
+ 
+diff --git a/src/appl/gss-sample/gss-misc.c b/src/appl/gss-sample/gss-misc.c
+index 1d051edf1e..7eb4c7971d 100644
+--- a/src/appl/gss-sample/gss-misc.c
++++ b/src/appl/gss-sample/gss-misc.c
+@@ -157,10 +157,7 @@ read_all(int fildes, void *data, unsigned int nbyte)
+  * if an error occurs or if it could not write all the data.
+  */
+ int
+-send_token(s, flags, tok)
+-    int     s;
+-    int     flags;
+-    gss_buffer_t tok;
++send_token(int s, int flags, gss_buffer_t tok)
+ {
+     int     ret;
+     unsigned char char_flags = (unsigned char) flags;
+@@ -230,10 +227,7 @@ send_token(s, flags, tok)
+  * and -1 if an error occurs or if it could not read all the data.
+  */
+ int
+-recv_token(s, flags, tok)
+-    int     s;
+-    int    *flags;
+-    gss_buffer_t tok;
++recv_token(int s, int *flags, gss_buffer_t tok)
+ {
+     int     ret;
+     unsigned char char_flags;
+@@ -303,10 +297,7 @@ recv_token(s, flags, tok)
+ }
+ 
+ static void
+-display_status_1(m, code, type)
+-    char   *m;
+-    OM_uint32 code;
+-    int     type;
++display_status_1(char *m, OM_uint32 code, int type)
+ {
+     OM_uint32 min_stat;
+     gss_buffer_desc msg;
+@@ -344,10 +335,7 @@ display_status_1(m, code, type)
+  * followed by a newline.
+  */
+ void
+-display_status(msg, maj_stat, min_stat)
+-    char   *msg;
+-    OM_uint32 maj_stat;
+-    OM_uint32 min_stat;
++display_status(char *msg, OM_uint32 maj_stat, OM_uint32 min_stat)
+ {
+     display_status_1(msg, maj_stat, GSS_C_GSS_CODE);
+     display_status_1(msg, min_stat, GSS_C_MECH_CODE);
+@@ -370,8 +358,7 @@ display_status(msg, maj_stat, min_stat)
+  */
+ 
+ void
+-display_ctx_flags(flags)
+-    OM_uint32 flags;
++display_ctx_flags(OM_uint32 flags)
+ {
+     if (flags & GSS_C_DELEG_FLAG)
+         fprintf(display_file, "context flag: GSS_C_DELEG_FLAG\n");
+@@ -388,8 +375,7 @@ display_ctx_flags(flags)
+ }
+ 
+ void
+-print_token(tok)
+-    gss_buffer_t tok;
++print_token(gss_buffer_t tok)
+ {
+     unsigned int   i;
+     unsigned char *p = tok->value;
+diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c
+index 9b6ce9ffb3..0e9c857e56 100644
+--- a/src/appl/gss-sample/gss-server.c
++++ b/src/appl/gss-sample/gss-server.c
+@@ -73,7 +73,7 @@ static OM_uint32
+ showLocalIdentity(OM_uint32 *minor, gss_name_t name);
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]");
+ #ifdef _WIN32
+diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
+index f2b5b614e3..afb3d2bcba 100644
+--- a/src/appl/user_user/server.c
++++ b/src/appl/user_user/server.c
+@@ -39,9 +39,8 @@
+ 
+ /* fd 0 is a tcp socket used to talk to the client */
+ 
+-int main(argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     krb5_data pname_data, tkt_data;
+     int sock = 0;
+diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
+index 774b729fdb..48f672a1e8 100644
+--- a/src/clients/kdestroy/kdestroy.c
++++ b/src/clients/kdestroy/kdestroy.c
+@@ -47,7 +47,7 @@ char *progname;
+ 
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("Usage: %s [-A] [-q] [-c cache_name] [-p princ_name]\n"),
+             progname);
+diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
+index f4c7b2b842..7a33ffae59 100644
+--- a/src/clients/kinit/kinit.c
++++ b/src/clients/kinit/kinit.c
+@@ -45,7 +45,7 @@
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+ static char *
+-get_name_from_os()
++get_name_from_os(void)
+ {
+     struct passwd *pw;
+ 
+@@ -137,7 +137,7 @@ const char *shopts = "r:fpFPn54aAVl:s:c:kit:T:RS:vX:CEI:";
+ #define USAGE_BREAK "\n\t"
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr,
+             _("Usage: %s [-V] [-l lifetime] [-s start_time] "
+diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
+index dcdc5a2d59..c797b1698f 100644
+--- a/src/clients/klist/klist.c
++++ b/src/clients/klist/klist.c
+@@ -80,7 +80,7 @@ static void fillit(FILE *, unsigned int, int);
+ #define KEYTAB 2
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("Usage: %s [-e] [-V] [[-c] [-l] [-A] [-d] [-f] [-s] "
+                       "[-a [-n]]] [-k [-i] [-t] [-K]] [-C] [name]\n"),
+diff --git a/src/clients/ksu/authorization.c b/src/clients/ksu/authorization.c
+index fb9d5d0942..17a8a8f2f0 100644
+--- a/src/clients/ksu/authorization.c
++++ b/src/clients/ksu/authorization.c
+@@ -30,9 +30,8 @@
+ 
+ static void auth_cleanup (FILE *, FILE *, char *);
+ 
+-krb5_boolean fowner(fp, uid)
+-    FILE *fp;
+-    uid_t uid;
++krb5_boolean
++fowner(FILE *fp, uid_t uid)
+ {
+     struct stat sbuf;
+ 
+@@ -59,16 +58,10 @@ krb5_boolean fowner(fp, uid)
+  *
+  */
+ 
+-krb5_error_code krb5_authorization(context, principal, luser,
+-                                   cmd, ok, out_fcmd)
+-/* IN */
+-    krb5_context context;
+-    krb5_principal principal;
+-    const char *luser;
+-    char *cmd;
+-    /* OUT */
+-    krb5_boolean *ok;
+-    char **out_fcmd;
++krb5_error_code
++krb5_authorization(krb5_context context, krb5_principal principal,
++                   const char *luser, char *cmd, krb5_boolean *ok,
++                   char **out_fcmd)
+ {
+     struct passwd *pwd;
+     char *princname;
+@@ -178,10 +171,8 @@ any tokens after the principal name  FALSE is returned.
+ 
+ ***********************************************************/
+ 
+-krb5_error_code k5login_lookup (fp, princname, found)
+-    FILE *fp;
+-    char *princname;
+-    krb5_boolean *found;
++krb5_error_code
++k5login_lookup(FILE *fp, char *princname, krb5_boolean *found)
+ {
+ 
+     krb5_error_code retval;
+@@ -240,12 +231,9 @@ if princname is found{
+ 
+ 
+ ***********************************************************/
+-krb5_error_code k5users_lookup (fp, princname, cmd, found, out_fcmd)
+-    FILE *fp;
+-    char *princname;
+-    char *cmd;
+-    krb5_boolean *found;
+-    char **out_fcmd;
++krb5_error_code
++k5users_lookup(FILE *fp, char *princname, char *cmd,
++               krb5_boolean *found, char **out_fcmd)
+ {
+     krb5_error_code retval;
+     char * line;
+@@ -328,10 +316,8 @@ resolves it into a full path name.
+ 
+ ************************************************/
+ 
+-krb5_boolean fcmd_resolve(fcmd, out_fcmd, out_err)
+-    char *fcmd;
+-    char ***out_fcmd;
+-    char **out_err;
++krb5_boolean
++fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+ {
+     char * err;
+     char ** tmp_fcmd;
+@@ -407,8 +393,8 @@ cmd_single - checks if cmd consists of a path
+ 
+ ********************************************/
+ 
+-krb5_boolean cmd_single(cmd)
+-    char * cmd;
++krb5_boolean
++cmd_single(char *cmd)
+ {
+ 
+     if ( ( strrchr( cmd, '/')) ==  NULL){
+@@ -423,9 +409,8 @@ cmd_arr_cmp_postfix - compares a command with the postfix
+          of fcmd
+ ********************************************/
+ 
+-int cmd_arr_cmp_postfix(fcmd_arr, cmd)
+-    char **fcmd_arr;
+-    char *cmd;
++int
++cmd_arr_cmp_postfix(char **fcmd_arr, char *cmd)
+ {
+     char  * temp_fcmd;
+     char *ptr;
+@@ -457,9 +442,8 @@ cmd_arr_cmp - checks if cmd matches any
+ 
+ **********************************************/
+ 
+-int cmd_arr_cmp (fcmd_arr, cmd)
+-    char **fcmd_arr;
+-    char *cmd;
++int
++cmd_arr_cmp(char **fcmd_arr, char *cmd)
+ {
+     int result =1;
+     int i = 0;
+@@ -475,10 +459,8 @@ int cmd_arr_cmp (fcmd_arr, cmd)
+ }
+ 
+ 
+-krb5_boolean find_first_cmd_that_exists(fcmd_arr, cmd_out, err_out)
+-    char **fcmd_arr;
+-    char **cmd_out;
+-    char **err_out;
++krb5_boolean
++find_first_cmd_that_exists(char **fcmd_arr, char **cmd_out, char **err_out)
+ {
+     struct stat st_temp;
+     int i = 0;
+@@ -517,12 +499,9 @@ returns 1 if there is an error, 0 if no error.
+ 
+ ***************************************************************/
+ 
+-int match_commands (fcmd, cmd, match, cmd_out, err_out)
+-    char *fcmd;
+-    char *cmd;
+-    krb5_boolean *match;
+-    char **cmd_out;
+-    char **err_out;
++int
++match_commands(char *fcmd, char *cmd, krb5_boolean *match,
++               char **cmd_out, char **err_out)
+ {
+     char ** fcmd_arr;
+     char * err;
+@@ -566,11 +545,8 @@ int match_commands (fcmd, cmd, match, cmd_out, err_out)
+               is set to null if eof.
+ *********************************************************/
+ 
+-krb5_error_code get_line (fp, out_line)
+-/* IN */
+-    FILE *fp;
+-    /* OUT */
+-    char **out_line;
++krb5_error_code
++get_line(FILE *fp, char **out_line)
+ {
+     char * line, *r, *newline , *line_ptr;
+     int chunk_count = 1;
+@@ -615,9 +591,8 @@ will be returned as part of the first token.
+ Note: this routine reuses the space pointed to by line
+ ******************************************************/
+ 
+-char *  get_first_token (line, lnext)
+-    char *line;
+-    char **lnext;
++char *
++get_first_token(char *line, char **lnext)
+ {
+ 
+     char * lptr, * out_ptr;
+@@ -651,8 +626,8 @@ Note: that this function modifies the stream
+       lnext to the next tocken.
+ **********************************************************/
+ 
+-char *  get_next_token (lnext)
+-    char **lnext;
++char *
++get_next_token (char **lnext)
+ {
+     char * lptr, * out_ptr;
+ 
+@@ -677,10 +652,8 @@ char *  get_next_token (lnext)
+     return out_ptr;
+ }
+ 
+-static void auth_cleanup(users_fp, login_fp, princname)
+-    FILE *users_fp;
+-    FILE *login_fp;
+-    char *princname;
++static void
++auth_cleanup(FILE *users_fp, FILE *login_fp, char *princname)
+ {
+ 
+     free (princname);
+@@ -690,8 +663,8 @@ static void auth_cleanup(users_fp, login_fp, princname)
+         fclose(login_fp);
+ }
+ 
+-void init_auth_names(pw_dir)
+-    char *pw_dir;
++void
++init_auth_names(char *pw_dir)
+ {
+     const char *sep;
+     int r1, r2;
+diff --git a/src/clients/ksu/ccache.c b/src/clients/ksu/ccache.c
+index cbb9aa2b85..cca9ce2dfc 100644
+--- a/src/clients/ksu/ccache.c
++++ b/src/clients/ksu/ccache.c
+@@ -40,24 +40,18 @@ copies the default cache into the secondary cache,
+ 
+ ************************************************************************/
+ 
+-void show_credential();
++void show_credential(krb5_context, krb5_creds *, krb5_ccache);
+ 
+ /* modifies only the cc_other, the algorithm may look a bit funny,
+    but I had to do it this way, since remove function did not come
+    with k5 beta 3 release.
+ */
+ 
+-krb5_error_code krb5_ccache_copy(context, cc_def, target_principal, cc_target,
+-                                 restrict_creds, primary_principal, stored)
+-/* IN */
+-    krb5_context context;
+-    krb5_ccache cc_def;
+-    krb5_principal target_principal;
+-    krb5_ccache cc_target;
+-    krb5_boolean restrict_creds;
+-    krb5_principal primary_principal;
+-    /* OUT */
+-    krb5_boolean *stored;
++krb5_error_code
++krb5_ccache_copy(krb5_context context, krb5_ccache cc_def,
++                 krb5_principal target_principal, krb5_ccache cc_target,
++                 krb5_boolean restrict_creds, krb5_principal primary_principal,
++                 krb5_boolean *stored)
+ {
+     int i=0;
+     krb5_error_code retval=0;
+@@ -105,11 +99,9 @@ krb5_error_code krb5_ccache_copy(context, cc_def, target_principal, cc_target,
+ }
+ 
+ 
+-krb5_error_code krb5_store_all_creds(context, cc, creds_def, creds_other)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_creds **creds_def;
+-    krb5_creds **creds_other;
++krb5_error_code
++krb5_store_all_creds(krb5_context context, krb5_ccache cc,
++                     krb5_creds **creds_def, krb5_creds **creds_other)
+ {
+ 
+     int i = 0;
+@@ -173,10 +165,8 @@ krb5_error_code krb5_store_all_creds(context, cc, creds_def, creds_other)
+     return 0;
+ }
+ 
+-krb5_boolean compare_creds(context, cred1, cred2)
+-    krb5_context context;
+-    krb5_creds *cred1;
+-    krb5_creds *cred2;
++krb5_boolean
++compare_creds(krb5_context context, krb5_creds *cred1, krb5_creds *cred2)
+ {
+     krb5_boolean retval;
+ 
+@@ -188,13 +178,9 @@ krb5_boolean compare_creds(context, cred1, cred2)
+     return retval;
+ }
+ 
+-
+-
+-
+-krb5_error_code krb5_get_nonexp_tkts(context, cc, creds_array)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_creds ***creds_array;
++krb5_error_code
++krb5_get_nonexp_tkts(krb5_context context, krb5_ccache cc,
++                     krb5_creds ***creds_array)
+ {
+ 
+     krb5_creds creds, temp_tktq, temp_tkt;
+@@ -262,10 +248,8 @@ krb5_error_code krb5_get_nonexp_tkts(context, cc, creds_array)
+ 
+ }
+ 
+-
+-krb5_error_code krb5_check_exp(context, tkt_time)
+-    krb5_context context;
+-    krb5_ticket_times tkt_time;
++krb5_error_code
++krb5_check_exp(krb5_context context, krb5_ticket_times tkt_time)
+ {
+     krb5_error_code retval =0;
+     krb5_timestamp currenttime;
+@@ -290,9 +274,8 @@ krb5_error_code krb5_check_exp(context, tkt_time)
+     return 0;
+ }
+ 
+-
+-char *flags_string(cred)
+-    krb5_creds *cred;
++char *
++flags_string(krb5_creds *cred)
+ {
+     static char buf[32];
+     int i = 0;
+@@ -323,7 +306,8 @@ char *flags_string(cred)
+     return(buf);
+ }
+ 
+-void printtime(krb5_timestamp ts)
++void
++printtime(krb5_timestamp ts)
+ {
+     char fmtbuf[18], fill = ' ';
+ 
+@@ -333,9 +317,7 @@ void printtime(krb5_timestamp ts)
+ 
+ 
+ krb5_error_code
+-krb5_get_login_princ(luser, princ_list)
+-    const char *luser;
+-    char ***princ_list;
++krb5_get_login_princ(const char *luser, char ***princ_list)
+ {
+     struct stat sbuf;
+     struct passwd *pwd;
+@@ -420,13 +402,8 @@ krb5_get_login_princ(luser, princ_list)
+     return 0;
+ }
+ 
+-
+-
+ void
+-show_credential(context, cred, cc)
+-    krb5_context context;
+-    krb5_creds *cred;
+-    krb5_ccache cc;
++show_credential(krb5_context context, krb5_creds *cred, krb5_ccache cc)
+ {
+     krb5_error_code retval;
+     char *name, *sname, *flags;
+@@ -519,11 +496,9 @@ gen_sym(krb5_context context, char **sym_out)
+     return 0;
+ }
+ 
+-krb5_error_code krb5_ccache_overwrite(context, ccs, cct, primary_principal)
+-    krb5_context context;
+-    krb5_ccache ccs;
+-    krb5_ccache cct;
+-    krb5_principal primary_principal;
++krb5_error_code
++krb5_ccache_overwrite(krb5_context context, krb5_ccache ccs, krb5_ccache cct,
++                      krb5_principal primary_principal)
+ {
+     krb5_error_code retval=0;
+     krb5_principal temp_principal;
+@@ -560,14 +535,10 @@ krb5_error_code krb5_ccache_overwrite(context, ccs, cct, primary_principal)
+     return retval;
+ }
+ 
+-krb5_error_code krb5_store_some_creds(context, cc, creds_def, creds_other, prst,
+-                                      stored)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_creds **creds_def;
+-    krb5_creds **creds_other;
+-    krb5_principal prst;
+-    krb5_boolean *stored;
++krb5_error_code
++krb5_store_some_creds(krb5_context context, krb5_ccache cc,
++                      krb5_creds **creds_def, krb5_creds **creds_other,
++                      krb5_principal prst, krb5_boolean *stored)
+ {
+ 
+     int i = 0;
+@@ -610,10 +581,8 @@ krb5_error_code krb5_store_some_creds(context, cc, creds_def, creds_other, prst,
+     return 0;
+ }
+ 
+-krb5_error_code krb5_ccache_filter (context, cc, prst)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal prst;
++krb5_error_code
++krb5_ccache_filter(krb5_context context, krb5_ccache cc, krb5_principal prst)
+ {
+ 
+     int i=0;
+@@ -657,10 +626,9 @@ krb5_error_code krb5_ccache_filter (context, cc, prst)
+     return 0;
+ }
+ 
+-krb5_boolean  krb5_find_princ_in_cred_list (context, creds_list, princ)
+-    krb5_context context;
+-    krb5_creds **creds_list;
+-    krb5_principal princ;
++krb5_boolean
++krb5_find_princ_in_cred_list(krb5_context context, krb5_creds **creds_list,
++                             krb5_principal princ)
+ {
+ 
+     int i = 0;
+@@ -682,11 +650,9 @@ krb5_boolean  krb5_find_princ_in_cred_list (context, creds_list, princ)
+     return temp_stored;
+ }
+ 
+-krb5_error_code  krb5_find_princ_in_cache (context, cc, princ, found)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal princ;
+-    krb5_boolean *found;
++krb5_error_code
++krb5_find_princ_in_cache(krb5_context context, krb5_ccache cc,
++                         krb5_principal princ, krb5_boolean *found)
+ {
+     krb5_error_code retval;
+     krb5_creds ** creds_list = NULL;
+diff --git a/src/clients/ksu/heuristic.c b/src/clients/ksu/heuristic.c
+index 4f7280f4cb..e906de8ef0 100644
+--- a/src/clients/ksu/heuristic.c
++++ b/src/clients/ksu/heuristic.c
+@@ -41,9 +41,8 @@ get_all_princ_from_file - retrieves all principal names
+ static void close_time (int, FILE *, int, FILE *);
+ static krb5_boolean find_str_in_list (char **, char *);
+ 
+-krb5_error_code get_all_princ_from_file (fp, plist)
+-    FILE *fp;
+-    char ***plist;
++krb5_error_code
++get_all_princ_from_file(FILE *fp, char ***plist)
+ {
+ 
+     krb5_error_code retval;
+@@ -92,10 +91,8 @@ list_union - combines list1 and list2 into combined_list.
+              or used by combined_list.
+ **************************************************************/
+ 
+-krb5_error_code list_union(list1, list2, combined_list)
+-    char **list1;
+-    char **list2;
+-    char ***combined_list;
++krb5_error_code
++list_union(char **list1, char **list2, char ***combined_list)
+ {
+ 
+     unsigned int c1 =0, c2 = 0, i=0, j=0;
+@@ -141,11 +138,7 @@ krb5_error_code list_union(list1, list2, combined_list)
+ }
+ 
+ krb5_error_code
+-filter(fp, cmd, k5users_list, k5users_filt_list)
+-    FILE *fp;
+-    char *cmd;
+-    char **k5users_list;
+-    char ***k5users_filt_list;
++filter(FILE *fp, char *cmd, char **k5users_list, char ***k5users_filt_list)
+ {
+ 
+     krb5_error_code retval =0;
+@@ -195,10 +188,7 @@ filter(fp, cmd, k5users_list, k5users_filt_list)
+ }
+ 
+ krb5_error_code
+-get_authorized_princ_names(luser, cmd, princ_list)
+-    const char *luser;
+-    char *cmd;
+-    char ***princ_list;
++get_authorized_princ_names(const char *luser, char *cmd, char ***princ_list)
+ {
+ 
+     struct passwd *pwd;
+@@ -272,11 +262,8 @@ get_authorized_princ_names(luser, cmd, princ_list)
+     return 0;
+ }
+ 
+-static void close_time(k5users_flag, users_fp, k5login_flag, login_fp)
+-    int k5users_flag;
+-    FILE *users_fp;
+-    int k5login_flag;
+-    FILE *login_fp;
++static void
++close_time(int k5users_flag, FILE *users_fp, int k5login_flag, FILE *login_fp)
+ {
+ 
+     if (!k5users_flag) fclose(users_fp);
+@@ -284,9 +271,8 @@ static void close_time(k5users_flag, users_fp, k5login_flag, login_fp)
+ 
+ }
+ 
+-static krb5_boolean find_str_in_list(list , elm)
+-    char **list;
+-    char *elm;
++static krb5_boolean
++find_str_in_list(char **list, char *elm)
+ {
+ 
+     int i=0;
+@@ -313,12 +299,9 @@ A principal is picked that has the best chance of getting in.
+ 
+ **********************************************************************/
+ 
+-
+-krb5_error_code get_closest_principal(context, plist, client, found)
+-    krb5_context context;
+-    char **plist;
+-    krb5_principal *client;
+-    krb5_boolean *found;
++krb5_error_code
++get_closest_principal(krb5_context context, char **plist,
++                      krb5_principal *client, krb5_boolean *found)
+ {
+     krb5_error_code retval =0;
+     krb5_principal temp_client, best_client = NULL;
+@@ -385,12 +368,9 @@ find_either_ticket checks to see whether there is a ticket for the
+    end server or tgt, if neither is there the return FALSE,
+ *****************************************************************/
+ 
+-krb5_error_code find_either_ticket (context, cc, client, end_server, found)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal client;
+-    krb5_principal end_server;
+-    krb5_boolean *found;
++krb5_error_code
++find_either_ticket(krb5_context context, krb5_ccache cc, krb5_principal client,
++                   krb5_principal end_server, krb5_boolean *found)
+ {
+ 
+     krb5_principal kdc_server;
+@@ -424,13 +404,9 @@ krb5_error_code find_either_ticket (context, cc, client, end_server, found)
+     return 0;
+ }
+ 
+-
+-krb5_error_code find_ticket (context, cc, client, server, found)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal client;
+-    krb5_principal server;
+-    krb5_boolean *found;
++krb5_error_code
++find_ticket(krb5_context context, krb5_ccache cc, krb5_principal client,
++            krb5_principal server, krb5_boolean *found)
+ {
+ 
+     krb5_creds tgt, tgtq;
+@@ -470,13 +446,9 @@ krb5_error_code find_ticket (context, cc, client, server, found)
+     return 0;
+ }
+ 
+-
+-
+-krb5_error_code find_princ_in_list (context, princ, plist, found)
+-    krb5_context context;
+-    krb5_principal princ;
+-    char **plist;
+-    krb5_boolean *found;
++krb5_error_code
++find_princ_in_list(krb5_context context, krb5_principal princ, char **plist,
++                   krb5_boolean *found)
+ {
+ 
+     int i=0;
+@@ -516,21 +488,13 @@ path_out gets set to ...
+ 
+ ***********************************************************************/
+ 
+-krb5_error_code get_best_princ_for_target(context, source_uid, target_uid,
+-                                          source_user, target_user,
+-                                          cc_source, options, cmd,
+-                                          hostname, client, path_out)
+-    krb5_context context;
+-    uid_t source_uid;
+-    uid_t target_uid;
+-    char *source_user;
+-    char *target_user;
+-    krb5_ccache cc_source;
+-    krb5_get_init_creds_opt *options;
+-    char *cmd;
+-    char *hostname;
+-    krb5_principal *client;
+-    int *path_out;
++krb5_error_code
++get_best_princ_for_target(krb5_context context, uid_t source_uid,
++                          uid_t target_uid, char *source_user,
++                          char *target_user, krb5_ccache cc_source,
++                          krb5_get_init_creds_opt *options, char *cmd,
++                          char *hostname, krb5_principal *client,
++                          int *path_out)
+ {
+ 
+     princ_info princ_trials[10];
+diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c
+index fb848dcab1..db10251f95 100644
+--- a/src/clients/ksu/krb_auth_su.c
++++ b/src/clients/ksu/krb_auth_su.c
+@@ -29,18 +29,13 @@
+ #include "ksu.h"
+ 
+ 
+-void plain_dump_principal ();
+-
+-krb5_boolean krb5_auth_check(context, client_pname, hostname, options,
+-                             target_user, cc, path_passwd, target_uid)
+-    krb5_context context;
+-    krb5_principal client_pname;
+-    char *hostname;
+-    krb5_get_init_creds_opt *options;
+-    char *target_user;
+-    uid_t target_uid;
+-    krb5_ccache cc;
+-    int *path_passwd;
++void plain_dump_principal(krb5_context, krb5_principal);
++
++krb5_boolean
++krb5_auth_check(krb5_context context, krb5_principal client_pname,
++                char *hostname, krb5_get_init_creds_opt *options,
++                char *target_user, krb5_ccache cc, int *path_passwd,
++                uid_t target_uid)
+ {
+     krb5_principal client;
+     krb5_verify_init_creds_opt vfy_opts;
+@@ -137,13 +132,10 @@ krb5_boolean krb5_auth_check(context, client_pname, hostname, options,
+     return (TRUE);
+ }
+ 
+-krb5_boolean ksu_get_tgt_via_passwd(context, client, options, zero_password,
+-                                    creds_out)
+-    krb5_context context;
+-    krb5_principal client;
+-    krb5_get_init_creds_opt *options;
+-    krb5_boolean *zero_password;
+-    krb5_creds *creds_out;
++krb5_boolean
++ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client,
++                       krb5_get_init_creds_opt *options,
++                       krb5_boolean *zero_password, krb5_creds *creds_out)
+ {
+     krb5_error_code code;
+     krb5_creds creds;
+@@ -212,11 +204,8 @@ krb5_boolean ksu_get_tgt_via_passwd(context, client, options, zero_password,
+     return (TRUE);
+ }
+ 
+-
+-void dump_principal (context, str, p)
+-    krb5_context context;
+-    char *str;
+-    krb5_principal p;
++void
++dump_principal(krb5_context context, char *str, krb5_principal p)
+ {
+     char * stname;
+     krb5_error_code retval;
+@@ -228,9 +217,8 @@ void dump_principal (context, str, p)
+     fprintf(stderr, " %s: %s\n", str, stname);
+ }
+ 
+-void plain_dump_principal (context, p)
+-    krb5_context context;
+-    krb5_principal p;
++void
++plain_dump_principal (krb5_context context, krb5_principal p)
+ {
+     char * stname;
+     krb5_error_code retval;
+@@ -251,11 +239,8 @@ A principal is picked that has the best chance of getting in.
+ 
+ **********************************************************************/
+ 
+-
+-krb5_error_code get_best_principal(context, plist, client)
+-    krb5_context context;
+-    char **plist;
+-    krb5_principal *client;
++krb5_error_code
++get_best_principal(krb5_context context, char **plist, krb5_principal *client)
+ {
+     krb5_error_code retval =0;
+     krb5_principal temp_client, best_client = NULL;
+diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
+index 931f054041..2a351662c8 100644
+--- a/src/clients/ksu/main.c
++++ b/src/clients/ksu/main.c
+@@ -70,7 +70,9 @@ static krb5_error_code resolve_target_cache(krb5_context ksu_context,
+ /* insure the proper specification of target user as well as catching
+    ill specified arguments to commands */
+ 
+-void usage (){
++void
++usage(void)
++{
+     fprintf(stderr,
+             _("Usage: %s [target user] [-n principal] [-c source cachename] "
+               "[-k] [-r time] [-p|-P] [-f|-F] [-l lifetime] [-zZ] [-q] "
+@@ -86,9 +88,7 @@ void usage (){
+ static uid_t source_uid, target_uid;
+ 
+ int
+-main (argc, argv)
+-    int argc;
+-    char ** argv;
++main(int argc, char ** argv)
+ {
+     int hp =0;
+     int some_rest_copy = 0;
+@@ -120,7 +120,6 @@ main (argc, argv)
+     char ** params;
+     int keep_target_cache = 0;
+     int child_pid, child_pgrp, ret_pid;
+-    extern char * getpass(), *crypt();
+     int pargc;
+     char ** pargv;
+     krb5_boolean stored = FALSE, cc_reused = FALSE, given_princ = FALSE;
+@@ -1049,11 +1048,10 @@ cleanup:
+ 
+ #ifdef HAVE_GETUSERSHELL
+ 
+-int standard_shell(sh)
+-    char *sh;
++int
++standard_shell(char *sh)
+ {
+     char *cp;
+-    char *getusershell();
+ 
+     while ((cp = getusershell()) != NULL)
+         if (!strcmp(cp, sh))
+@@ -1063,7 +1061,8 @@ int standard_shell(sh)
+ 
+ #endif /* HAVE_GETUSERSHELL */
+ 
+-static char * ontty()
++static char *
++ontty(void)
+ {
+     char *p;
+     static char buf[MAXPATHLEN + 5];
+@@ -1080,10 +1079,8 @@ static char * ontty()
+     return (buf);
+ }
+ 
+-
+-static int set_env_var(name, value)
+-    char *name;
+-    char *value;
++static int
++set_env_var(char *name, char *value)
+ {
+     char * env_var_buf;
+ 
+@@ -1092,9 +1089,8 @@ static int set_env_var(name, value)
+ 
+ }
+ 
+-static void sweep_up(context, cc)
+-    krb5_context context;
+-    krb5_ccache cc;
++static void
++sweep_up(krb5_context context, krb5_ccache cc)
+ {
+     krb5_error_code retval;
+ 
+@@ -1122,11 +1118,7 @@ get_params is to be called for the -a option or -e option to
+ *****************************************************************/
+ 
+ krb5_error_code
+-get_params(optindex, pargc, pargv, params)
+-    int *optindex;
+-    int pargc;
+-    char **pargv;
+-    char ***params;
++get_params(int *optindex, int pargc, char **pargv, char ***params)
+ {
+ 
+     int i,j;
+@@ -1159,10 +1151,8 @@ void print_status(const char *fmt, ...)
+ }
+ 
+ krb5_error_code
+-ksu_tgtname(context, server, client, tgtprinc)
+-    krb5_context context;
+-    const krb5_data *server, *client;
+-    krb5_principal *tgtprinc;
++ksu_tgtname(krb5_context context, const krb5_data *server,
++            const krb5_data *client, krb5_principal *tgtprinc)
+ {
+     return krb5_build_principal_ext(context, tgtprinc, client->length, client->data,
+                                     KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME,
+diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
+index 03f72f596d..ac77a7d524 100644
+--- a/src/clients/kvno/kvno.c
++++ b/src/clients/kvno/kvno.c
+@@ -39,7 +39,7 @@ static char *prog;
+ static int quiet = 0;
+ 
+ static void
+-xusage()
++xusage(void)
+ {
+     fprintf(stderr, _("usage: %s [-c ccache] [-e etype] [-k keytab] [-q] "
+                       "[-u | -S sname]\n"
+diff --git a/src/include/gssrpc/auth_gssapi.h b/src/include/gssrpc/auth_gssapi.h
+index 9d94853228..63436a698a 100644
+--- a/src/include/gssrpc/auth_gssapi.h
++++ b/src/include/gssrpc/auth_gssapi.h
+@@ -82,14 +82,12 @@ bool_t xdr_authgssapi_init_res(XDR *, auth_gssapi_init_res *);
+ 
+ bool_t auth_gssapi_wrap_data
+ (OM_uint32 *major, OM_uint32 *minor,
+-	   gss_ctx_id_t context, uint32_t seq_num, XDR
+-	   *out_xdrs, bool_t (*xdr_func)(), caddr_t
+-	   xdr_ptr);
++	   gss_ctx_id_t context, uint32_t seq_num,
++	   XDR *out_xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr);
+ bool_t auth_gssapi_unwrap_data
+ (OM_uint32 *major, OM_uint32 *minor,
+-	   gss_ctx_id_t context, uint32_t seq_num, XDR
+-	   *in_xdrs, bool_t (*xdr_func)(), caddr_t
+-	   xdr_ptr);
++	   gss_ctx_id_t context, uint32_t seq_num,
++	   XDR *in_xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr);
+ 
+ AUTH *auth_gssapi_create
+ (CLIENT *clnt,
+diff --git a/src/include/gssrpc/xdr.h b/src/include/gssrpc/xdr.h
+index da9e173782..4e5c29bdc2 100644
+--- a/src/include/gssrpc/xdr.h
++++ b/src/include/gssrpc/xdr.h
+@@ -102,7 +102,6 @@ enum xdr_op {
+  *
+  * XXX can't actually prototype it, because some take three args!!!
+  */
+-typedef	bool_t (*xdrproc_t)();
+ 
+ /*
+  * The XDR handle.
+@@ -143,6 +142,8 @@ typedef struct XDR {
+ 	int		x_handy;	/* extra private word */
+ } XDR;
+ 
++typedef	bool_t (*xdrproc_t)(XDR *, void *);
++
+ /*
+  * Operations defined on a XDR handle
+  *
+diff --git a/src/include/k5-int.h b/src/include/k5-int.h
+index 768110e5ef..b3e07945c1 100644
+--- a/src/include/k5-int.h
++++ b/src/include/k5-int.h
+@@ -2236,7 +2236,7 @@ make_data(void *data, unsigned int len)
+ }
+ 
+ static inline krb5_data
+-empty_data()
++empty_data(void)
+ {
+     return make_data(NULL, 0);
+ }
+diff --git a/src/include/k5-plugin.h b/src/include/k5-plugin.h
+index 90809e168e..5c5af586c5 100644
+--- a/src/include/k5-plugin.h
++++ b/src/include/k5-plugin.h
+@@ -97,7 +97,7 @@ krb5int_get_plugin_data (struct plugin_file_handle *, const char *, void **,
+ 
+ long KRB5_CALLCONV
+ krb5int_get_plugin_func (struct plugin_file_handle *, const char *,
+-                         void (**)(), struct errinfo *);
++                         void (**)(void), struct errinfo *);
+ 
+ 
+ long KRB5_CALLCONV
+diff --git a/src/include/net-server.h b/src/include/net-server.h
+index a30749d851..29b235eeb8 100644
+--- a/src/include/net-server.h
++++ b/src/include/net-server.h
+@@ -30,6 +30,7 @@
+ #define NET_SERVER_H
+ 
+ #include <verto.h>
++#include <gssrpc/rpc.h>
+ 
+ /* The delimiter characters supported by the addresses string. */
+ #define ADDRESSES_DELIM ",; "
+@@ -64,13 +65,14 @@ krb5_error_code loop_add_udp_address(int default_port, const char *addresses);
+ krb5_error_code loop_add_tcp_address(int default_port, const char *addresses);
+ krb5_error_code loop_add_rpc_service(int default_port, const char *addresses,
+                                      u_long prognum, u_long versnum,
+-                                     void (*dispatchfn)());
++                                     void (*dispatchfn)(struct svc_req *,
++                                                        SVCXPRT *));
+ 
+ krb5_error_code loop_setup_network(verto_ctx *ctx, void *handle,
+                                    const char *progname,
+                                    int tcp_listen_backlog);
+ krb5_error_code loop_setup_signals(verto_ctx *ctx, void *handle,
+-                                   void (*reset)());
++                                   void (*reset)(void *));
+ void loop_free(verto_ctx *ctx);
+ 
+ /* to be supplied by the server application */
+diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
+index d14cf963c5..3d69f0b8a4 100644
+--- a/src/kadmin/cli/getdate.y
++++ b/src/kadmin/cli/getdate.y
+@@ -100,9 +100,6 @@ struct my_timeb {
+ #define bcopy(from, to, len) memcpy ((to), (from), (len))
+ #endif
+ 
+-extern struct tm	*gmtime();
+-extern struct tm	*localtime();
+-
+ #define yyparse getdate_yyparse
+ #define yylex getdate_yylex
+ #define yyerror getdate_yyerror
+diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
+index f3ea6fae17..23b64b0f58 100644
+--- a/src/kadmin/cli/kadmin.c
++++ b/src/kadmin/cli/kadmin.c
+@@ -98,7 +98,7 @@ error(const char *fmt, ...)
+ }
+ 
+ static void
+-usage()
++usage(void)
+ {
+     error(_("Usage: %s [-r realm] [-p principal] [-q query] "
+             "[clnt|local args]\n"
+@@ -1130,7 +1130,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
+ }
+ 
+ static void
+-kadmin_addprinc_usage()
++kadmin_addprinc_usage(void)
+ {
+     error(_("usage: add_principal [options] principal\n"));
+     error(_("\toptions are:\n"));
+@@ -1154,7 +1154,7 @@ kadmin_addprinc_usage()
+ }
+ 
+ static void
+-kadmin_modprinc_usage()
++kadmin_modprinc_usage(void)
+ {
+     error(_("usage: modify_principal [options] principal\n"));
+     error(_("\toptions are:\n"));
+diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
+index b0c8378b40..26f340af31 100644
+--- a/src/kadmin/cli/keytab.c
++++ b/src/kadmin/cli/keytab.c
+@@ -50,14 +50,14 @@ static int quiet;
+ static int norandkey;
+ 
+ static void
+-add_usage()
++add_usage(void)
+ {
+     fprintf(stderr, _("Usage: ktadd [-k[eytab] keytab] [-q] [-e keysaltlist] "
+                       "[-norandkey] [principal | -glob princ-exp] [...]\n"));
+ }
+ 
+ static void
+-rem_usage()
++rem_usage(void)
+ {
+     fprintf(stderr, _("Usage: ktremove [-k[eytab] keytab] [-q] principal "
+                       "[kvno|\"all\"|\"old\"]\n"));
+diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
+index 038a0b2190..9178fca6da 100644
+--- a/src/kadmin/dbutil/kdb5_create.c
++++ b/src/kadmin/dbutil/kdb5_create.c
+@@ -139,9 +139,8 @@ extern int exit_status;
+ extern kadm5_config_params global_params;
+ extern krb5_context util_context;
+ 
+-void kdb5_create(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++kdb5_create(int argc, char *argv[])
+ {
+     int optchar;
+ 
+@@ -337,9 +336,7 @@ void kdb5_create(argc, argv)
+ }
+ 
+ static krb5_error_code
+-tgt_keysalt_iterate(ksent, ptr)
+-    krb5_key_salt_tuple *ksent;
+-    krb5_pointer        ptr;
++tgt_keysalt_iterate(krb5_key_salt_tuple *ksent, krb5_pointer ptr)
+ {
+     krb5_context        context;
+     krb5_error_code     kret;
+@@ -378,11 +375,8 @@ tgt_keysalt_iterate(ksent, ptr)
+ }
+ 
+ static krb5_error_code
+-add_principal(context, princ, op, pblock)
+-    krb5_context context;
+-    krb5_principal princ;
+-    enum ap_op op;
+-    struct realm_info *pblock;
++add_principal(krb5_context context, krb5_principal princ, enum ap_op op,
++              struct realm_info *pblock)
+ {
+     krb5_error_code       retval;
+     krb5_db_entry         *entry = NULL;
+diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c
+index fffce74296..556cf0b6bb 100644
+--- a/src/kadmin/dbutil/kdb5_destroy.c
++++ b/src/kadmin/dbutil/kdb5_destroy.c
+@@ -39,9 +39,7 @@ char *yes = "yes\n";                    /* \n to compare against result of
+                                            fgets */
+ 
+ void
+-kdb5_destroy(argc, argv)
+-    int argc;
+-    char *argv[];
++kdb5_destroy(int argc, char *argv[])
+ {
+     extern int optind;
+     int optchar;
+diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c
+index e05944f290..eaba6cd353 100644
+--- a/src/kadmin/dbutil/kdb5_stash.c
++++ b/src/kadmin/dbutil/kdb5_stash.c
+@@ -63,9 +63,7 @@ extern int exit_status;
+ extern int close_policy_db;
+ 
+ void
+-kdb5_stash(argc, argv)
+-    int argc;
+-    char *argv[];
++kdb5_stash(int argc, char *argv[])
+ {
+     extern char *optarg;
+     extern int optind;
+diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
+index 19a59250ee..55d529fa4c 100644
+--- a/src/kadmin/dbutil/kdb5_util.c
++++ b/src/kadmin/dbutil/kdb5_util.c
+@@ -143,8 +143,8 @@ struct _cmd_table {
+     {NULL, NULL, 0},
+ };
+ 
+-static struct _cmd_table *cmd_lookup(name)
+-    char *name;
++static struct _cmd_table *
++cmd_lookup(char *name)
+ {
+     struct _cmd_table *cmd = cmd_table;
+     while (cmd->name) {
+@@ -162,8 +162,9 @@ static struct _cmd_table *cmd_lookup(name)
+ char **db5util_db_args = NULL;
+ int    db5util_db_args_size = 0;
+ 
+-static void extended_com_err_fn (const char *myprog, errcode_t code,
+-                                 const char *fmt, va_list args)
++static void
++extended_com_err_fn(const char *myprog, errcode_t code, const char *fmt,
++                    va_list args)
+ {
+     const char *emsg;
+     if (code) {
+@@ -177,7 +178,8 @@ static void extended_com_err_fn (const char *myprog, errcode_t code,
+     fprintf (stderr, "\n");
+ }
+ 
+-int add_db_arg(char *arg)
++int
++add_db_arg(char *arg)
+ {
+     char **temp;
+     db5util_db_args_size++;
+@@ -191,9 +193,8 @@ int add_db_arg(char *arg)
+     return 1;
+ }
+ 
+-int main(argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     struct _cmd_table *cmd = NULL;
+     char *koptarg, **cmd_argv;
+@@ -365,7 +366,8 @@ int main(argc, argv)
+  * cannot be fetched (the master key stash file may not exist when the
+  * program is run).
+  */
+-static int open_db_and_mkey()
++static int
++open_db_and_mkey()
+ {
+     krb5_error_code retval;
+     krb5_data scratch, pwd, seed;
+@@ -508,9 +510,7 @@ quit()
+ }
+ 
+ static void
+-add_random_key(argc, argv)
+-    int argc;
+-    char **argv;
++add_random_key(int argc, char **argv)
+ {
+     krb5_error_code ret;
+     krb5_principal princ;
+diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
+index 15a5ab3005..b2e6c00eac 100644
+--- a/src/kadmin/dbutil/ovload.c
++++ b/src/kadmin/dbutil/ovload.c
+@@ -11,9 +11,8 @@
+ 
+ #define LINESIZE        32768 /* XXX */
+ 
+-static int parse_pw_hist_ent(current, hist)
+-    char *current;
+-    osa_pw_hist_ent *hist;
++static int
++parse_pw_hist_ent(char *current, osa_pw_hist_ent *hist)
+ {
+     int tmp, i, j, ret;
+     char *cp;
+@@ -90,12 +89,9 @@ done:
+  *      [modifies]
+  *
+  */
+-int process_ov_principal(kcontext, fname, filep, verbose, linenop)
+-    krb5_context        kcontext;
+-    const char          *fname;
+-    FILE                *filep;
+-    krb5_boolean        verbose;
+-    int                 *linenop;
++int
++process_ov_principal(krb5_context kcontext, const char *fname, FILE *filep,
++                     krb5_boolean verbose, int *linenop)
+ {
+     XDR                     xdrs;
+     osa_princ_ent_t         rec;
+diff --git a/src/kadmin/dbutil/strtok.c b/src/kadmin/dbutil/strtok.c
+index dee466aea1..93f3e85a51 100644
+--- a/src/kadmin/dbutil/strtok.c
++++ b/src/kadmin/dbutil/strtok.c
+@@ -50,9 +50,7 @@
+  */
+ 
+ char *
+-nstrtok(s, delim)
+-    char *s;
+-    const char *delim;
++nstrtok(char *s, const char *delim)
+ {
+     const char *spanp;
+     int c, sc;
+diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
+index 92d7023a4f..87a69ca145 100644
+--- a/src/kadmin/ktutil/ktutil.c
++++ b/src/kadmin/ktutil/ktutil.c
+@@ -39,9 +39,8 @@ extern ss_request_table ktutil_cmds;
+ krb5_context kcontext;
+ krb5_kt_list ktlist = NULL;
+ 
+-int main(argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+     int sci_idx;
+@@ -63,9 +62,8 @@ int main(argc, argv)
+     exit(0);
+ }
+ 
+-void ktutil_clear_list(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_clear_list(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -79,9 +77,8 @@ void ktutil_clear_list(argc, argv)
+     ktlist = NULL;
+ }
+ 
+-void ktutil_read_v5(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_read_v5(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -94,17 +91,15 @@ void ktutil_read_v5(argc, argv)
+         com_err(argv[0], retval, _("while reading keytab \"%s\""), argv[1]);
+ }
+ 
+-void ktutil_read_v4(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_read_v4(int argc, char *argv[])
+ {
+     fprintf(stderr, _("%s: reading srvtabs is no longer supported\n"),
+             argv[0]);
+ }
+ 
+-void ktutil_write_v5(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_write_v5(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -117,17 +112,15 @@ void ktutil_write_v5(argc, argv)
+         com_err(argv[0], retval, _("while writing keytab \"%s\""), argv[1]);
+ }
+ 
+-void ktutil_write_v4(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_write_v4(int argc, char *argv[])
+ {
+     fprintf(stderr, _("%s: writing srvtabs is no longer supported\n"),
+             argv[0]);
+ }
+ 
+-void ktutil_add_entry(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_add_entry(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+     char *princ = NULL;
+@@ -183,9 +176,8 @@ void ktutil_add_entry(argc, argv)
+         com_err(argv[0], retval, _("while adding new entry"));
+ }
+ 
+-void ktutil_delete_entry(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_delete_entry(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -198,9 +190,8 @@ void ktutil_delete_entry(argc, argv)
+         com_err(argv[0], retval, _("while deleting entry %d"), atoi(argv[1]));
+ }
+ 
+-void ktutil_list(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_list(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+     krb5_kt_list lp;
+diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
+index 56bed1bbcc..e489b5b57a 100644
+--- a/src/kadmin/ktutil/ktutil_funcs.c
++++ b/src/kadmin/ktutil/ktutil_funcs.c
+@@ -37,9 +37,8 @@
+ /*
+  * Free a kt_list
+  */
+-krb5_error_code ktutil_free_kt_list(context, list)
+-    krb5_context context;
+-    krb5_kt_list list;
++krb5_error_code
++ktutil_free_kt_list(krb5_context context, krb5_kt_list list)
+ {
+     krb5_kt_list lp, prev;
+     krb5_error_code retval = 0;
+@@ -60,10 +59,8 @@ krb5_error_code ktutil_free_kt_list(context, list)
+  * Delete a numbered entry in a kt_list.  Takes a pointer to a kt_list
+  * in case head gets deleted.
+  */
+-krb5_error_code ktutil_delete(context, list, idx)
+-    krb5_context context;
+-    krb5_kt_list *list;
+-    int idx;
++krb5_error_code
++ktutil_delete(krb5_context context, krb5_kt_list *list, int idx)
+ {
+     krb5_kt_list lp, prev;
+     int i;
+@@ -138,16 +135,10 @@ get_etype_info(krb5_context context, krb5_principal princ, int fetch,
+  * password or key.  If the keytab list is NULL, allocate a new
+  * one first.
+  */
+-krb5_error_code ktutil_add(context, list, princ_str, fetch, kvno,
+-                           enctype_str, use_pass, salt_str)
+-    krb5_context context;
+-    krb5_kt_list *list;
+-    char *princ_str;
+-    int fetch;
+-    krb5_kvno kvno;
+-    char *enctype_str;
+-    int use_pass;
+-    char *salt_str;
++krb5_error_code
++ktutil_add(krb5_context context, krb5_kt_list *list, char *princ_str,
++           int fetch, krb5_kvno kvno, char *enctype_str, int use_pass,
++           char *salt_str)
+ {
+     krb5_keytab_entry *entry = NULL;
+     krb5_kt_list lp, *last;
+@@ -269,10 +260,8 @@ cleanup:
+  * Read in a keytab and append it to list.  If list starts as NULL,
+  * allocate a new one if necessary.
+  */
+-krb5_error_code ktutil_read_keytab(context, name, list)
+-    krb5_context context;
+-    char *name;
+-    krb5_kt_list *list;
++krb5_error_code
++ktutil_read_keytab(krb5_context context, char *name, krb5_kt_list *list)
+ {
+     krb5_kt_list lp = NULL, tail = NULL, back = NULL;
+     krb5_keytab kt;
+@@ -344,10 +333,8 @@ close_kt:
+ /*
+  * Takes a kt_list and writes it to the named keytab.
+  */
+-krb5_error_code ktutil_write_keytab(context, list, name)
+-    krb5_context context;
+-    krb5_kt_list list;
+-    char *name;
++krb5_error_code
++ktutil_write_keytab(krb5_context context, krb5_kt_list list, char *name)
+ {
+     krb5_kt_list lp;
+     krb5_keytab kt;
+diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
+index 56e9b90b20..e5dd233e81 100644
+--- a/src/kadmin/server/ipropd_svc.c
++++ b/src/kadmin/server/ipropd_svc.c
+@@ -535,8 +535,8 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
+ 	kdb_last_t iprop_get_updates_1_arg;
+     } argument;
+     void *result;
+-    bool_t (*_xdr_argument)(), (*_xdr_result)();
+-    void *(*local)(/* union XXX *, struct svc_req * */);
++    xdrproc_t _xdr_argument, _xdr_result;
++    void *(*local)(char *, struct svc_req *);
+     char *whoami = "krb5_iprop_prog_1";
+ 
+     if (!check_iprop_rpcsec_auth(rqstp)) {
+@@ -555,21 +555,21 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
+ 	return;
+ 
+     case IPROP_GET_UPDATES:
+-	_xdr_argument = xdr_kdb_last_t;
+-	_xdr_result = xdr_kdb_incr_result_t;
+-	local = (void *(*)()) iprop_get_updates_1_svc;
++	_xdr_argument = (xdrproc_t)xdr_kdb_last_t;
++	_xdr_result = (xdrproc_t)xdr_kdb_incr_result_t;
++	local = (void *(*)(char *, struct svc_req *))iprop_get_updates_1_svc;
+ 	break;
+ 
+     case IPROP_FULL_RESYNC:
+-	_xdr_argument = xdr_void;
+-	_xdr_result = xdr_kdb_fullresync_result_t;
+-	local = (void *(*)()) iprop_full_resync_1_svc;
++	_xdr_argument = (xdrproc_t)xdr_void;
++	_xdr_result = (xdrproc_t)xdr_kdb_fullresync_result_t;
++	local = (void *(*)(char *, struct svc_req *))iprop_full_resync_1_svc;
+ 	break;
+ 
+     case IPROP_FULL_RESYNC_EXT:
+-	_xdr_argument = xdr_u_int32;
+-	_xdr_result = xdr_kdb_fullresync_result_t;
+-	local = (void *(*)()) iprop_full_resync_ext_1_svc;
++	_xdr_argument = (xdrproc_t)xdr_u_int32;
++	_xdr_result = (xdrproc_t)xdr_kdb_fullresync_result_t;
++	local = (void *(*)(char *, struct svc_req *))iprop_full_resync_ext_1_svc;
+ 	break;
+ 
+     default:
+@@ -587,7 +587,7 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
+ 	svcerr_decode(transp);
+ 	return;
+     }
+-    result = (*local)(&argument, rqstp);
++    result = (*local)((char *)&argument, rqstp);
+ 
+     if (_xdr_result && result != NULL &&
+ 	!svc_sendreply(transp, _xdr_result, result)) {
+diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
+index 8371fa76ca..f0e43d9aea 100644
+--- a/src/kadmin/server/kadm_rpc_svc.c
++++ b/src/kadmin/server/kadm_rpc_svc.c
+@@ -9,6 +9,7 @@
+ #include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
+ #include <syslog.h>
+ #include <kadm5/kadm_rpc.h>
++#include <kadm5/admin_xdr.h>
+ #include <krb5.h>
+ #include <kadm5/admin.h>
+ #include <adm_proto.h>
+@@ -36,9 +37,8 @@ static int check_rpcsec_auth(struct svc_req *);
+  * Modifies:
+  */
+ 
+-void kadm_1(rqstp, transp)
+-   struct svc_req *rqstp;
+-   SVCXPRT *transp;
++void
++kadm_1(struct svc_req *rqstp, SVCXPRT *transp)
+ {
+      union {
+ 	  cprinc_arg create_principal_2_arg;
+@@ -73,8 +73,8 @@ void kadm_1(rqstp, transp)
+ 	  getpkeys_ret get_principal_keys_ret;
+      } result;
+      bool_t retval;
+-     bool_t (*xdr_argument)(), (*xdr_result)();
+-     bool_t (*local)();
++     xdrproc_t xdr_argument, xdr_result;
++     bool_t (*local)(char *, void *, struct svc_req *);
+ 
+      if (rqstp->rq_cred.oa_flavor != AUTH_GSSAPI &&
+ 	 !check_rpcsec_auth(rqstp)) {
+@@ -92,153 +92,153 @@ void kadm_1(rqstp, transp)
+ 	  return;
+ 
+      case CREATE_PRINCIPAL:
+-	  xdr_argument = xdr_cprinc_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) create_principal_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_cprinc_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))create_principal_2_svc;
+ 	  break;
+ 
+      case DELETE_PRINCIPAL:
+-	  xdr_argument = xdr_dprinc_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) delete_principal_2_svc;
++          xdr_argument = (xdrproc_t)xdr_dprinc_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))delete_principal_2_svc;
+ 	  break;
+ 
+      case MODIFY_PRINCIPAL:
+-	  xdr_argument = xdr_mprinc_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) modify_principal_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_mprinc_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))modify_principal_2_svc;
+ 	  break;
+ 
+      case RENAME_PRINCIPAL:
+-	  xdr_argument = xdr_rprinc_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) rename_principal_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_rprinc_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))rename_principal_2_svc;
+ 	  break;
+ 
+      case GET_PRINCIPAL:
+-	  xdr_argument = xdr_gprinc_arg;
+-	  xdr_result = xdr_gprinc_ret;
+-	  local = (bool_t (*)()) get_principal_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_gprinc_arg;
++	  xdr_result = (xdrproc_t)xdr_gprinc_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))get_principal_2_svc;
+ 	  break;
+ 
+      case GET_PRINCS:
+-	  xdr_argument = xdr_gprincs_arg;
+-	  xdr_result = xdr_gprincs_ret;
+-	  local = (bool_t (*)()) get_princs_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_gprincs_arg;
++	  xdr_result = (xdrproc_t)xdr_gprincs_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))get_princs_2_svc;
+ 	  break;
+ 
+      case CHPASS_PRINCIPAL:
+-	  xdr_argument = xdr_chpass_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) chpass_principal_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_chpass_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))chpass_principal_2_svc;
+ 	  break;
+ 
+      case SETKEY_PRINCIPAL:
+-	  xdr_argument = xdr_setkey_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) setkey_principal_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_setkey_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal_2_svc;
+ 	  break;
+ 
+      case CHRAND_PRINCIPAL:
+-	  xdr_argument = xdr_chrand_arg;
+-	  xdr_result = xdr_chrand_ret;
+-	  local = (bool_t (*)()) chrand_principal_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_chrand_arg;
++	  xdr_result = (xdrproc_t)xdr_chrand_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))chrand_principal_2_svc;
+ 	  break;
+ 
+      case CREATE_POLICY:
+-	  xdr_argument = xdr_cpol_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) create_policy_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_cpol_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))create_policy_2_svc;
+ 	  break;
+ 
+      case DELETE_POLICY:
+-	  xdr_argument = xdr_dpol_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) delete_policy_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_dpol_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))delete_policy_2_svc;
+ 	  break;
+ 
+      case MODIFY_POLICY:
+-	  xdr_argument = xdr_mpol_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) modify_policy_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_mpol_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))modify_policy_2_svc;
+ 	  break;
+ 
+      case GET_POLICY:
+-	  xdr_argument = xdr_gpol_arg;
+-	  xdr_result = xdr_gpol_ret;
+-	  local = (bool_t (*)()) get_policy_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_gpol_arg;
++	  xdr_result = (xdrproc_t)xdr_gpol_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))get_policy_2_svc;
+ 	  break;
+ 
+      case GET_POLS:
+-	  xdr_argument = xdr_gpols_arg;
+-	  xdr_result = xdr_gpols_ret;
+-	  local = (bool_t (*)()) get_pols_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_gpols_arg;
++	  xdr_result = (xdrproc_t)xdr_gpols_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))get_pols_2_svc;
+ 	  break;
+ 
+      case GET_PRIVS:
+-	  xdr_argument = xdr_u_int32;
+-	  xdr_result = xdr_getprivs_ret;
+-	  local = (bool_t (*)()) get_privs_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_u_int32;
++	  xdr_result = (xdrproc_t)xdr_getprivs_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))get_privs_2_svc;
+ 	  break;
+ 
+      case INIT:
+-	  xdr_argument = xdr_u_int32;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) init_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_u_int32;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))init_2_svc;
+ 	  break;
+ 
+      case CREATE_PRINCIPAL3:
+-	  xdr_argument = xdr_cprinc3_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) create_principal3_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_cprinc3_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))create_principal3_2_svc;
+ 	  break;
+ 
+      case CHPASS_PRINCIPAL3:
+-	  xdr_argument = xdr_chpass3_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) chpass_principal3_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_chpass3_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))chpass_principal3_2_svc;
+ 	  break;
+ 
+      case CHRAND_PRINCIPAL3:
+-	  xdr_argument = xdr_chrand3_arg;
+-	  xdr_result = xdr_chrand_ret;
+-	  local = (bool_t (*)()) chrand_principal3_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_chrand3_arg;
++	  xdr_result = (xdrproc_t)xdr_chrand_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))chrand_principal3_2_svc;
+ 	  break;
+ 
+      case SETKEY_PRINCIPAL3:
+-	  xdr_argument = xdr_setkey3_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) setkey_principal3_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_setkey3_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal3_2_svc;
+ 	  break;
+ 
+      case PURGEKEYS:
+-	  xdr_argument = xdr_purgekeys_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) purgekeys_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_purgekeys_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))purgekeys_2_svc;
+ 	  break;
+ 
+      case GET_STRINGS:
+-	  xdr_argument = xdr_gstrings_arg;
+-	  xdr_result = xdr_gstrings_ret;
+-	  local = (bool_t (*)()) get_strings_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_gstrings_arg;
++	  xdr_result = (xdrproc_t)xdr_gstrings_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))get_strings_2_svc;
+ 	  break;
+ 
+      case SET_STRING:
+-	  xdr_argument = xdr_sstring_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) set_string_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_sstring_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))set_string_2_svc;
+ 	  break;
+ 
+      case SETKEY_PRINCIPAL4:
+-	  xdr_argument = xdr_setkey4_arg;
+-	  xdr_result = xdr_generic_ret;
+-	  local = (bool_t (*)()) setkey_principal4_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_setkey4_arg;
++	  xdr_result = (xdrproc_t)xdr_generic_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal4_2_svc;
+ 	  break;
+ 
+      case EXTRACT_KEYS:
+-	  xdr_argument = xdr_getpkeys_arg;
+-	  xdr_result = xdr_getpkeys_ret;
+-	  local = (bool_t (*)()) get_principal_keys_2_svc;
++	  xdr_argument = (xdrproc_t)xdr_getpkeys_arg;
++	  xdr_result = (xdrproc_t)xdr_getpkeys_ret;
++	  local = (bool_t (*)(char *, void *, struct svc_req *))get_principal_keys_2_svc;
+ 	  break;
+ 
+      default:
+@@ -253,7 +253,7 @@ void kadm_1(rqstp, transp)
+ 	  return;
+      }
+      memset(&result, 0, sizeof(result));
+-     retval = (*local)(&argument, &result, rqstp);
++     retval = (*local)((char *)&argument, &result, rqstp);
+      if (retval && !svc_sendreply(transp, xdr_result, (void *)&result)) {
+ 	  krb5_klog_syslog(LOG_ERR, "WARNING! Unable to send function results, "
+ 		 "continuing.");
+diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
+index b29a0f5b63..a9508af120 100644
+--- a/src/kadmin/server/ovsec_kadmd.c
++++ b/src/kadmin/server/ovsec_kadmd.c
+@@ -77,7 +77,7 @@ static krb5_context context;
+ static char *progname;
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("Usage: kadmind [-x db_args]* [-r realm] [-m] [-nofork] "
+                       "[-port port-number]\n"
+@@ -173,7 +173,7 @@ setup_loop(kadm5_config_params *params, int proponly, verto_ctx **ctx_out)
+ 
+ /* Point GSSAPI at the KDB keytab so we don't need an actual file keytab. */
+ static krb5_error_code
+-setup_kdb_keytab()
++setup_kdb_keytab(void)
+ {
+     krb5_error_code ret;
+ 
+diff --git a/src/kdc/t_ndr.c b/src/kdc/t_ndr.c
+index a3ac661bd0..c2a2414313 100644
+--- a/src/kdc/t_ndr.c
++++ b/src/kdc/t_ndr.c
+@@ -173,7 +173,7 @@ test_dec_enc(uint8_t *blob, size_t len, char *name, int fail)
+ #define RUN_TEST_FAIL(blob) test_dec_enc(blob, sizeof(blob), #blob, 1)
+ 
+ int
+-main()
++main(void)
+ {
+     printf("Running NDR tests...\n");
+ 
+diff --git a/src/kdc/t_replay.c b/src/kdc/t_replay.c
+index 57aad886cd..c9c9d65946 100644
+--- a/src/kdc/t_replay.c
++++ b/src/kdc/t_replay.c
+@@ -570,7 +570,8 @@ test_kdc_insert_lookaside_cache_expire(void **state)
+     assert_int_equal(total_size, e2_size);
+ }
+ 
+-int main()
++int
++main(void)
+ {
+     int ret;
+ 
+@@ -611,7 +612,8 @@ int main()
+ 
+ #else /* NOCACHE */
+ 
+-int main()
++int
++main(void)
+ {
+     return 0;
+ }
+diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c
+index cb9785aaeb..f883ae2df8 100644
+--- a/src/kprop/kpropd.c
++++ b/src/kprop/kpropd.c
+@@ -165,7 +165,7 @@ static kadm5_ret_t kadm5_get_kiprop_host_srv_name(krb5_context context,
+                                                   char **host_service_name);
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr,
+             _("\nUsage: %s [-r realm] [-s keytab] [-d] [-D] [-S]\n"
+diff --git a/src/kprop/kproplog.c b/src/kprop/kproplog.c
+index 06af2a1d60..1f10aa6dc7 100644
+--- a/src/kprop/kproplog.c
++++ b/src/kprop/kproplog.c
+@@ -24,7 +24,7 @@
+ static char *progname;
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("\nUsage: %s [-h] [-v] [-v] [-e num]\n\t%s -R\n\n"),
+             progname, progname);
+@@ -393,7 +393,7 @@ print_update(kdb_hlog_t *ulog, uint32_t entry, uint32_t ulogentries,
+                 print_attr(&upd.kdb_update.kdbe_t_val[j], verbose > 1 ? 1 : 0);
+         }
+ 
+-        xdr_free(xdr_kdb_incr_update_t, (char *)&upd);
++        xdr_free((xdrproc_t)xdr_kdb_incr_update_t, (char *)&upd);
+         free(dbprinc);
+     }
+ }
+diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
+index 1bdc7932b6..75372d8940 100644
+--- a/src/lib/apputils/net-server.c
++++ b/src/lib/apputils/net-server.c
+@@ -203,7 +203,7 @@ struct connection {
+ struct rpc_svc_data {
+     u_long prognum;
+     u_long versnum;
+-    void (*dispatch)();
++    void (*dispatch)(struct svc_req *, SVCXPRT *);
+ };
+ 
+ struct bind_address {
+@@ -255,7 +255,7 @@ free_sighup_context(verto_ctx *ctx, verto_ev *ev)
+ }
+ 
+ krb5_error_code
+-loop_setup_signals(verto_ctx *ctx, void *handle, void (*reset)())
++loop_setup_signals(verto_ctx *ctx, void *handle, void (*reset)(void *))
+ {
+     struct sighup_context *sc;
+     verto_ev *ev;
+@@ -434,7 +434,8 @@ loop_add_tcp_address(int default_port, const char *addresses)
+ 
+ krb5_error_code
+ loop_add_rpc_service(int default_port, const char *addresses, u_long prognum,
+-                     u_long versnum, void (*dispatchfn)())
++                     u_long versnum,
++                     void (*dispatchfn)(struct svc_req *, SVCXPRT *))
+ {
+     struct rpc_svc_data svc;
+ 
+diff --git a/src/lib/crypto/builtin/aes/aes-gen.c b/src/lib/crypto/builtin/aes/aes-gen.c
+index b528d3796d..4d7a16ee9a 100644
+--- a/src/lib/crypto/builtin/aes/aes-gen.c
++++ b/src/lib/crypto/builtin/aes/aes-gen.c
+@@ -54,7 +54,8 @@ uint8_t test_case[NTESTS][4 * B] = {
+ aes_encrypt_ctx ctx;
+ aes_decrypt_ctx dctx;
+ 
+-static void init ()
++static void
++init (void)
+ {
+     AES_RETURN r;
+ 
+@@ -71,7 +72,8 @@ static void hexdump(const unsigned char *ptr, size_t len)
+ 	printf ("%s%02X", (i % 16 == 0) ? "\n    " : " ", ptr[i]);
+ }
+ 
+-static void fips_test ()
++static void
++fips_test (void)
+ {
+     static const unsigned char fipskey[16] = {
+ 	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+@@ -254,7 +256,8 @@ cts_dec (unsigned char *out, unsigned char *in, unsigned char *iv,
+     memcpy(out+B, pn, len-B);
+ }
+ 
+-static void ecb_test ()
++static void
++ecb_test (void)
+ {
+     unsigned int testno;
+     uint8_t output[4 * B], tmp[4 * B];
+@@ -285,7 +288,8 @@ static void ecb_test ()
+ 
+ unsigned char ivec[16] = { 0 };
+ 
+-static void cbc_test ()
++static void
++cbc_test (void)
+ {
+     unsigned int testno;
+     uint8_t output[4 * B], tmp[4 * B];
+@@ -314,7 +318,8 @@ static void cbc_test ()
+     printf ("\n");
+ }
+ 
+-static void cts_test ()
++static void
++cts_test (void)
+ {
+     unsigned int testno;
+     uint8_t output[4 * B], tmp[4 * B];
+@@ -339,7 +344,8 @@ static void cts_test ()
+     printf ("\n");
+ }
+ 
+-int main ()
++int
++main (void)
+ {
+     init ();
+     fips_test ();
+diff --git a/src/lib/crypto/builtin/camellia/camellia-gen.c b/src/lib/crypto/builtin/camellia/camellia-gen.c
+index 23b69c1741..6eca0e0525 100644
+--- a/src/lib/crypto/builtin/camellia/camellia-gen.c
++++ b/src/lib/crypto/builtin/camellia/camellia-gen.c
+@@ -19,7 +19,8 @@ struct {
+ } test_case[NTESTS];
+ camellia_ctx ctx, dctx;
+ 
+-static void init ()
++static void
++init (void)
+ {
+     size_t i, j;
+     cam_rval r;
+@@ -46,7 +47,8 @@ static void hexdump(const unsigned char *ptr, size_t len)
+ 	printf ("%s%02X", (i % 16 == 0) ? "\n    " : " ", ptr[i]);
+ }
+ 
+-static void fips_test ()
++static void
++fips_test (void)
+ {
+     static const unsigned char fipskey[16] = {
+ 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+@@ -234,7 +236,8 @@ cts_dec (unsigned char *out, unsigned char *in, unsigned char *iv,
+     memcpy(out+B, pn, len-B);
+ }
+ 
+-static void ecb_test ()
++static void
++ecb_test (void)
+ {
+     size_t testno;
+     unsigned char tmp[4*B];
+@@ -265,7 +268,8 @@ static void ecb_test ()
+ 
+ unsigned char ivec[16] = { 0 };
+ 
+-static void cbc_test ()
++static void
++cbc_test (void)
+ {
+     size_t testno;
+     unsigned char tmp[4*B];
+@@ -294,7 +298,8 @@ static void cbc_test ()
+     printf ("\n");
+ }
+ 
+-static void cts_test ()
++static void
++cts_test (void)
+ {
+     size_t testno;
+     unsigned char tmp[4*B];
+@@ -319,7 +324,8 @@ static void cts_test ()
+     printf ("\n");
+ }
+ 
+-int main ()
++int
++main (void)
+ {
+     init ();
+     fips_test ();
+diff --git a/src/lib/crypto/builtin/sha1/t_shs.c b/src/lib/crypto/builtin/sha1/t_shs.c
+index c1d18f5571..a668cb0c06 100644
+--- a/src/lib/crypto/builtin/sha1/t_shs.c
++++ b/src/lib/crypto/builtin/sha1/t_shs.c
+@@ -29,9 +29,8 @@ static SHS_LONG shsTestResults[][ 5 ] = {
+ };
+ #endif /* NEW_SHS */
+ 
+-static int compareSHSresults(shsInfo, shsTestLevel)
+-    SHS_INFO *shsInfo;
+-    int shsTestLevel;
++static int
++compareSHSresults(SHS_INFO *shsInfo, int shsTestLevel)
+ {
+     int i, fail = 0;
+ 
+@@ -55,7 +54,7 @@ static int compareSHSresults(shsInfo, shsTestLevel)
+ }
+ 
+ int
+-main()
++main(int argc, char *argv[])
+ {
+     SHS_INFO shsInfo;
+     unsigned int i;
+diff --git a/src/lib/crypto/builtin/sha1/t_shs3.c b/src/lib/crypto/builtin/sha1/t_shs3.c
+index 7aa0bbdee3..87caf7fa37 100644
+--- a/src/lib/crypto/builtin/sha1/t_shs3.c
++++ b/src/lib/crypto/builtin/sha1/t_shs3.c
+@@ -55,9 +55,7 @@ int mode;
+ int Dflag;
+ 
+ int
+-main(argc,argv)
+-    int argc;
+-    char **argv;
++main(int argc, char **argv)
+ {
+     char *argp;
+ 
+@@ -131,8 +129,7 @@ static void process(void)
+ 
+ #ifndef shsDigest
+ static unsigned char *
+-shsDigest(si)
+-    SHS_INFO *si;
++shsDigest(SHS_INFO *si)
+ {
+     longReverse(si->digest, SHS_DIGESTSIZE);
+     return (unsigned char*) si->digest;
+diff --git a/src/lib/crypto/crypto_tests/aes-test.c b/src/lib/crypto/crypto_tests/aes-test.c
+index a7382a48ad..d26f711b8d 100644
+--- a/src/lib/crypto/crypto_tests/aes-test.c
++++ b/src/lib/crypto/crypto_tests/aes-test.c
+@@ -37,14 +37,14 @@ static char plain[16], cipher[16], zero[16];
+ 
+ static krb5_keyblock enc_key;
+ static krb5_data ivec;
+-static void init()
++static void init(void)
+ {
+     enc_key.contents = (krb5_octet *)key;
+     enc_key.length = 16;
+     ivec.data = zero;
+     ivec.length = 16;
+ }
+-static void enc()
++static void enc(void)
+ {
+     krb5_key k;
+     krb5_crypto_iov iov;
+@@ -93,7 +93,7 @@ static void vk_test_1(int len, krb5_enctype etype)
+     }
+     printf("\n==========\n");
+ }
+-static void vk_test()
++static void vk_test(void)
+ {
+     vk_test_1(16, ENCTYPE_AES128_CTS_HMAC_SHA1_96);
+     vk_test_1(32, ENCTYPE_AES256_CTS_HMAC_SHA1_96);
+@@ -119,7 +119,7 @@ static void vt_test_1(int len, krb5_enctype etype)
+     }
+     printf("\n==========\n");
+ }
+-static void vt_test()
++static void vt_test(void)
+ {
+     vt_test_1(16, ENCTYPE_AES128_CTS_HMAC_SHA1_96);
+     vt_test_1(32, ENCTYPE_AES256_CTS_HMAC_SHA1_96);
+diff --git a/src/lib/crypto/crypto_tests/camellia-test.c b/src/lib/crypto/crypto_tests/camellia-test.c
+index 23d14667e1..ca6579f7d1 100644
+--- a/src/lib/crypto/crypto_tests/camellia-test.c
++++ b/src/lib/crypto/crypto_tests/camellia-test.c
+@@ -35,14 +35,14 @@ static char plain[16], cipher[16], zero[16];
+ 
+ static krb5_keyblock enc_key;
+ static krb5_data ivec;
+-static void init()
++static void init(void)
+ {
+     enc_key.contents = (unsigned char *)key;
+     enc_key.length = 16;
+     ivec.data = zero;
+     ivec.length = 16;
+ }
+-static void enc()
++static void enc(void)
+ {
+     krb5_key k;
+     krb5_crypto_iov iov;
+@@ -91,7 +91,7 @@ static void vk_test_1(int len)
+     }
+     printf("\n==========\n");
+ }
+-static void vk_test()
++static void vk_test(void)
+ {
+     vk_test_1(16);
+     vk_test_1(32);
+@@ -117,7 +117,7 @@ static void vt_test_1(int len, krb5_enctype etype)
+     }
+     printf("\n==========\n");
+ }
+-static void vt_test()
++static void vt_test(void)
+ {
+     vt_test_1(16, ENCTYPE_CAMELLIA128_CTS_CMAC);
+     vt_test_1(32, ENCTYPE_CAMELLIA256_CTS_CMAC);
+diff --git a/src/lib/crypto/crypto_tests/t_cf2.c b/src/lib/crypto/crypto_tests/t_cf2.c
+index 67c9dcdee2..4c894ad09c 100644
+--- a/src/lib/crypto/crypto_tests/t_cf2.c
++++ b/src/lib/crypto/crypto_tests/t_cf2.c
+@@ -46,7 +46,9 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-int main () {
++int
++main(void)
++{
+     krb5_error_code ret;
+     char pepper1[1025], pepper2[1025];
+     krb5_keyblock *k1 = NULL, *k2 = NULL, *out = NULL;
+diff --git a/src/lib/crypto/crypto_tests/t_cts.c b/src/lib/crypto/crypto_tests/t_cts.c
+index fe505169f3..f8a5a534b2 100644
+--- a/src/lib/crypto/crypto_tests/t_cts.c
++++ b/src/lib/crypto/crypto_tests/t_cts.c
+@@ -77,7 +77,7 @@ static void printk(const char *descr, krb5_keyblock *k) {
+     printd(descr, &d);
+ }
+ 
+-static void test_cts()
++static void test_cts(void)
+ {
+     static const char input[4*16] =
+         "I would like the General Gau's Chicken, please, and wonton soup.";
+diff --git a/src/lib/crypto/crypto_tests/t_encrypt.c b/src/lib/crypto/crypto_tests/t_encrypt.c
+index 290a72e1e0..83bc98a2f1 100644
+--- a/src/lib/crypto/crypto_tests/t_encrypt.c
++++ b/src/lib/crypto/crypto_tests/t_encrypt.c
+@@ -87,7 +87,7 @@ display(const char *msg, const krb5_data *d)
+ }
+ 
+ int
+-main ()
++main(void)
+ {
+     krb5_context context = 0;
+     krb5_data  in, in2, out, out2, check, check2, state, signdata;
+diff --git a/src/lib/crypto/crypto_tests/t_fork.c b/src/lib/crypto/crypto_tests/t_fork.c
+index 428fc8a6a1..8be7474227 100644
+--- a/src/lib/crypto/crypto_tests/t_fork.c
++++ b/src/lib/crypto/crypto_tests/t_fork.c
+@@ -55,7 +55,7 @@ prepare_enc_data(krb5_key key, size_t in_len, krb5_enc_data *enc_data)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_keyblock kb_aes, kb_rc4;
+     krb5_key key_aes, key_rc4;
+diff --git a/src/lib/crypto/crypto_tests/t_hmac.c b/src/lib/crypto/crypto_tests/t_hmac.c
+index da359cb494..e40136bff0 100644
+--- a/src/lib/crypto/crypto_tests/t_hmac.c
++++ b/src/lib/crypto/crypto_tests/t_hmac.c
+@@ -122,7 +122,8 @@ static krb5_error_code hmac1(const struct krb5_hash_provider *h,
+     return err;
+ }
+ 
+-static void test_hmac()
++static void
++test_hmac(void)
+ {
+     krb5_keyblock key;
+     krb5_data in, out;
+diff --git a/src/lib/crypto/crypto_tests/t_mddriver.c b/src/lib/crypto/crypto_tests/t_mddriver.c
+index ad65d03156..035f825bbc 100644
+--- a/src/lib/crypto/crypto_tests/t_mddriver.c
++++ b/src/lib/crypto/crypto_tests/t_mddriver.c
+@@ -111,9 +111,8 @@ struct md_test_entry md_test_suite[] = {
+    -t       - runs time trial
+    -x       - runs test script
+ */
+-int main (argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     int i;
+ 
+@@ -128,10 +127,8 @@ int main (argc, argv)
+     return (0);
+ }
+ 
+-static void MDHash (bytes, len, count, out)
+-    char *bytes;
+-    size_t len, count;
+-    unsigned char *out;
++static void
++MDHash(char *bytes, size_t len, size_t count, unsigned char *out)
+ {
+     krb5_crypto_iov *iov;
+     krb5_data outdata = make_data (out, MDProvider.hashsize);
+@@ -150,8 +147,8 @@ static void MDHash (bytes, len, count, out)
+ 
+ /* Digests a string and prints the result.
+  */
+-static void MDString (string)
+-    char *string;
++static void
++MDString(char *string)
+ {
+     unsigned char digest[16];
+ 
+@@ -164,7 +161,8 @@ static void MDString (string)
+ /* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte
+    blocks.
+ */
+-static void MDTimeTrial ()
++static void
++MDTimeTrial(void)
+ {
+     time_t endTime, startTime;
+     unsigned char block[TEST_BLOCK_LEN], digest[16];
+@@ -197,7 +195,8 @@ static void MDTimeTrial ()
+ 
+ /* Digests a reference suite of strings and prints the results.
+  */
+-static void MDTestSuite ()
++static void
++MDTestSuite(void)
+ {
+ #ifdef HAVE_TEST_SUITE
+     struct md_test_entry *entry;
+@@ -246,8 +245,8 @@ static void MDTestSuite ()
+ 
+ /* Prints a message digest in hexadecimal.
+  */
+-static void MDPrint (digest)
+-    unsigned char digest[16];
++static void
++MDPrint(unsigned char digest[16])
+ {
+     unsigned int i;
+ 
+diff --git a/src/lib/crypto/crypto_tests/t_nfold.c b/src/lib/crypto/crypto_tests/t_nfold.c
+index b94353c221..a741b61e0c 100644
+--- a/src/lib/crypto/crypto_tests/t_nfold.c
++++ b/src/lib/crypto/crypto_tests/t_nfold.c
+@@ -33,17 +33,20 @@
+ 
+ #define ASIZE(ARRAY) (sizeof(ARRAY)/sizeof(ARRAY[0]))
+ 
+-static void printhex (size_t len, const unsigned char *p)
++static void
++printhex(size_t len, const unsigned char *p)
+ {
+     while (len--)
+         printf ("%02x", 0xff & *p++);
+ }
+ 
+-static void printstringhex (const unsigned char *p) {
++static void
++printstringhex(const unsigned char *p) {
+     printhex (strlen ((const char *) p), p);
+ }
+ 
+-static void rfc_tests ()
++static void
++rfc_tests(void)
+ {
+     unsigned i;
+     struct {
+@@ -92,7 +95,8 @@ static void rfc_tests ()
+     }
+ }
+ 
+-static void fold_kerberos(unsigned int nbytes)
++static void
++fold_kerberos(unsigned int nbytes)
+ {
+     unsigned char cipher_text[300];
+     unsigned int j;
+@@ -125,9 +129,7 @@ unsigned char nfold_192[4][24] = {
+ };
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     unsigned char cipher_text[64];
+     unsigned int i, j;
+diff --git a/src/lib/crypto/crypto_tests/t_prf.c b/src/lib/crypto/crypto_tests/t_prf.c
+index d9877bd1f7..6fa0afb183 100644
+--- a/src/lib/crypto/crypto_tests/t_prf.c
++++ b/src/lib/crypto/crypto_tests/t_prf.c
+@@ -116,7 +116,7 @@ struct test {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_error_code ret;
+     krb5_data output;
+diff --git a/src/lib/crypto/crypto_tests/t_sha2.c b/src/lib/crypto/crypto_tests/t_sha2.c
+index e6fa584982..776c4e964f 100644
+--- a/src/lib/crypto/crypto_tests/t_sha2.c
++++ b/src/lib/crypto/crypto_tests/t_sha2.c
+@@ -137,7 +137,7 @@ hash_test(const struct krb5_hash_provider *hash, struct test *tests)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     hash_test(&krb5int_hash_sha256, sha256_tests);
+     hash_test(&krb5int_hash_sha384, sha384_tests);
+diff --git a/src/lib/gssapi/generic/t_seqstate.c b/src/lib/gssapi/generic/t_seqstate.c
+index 8f44fcf3ed..4df1ed6b9c 100644
+--- a/src/lib/gssapi/generic/t_seqstate.c
++++ b/src/lib/gssapi/generic/t_seqstate.c
+@@ -164,7 +164,7 @@ struct test {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i, j;
+     enum width w;
+diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
+index d7c2ad321e..90a9ad2d9d 100644
+--- a/src/lib/gssapi/krb5/accept_sec_context.c
++++ b/src/lib/gssapi/krb5/accept_sec_context.c
+@@ -160,11 +160,8 @@ create_constrained_deleg_creds(OM_uint32 *minor_status,
+ 
+ /* Decode, decrypt and store the forwarded creds in the local ccache. */
+ static krb5_error_code
+-rd_and_store_for_creds(context, auth_context, inbuf, out_cred)
+-    krb5_context context;
+-    krb5_auth_context auth_context;
+-    krb5_data *inbuf;
+-    krb5_gss_cred_id_t *out_cred;
++rd_and_store_for_creds(krb5_context context, krb5_auth_context auth_context,
++                       krb5_data *inbuf, krb5_gss_cred_id_t *out_cred)
+ {
+     krb5_creds ** creds = NULL;
+     krb5_error_code retval;
+@@ -286,20 +283,12 @@ cleanup:
+  * Performs third leg of DCE authentication
+  */
+ static OM_uint32
+-kg_accept_dce(minor_status, context_handle, verifier_cred_handle,
+-              input_token, input_chan_bindings, src_name, mech_type,
+-              output_token, ret_flags, time_rec, delegated_cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_cred_id_t verifier_cred_handle;
+-    gss_buffer_t input_token;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_name_t *src_name;
+-    gss_OID *mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
+-    gss_cred_id_t *delegated_cred_handle;
++kg_accept_dce(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++              gss_cred_id_t verifier_cred_handle, gss_buffer_t input_token,
++              gss_channel_bindings_t input_chan_bindings, gss_name_t *src_name,
++              gss_OID *mech_type, gss_buffer_t output_token,
++              OM_uint32 *ret_flags, OM_uint32 *time_rec,
++              gss_cred_id_t *delegated_cred_handle)
+ {
+     krb5_error_code code;
+     krb5_gss_ctx_id_rec *ctx = 0;
+@@ -637,23 +626,13 @@ fail:
+ }
+ 
+ static OM_uint32
+-kg_accept_krb5(minor_status, context_handle,
+-               verifier_cred_handle, input_token,
+-               input_chan_bindings, src_name, mech_type,
+-               output_token, ret_flags, time_rec,
+-               delegated_cred_handle, exts)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_cred_id_t verifier_cred_handle;
+-    gss_buffer_t input_token;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_name_t *src_name;
+-    gss_OID *mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
+-    gss_cred_id_t *delegated_cred_handle;
+-    krb5_gss_ctx_ext_t exts;
++kg_accept_krb5(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++               gss_cred_id_t verifier_cred_handle, gss_buffer_t input_token,
++               gss_channel_bindings_t input_chan_bindings,
++               gss_name_t *src_name, gss_OID *mech_type,
++               gss_buffer_t output_token, OM_uint32 *ret_flags,
++               OM_uint32 *time_rec, gss_cred_id_t *delegated_cred_handle,
++               krb5_gss_ctx_ext_t exts)
+ {
+     krb5_context context;
+     unsigned char *ptr;
+@@ -1309,22 +1288,15 @@ krb5_gss_accept_sec_context_ext(
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_accept_sec_context(minor_status, context_handle,
+-                            verifier_cred_handle, input_token,
+-                            input_chan_bindings, src_name, mech_type,
+-                            output_token, ret_flags, time_rec,
+-                            delegated_cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_cred_id_t verifier_cred_handle;
+-    gss_buffer_t input_token;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_name_t *src_name;
+-    gss_OID *mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
+-    gss_cred_id_t *delegated_cred_handle;
++krb5_gss_accept_sec_context(OM_uint32 *minor_status,
++                            gss_ctx_id_t *context_handle,
++                            gss_cred_id_t verifier_cred_handle,
++                            gss_buffer_t input_token,
++                            gss_channel_bindings_t input_chan_bindings,
++                            gss_name_t *src_name, gss_OID *mech_type,
++                            gss_buffer_t output_token, OM_uint32 *ret_flags,
++                            OM_uint32 *time_rec,
++                            gss_cred_id_t *delegated_cred_handle)
+ {
+     krb5_gss_ctx_ext_rec exts;
+ 
+diff --git a/src/lib/gssapi/krb5/compare_name.c b/src/lib/gssapi/krb5/compare_name.c
+index 3f3788d2bf..3aa5a0d79f 100644
+--- a/src/lib/gssapi/krb5/compare_name.c
++++ b/src/lib/gssapi/krb5/compare_name.c
+@@ -28,11 +28,8 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_compare_name(minor_status, name1, name2, name_equal)
+-    OM_uint32 *minor_status;
+-    gss_name_t name1;
+-    gss_name_t name2;
+-    int *name_equal;
++krb5_gss_compare_name(OM_uint32 *minor_status, gss_name_t name1,
++                      gss_name_t name2, int *name_equal)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/context_time.c b/src/lib/gssapi/krb5/context_time.c
+index 226de05f51..0ab885deca 100644
+--- a/src/lib/gssapi/krb5/context_time.c
++++ b/src/lib/gssapi/krb5/context_time.c
+@@ -28,10 +28,8 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_context_time(minor_status, context_handle, time_rec)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    OM_uint32 *time_rec;
++krb5_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                      OM_uint32 *time_rec)
+ {
+     krb5_error_code code;
+     krb5_gss_ctx_id_rec *ctx;
+diff --git a/src/lib/gssapi/krb5/delete_sec_context.c b/src/lib/gssapi/krb5/delete_sec_context.c
+index 4b9dfae0d5..92e84b79c5 100644
+--- a/src/lib/gssapi/krb5/delete_sec_context.c
++++ b/src/lib/gssapi/krb5/delete_sec_context.c
+@@ -28,10 +28,9 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_delete_sec_context(minor_status, context_handle, output_token)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_buffer_t output_token;
++krb5_gss_delete_sec_context(OM_uint32 *minor_status,
++                            gss_ctx_id_t *context_handle,
++                            gss_buffer_t output_token)
+ {
+     krb5_context context;
+     krb5_gss_ctx_id_rec *ctx;
+diff --git a/src/lib/gssapi/krb5/disp_name.c b/src/lib/gssapi/krb5/disp_name.c
+index b097bf0e21..75fef01238 100644
+--- a/src/lib/gssapi/krb5/disp_name.c
++++ b/src/lib/gssapi/krb5/disp_name.c
+@@ -24,12 +24,9 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_display_name(minor_status, input_name, output_name_buffer,
+-                      output_name_type)
+-    OM_uint32 *minor_status;
+-    gss_name_t input_name;
+-    gss_buffer_t output_name_buffer;
+-    gss_OID *output_name_type;
++krb5_gss_display_name(OM_uint32 *minor_status, gss_name_t input_name,
++                      gss_buffer_t output_name_buffer,
++                      gss_OID *output_name_type)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
+index 6ff62a9d84..71000b7a45 100644
+--- a/src/lib/gssapi/krb5/disp_status.c
++++ b/src/lib/gssapi/krb5/disp_status.c
+@@ -154,14 +154,9 @@ void krb5_gss_delete_error_info(void *p)
+ /**/
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_display_status(minor_status, status_value, status_type,
+-                        mech_type, message_context, status_string)
+-    OM_uint32 *minor_status;
+-    OM_uint32 status_value;
+-    int status_type;
+-    gss_OID mech_type;
+-    OM_uint32 *message_context;
+-    gss_buffer_t status_string;
++krb5_gss_display_status(OM_uint32 *minor_status, OM_uint32 status_value,
++                        int status_type, gss_OID mech_type,
++                        OM_uint32 *message_context, gss_buffer_t status_string)
+ {
+     status_string->length = 0;
+     status_string->value = NULL;
+diff --git a/src/lib/gssapi/krb5/export_sec_context.c b/src/lib/gssapi/krb5/export_sec_context.c
+index 44e50080ab..9730e0597f 100644
+--- a/src/lib/gssapi/krb5/export_sec_context.c
++++ b/src/lib/gssapi/krb5/export_sec_context.c
+@@ -27,10 +27,9 @@
+ #include "gssapiP_krb5.h"
+ #ifndef LEAN_CLIENT
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_export_sec_context(minor_status, context_handle, interprocess_token)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        *context_handle;
+-    gss_buffer_t        interprocess_token;
++krb5_gss_export_sec_context(OM_uint32 *minor_status,
++                            gss_ctx_id_t *context_handle,
++                            gss_buffer_t interprocess_token)
+ {
+     krb5_context        context = NULL;
+     krb5_error_code     kret;
+diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
+index 1e62b07cde..370b7d152a 100644
+--- a/src/lib/gssapi/krb5/gssapi_krb5.c
++++ b/src/lib/gssapi/krb5/gssapi_krb5.c
+@@ -197,9 +197,7 @@ g_set kg_vdb = G_SET_INIT;
+  * so handling the expiration/invalidation condition here isn't needed.
+  */
+ OM_uint32
+-kg_get_defcred(minor_status, cred)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t *cred;
++kg_get_defcred(OM_uint32 *minor_status, gss_cred_id_t *cred)
+ {
+     OM_uint32 major;
+ 
+diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
+index f64635a202..cc6883b5fe 100644
+--- a/src/lib/gssapi/krb5/import_name.c
++++ b/src/lib/gssapi/krb5/import_name.c
+@@ -120,12 +120,8 @@ parse_hostbased(const char *str, size_t len,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_import_name(minor_status, input_name_buffer,
+-                     input_name_type, output_name)
+-    OM_uint32 *minor_status;
+-    gss_buffer_t input_name_buffer;
+-    gss_OID input_name_type;
+-    gss_name_t *output_name;
++krb5_gss_import_name(OM_uint32 *minor_status, gss_buffer_t input_name_buffer,
++                     gss_OID input_name_type, gss_name_t *output_name)
+ {
+     krb5_context context;
+     krb5_principal princ = NULL;
+diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c
+index 7d26f4df87..e39c036b80 100644
+--- a/src/lib/gssapi/krb5/import_sec_context.c
++++ b/src/lib/gssapi/krb5/import_sec_context.c
+@@ -32,8 +32,7 @@
+  * Fix up the OID of the mechanism so that uses the static version of
+  * the OID if possible.
+  */
+-gss_OID krb5_gss_convert_static_mech_oid(oid)
+-    gss_OID    oid;
++gss_OID krb5_gss_convert_static_mech_oid(gss_OID oid)
+ {
+     const gss_OID_desc      *p;
+     OM_uint32               minor_status;
+@@ -49,10 +48,9 @@ gss_OID krb5_gss_convert_static_mech_oid(oid)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_import_sec_context(minor_status, interprocess_token, context_handle)
+-    OM_uint32           *minor_status;
+-    gss_buffer_t        interprocess_token;
+-    gss_ctx_id_t        *context_handle;
++krb5_gss_import_sec_context(OM_uint32 *minor_status,
++                            gss_buffer_t interprocess_token,
++                            gss_ctx_id_t *context_handle)
+ {
+     krb5_context        context;
+     krb5_error_code     kret = 0;
+diff --git a/src/lib/gssapi/krb5/indicate_mechs.c b/src/lib/gssapi/krb5/indicate_mechs.c
+index 45538cb779..49d55e6217 100644
+--- a/src/lib/gssapi/krb5/indicate_mechs.c
++++ b/src/lib/gssapi/krb5/indicate_mechs.c
+@@ -29,9 +29,7 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_indicate_mechs(minor_status, mech_set)
+-    OM_uint32 *minor_status;
+-    gss_OID_set *mech_set;
++krb5_gss_indicate_mechs(OM_uint32 *minor_status, gss_OID_set *mech_set)
+ {
+     return generic_gss_copy_oid_set(minor_status, kg_all_mechs, mech_set);
+ }
+diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
+index 5748b8434c..0397fe1dfd 100644
+--- a/src/lib/gssapi/krb5/init_sec_context.c
++++ b/src/lib/gssapi/krb5/init_sec_context.c
+@@ -117,14 +117,10 @@ int krb5_gss_dbg_client_expcreds = 0;
+  * Common code which fetches the correct krb5 credentials from the
+  * ccache.
+  */
+-static krb5_error_code get_credentials(context, cred, server, now,
+-                                       endtime, out_creds)
+-    krb5_context context;
+-    krb5_gss_cred_id_t cred;
+-    krb5_gss_name_t server;
+-    krb5_timestamp now;
+-    krb5_timestamp endtime;
+-    krb5_creds **out_creds;
++static krb5_error_code
++get_credentials(krb5_context context, krb5_gss_cred_id_t cred,
++                krb5_gss_name_t server, krb5_timestamp now,
++                krb5_timestamp endtime, krb5_creds **out_creds)
+ {
+     krb5_error_code     code;
+     krb5_creds          in_creds, evidence_creds, mcreds, *result_creds = NULL;
+@@ -365,17 +361,11 @@ cleanup:
+ }
+ 
+ static krb5_error_code
+-make_ap_req_v1(context, ctx, cred, k_cred, ad_context,
+-               chan_bindings, mech_type, token, exts)
+-    krb5_context context;
+-    krb5_gss_ctx_id_rec *ctx;
+-    krb5_gss_cred_id_t cred;
+-    krb5_creds *k_cred;
+-    krb5_authdata_context ad_context;
+-    gss_channel_bindings_t chan_bindings;
+-    gss_OID mech_type;
+-    gss_buffer_t token;
+-    krb5_gss_ctx_ext_t exts;
++make_ap_req_v1(krb5_context context, krb5_gss_ctx_id_rec *ctx,
++               krb5_gss_cred_id_t cred, krb5_creds *k_cred,
++               krb5_authdata_context ad_context,
++               gss_channel_bindings_t chan_bindings, gss_OID mech_type,
++               gss_buffer_t token, krb5_gss_ctx_ext_t exts)
+ {
+     krb5_flags mk_req_flags = 0;
+     krb5_error_code code;
+@@ -1048,24 +1038,15 @@ krb5int_gss_use_kdc_context(OM_uint32 *minor_status,
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
+-                          context_handle, target_name, mech_type,
+-                          req_flags, time_req, input_chan_bindings,
+-                          input_token, actual_mech_type, output_token,
+-                          ret_flags, time_rec)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t claimant_cred_handle;
+-    gss_ctx_id_t *context_handle;
+-    gss_name_t target_name;
+-    gss_OID mech_type;
+-    OM_uint32 req_flags;
+-    OM_uint32 time_req;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_buffer_t input_token;
+-    gss_OID *actual_mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
++krb5_gss_init_sec_context(OM_uint32 *minor_status,
++                          gss_cred_id_t claimant_cred_handle,
++                          gss_ctx_id_t *context_handle,
++                          gss_name_t target_name, gss_OID mech_type,
++                          OM_uint32 req_flags, OM_uint32 time_req,
++                          gss_channel_bindings_t input_chan_bindings,
++                          gss_buffer_t input_token, gss_OID *actual_mech_type,
++                          gss_buffer_t output_token, OM_uint32 *ret_flags,
++                          OM_uint32 *time_rec)
+ {
+     krb5_gss_ctx_ext_rec exts;
+ 
+diff --git a/src/lib/gssapi/krb5/inq_context.c b/src/lib/gssapi/krb5/inq_context.c
+index 97678e3ec5..f8229f9750 100644
+--- a/src/lib/gssapi/krb5/inq_context.c
++++ b/src/lib/gssapi/krb5/inq_context.c
+@@ -78,18 +78,11 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_context(minor_status, context_handle, initiator_name,
+-                         acceptor_name, lifetime_rec, mech_type, ret_flags,
+-                         locally_initiated, opened)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    gss_name_t *initiator_name;
+-    gss_name_t *acceptor_name;
+-    OM_uint32 *lifetime_rec;
+-    gss_OID *mech_type;
+-    OM_uint32 *ret_flags;
+-    int *locally_initiated;
+-    int *opened;
++krb5_gss_inquire_context(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                         gss_name_t *initiator_name, gss_name_t *acceptor_name,
++                         OM_uint32 *lifetime_rec, gss_OID *mech_type,
++                         OM_uint32 *ret_flags, int *locally_initiated,
++                         int *opened)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c
+index 0e675959a3..e968f8ad32 100644
+--- a/src/lib/gssapi/krb5/inq_cred.c
++++ b/src/lib/gssapi/krb5/inq_cred.c
+@@ -73,14 +73,9 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
+-                      cred_usage, mechanisms)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t cred_handle;
+-    gss_name_t *name;
+-    OM_uint32 *lifetime_ret;
+-    gss_cred_usage_t *cred_usage;
+-    gss_OID_set *mechanisms;
++krb5_gss_inquire_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
++                      gss_name_t *name, OM_uint32 *lifetime_ret,
++                      gss_cred_usage_t *cred_usage, gss_OID_set *mechanisms)
+ {
+     krb5_context context;
+     gss_cred_id_t defcred = GSS_C_NO_CREDENTIAL;
+@@ -209,16 +204,11 @@ cleanup:
+ 
+ /* V2 interface */
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
+-                              mech_type, name, initiator_lifetime,
+-                              acceptor_lifetime, cred_usage)
+-    OM_uint32           *minor_status;
+-    gss_cred_id_t       cred_handle;
+-    gss_OID             mech_type;
+-    gss_name_t          *name;
+-    OM_uint32           *initiator_lifetime;
+-    OM_uint32           *acceptor_lifetime;
+-    gss_cred_usage_t *cred_usage;
++krb5_gss_inquire_cred_by_mech(OM_uint32 *minor_status,
++                              gss_cred_id_t cred_handle, gss_OID mech_type,
++                              gss_name_t *name, OM_uint32 *initiator_lifetime,
++                              OM_uint32 *acceptor_lifetime,
++                              gss_cred_usage_t *cred_usage)
+ {
+     krb5_gss_cred_id_t  cred;
+     OM_uint32           lifetime;
+diff --git a/src/lib/gssapi/krb5/inq_names.c b/src/lib/gssapi/krb5/inq_names.c
+index b326adbb5f..4a3709be4b 100644
+--- a/src/lib/gssapi/krb5/inq_names.c
++++ b/src/lib/gssapi/krb5/inq_names.c
+@@ -27,10 +27,8 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
+-    OM_uint32   *minor_status;
+-    gss_OID     mechanism;
+-    gss_OID_set *name_types;
++krb5_gss_inquire_names_for_mech(OM_uint32 *minor_status, gss_OID mechanism,
++                                gss_OID_set *name_types)
+ {
+     OM_uint32   major, minor;
+ 
+diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
+index 0e5d10b115..1148f6929b 100644
+--- a/src/lib/gssapi/krb5/k5seal.c
++++ b/src/lib/gssapi/krb5/k5seal.c
+@@ -271,16 +271,10 @@ make_seal_token_v1 (krb5_context context,
+    and do not encode the ENC_TYPE, MSG_LENGTH, or MSG_TEXT fields */
+ 
+ OM_uint32
+-kg_seal(minor_status, context_handle, conf_req_flag, qop_req,
+-        input_message_buffer, conf_state, output_message_buffer, toktype)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    int conf_req_flag;
+-    gss_qop_t qop_req;
+-    gss_buffer_t input_message_buffer;
+-    int *conf_state;
+-    gss_buffer_t output_message_buffer;
+-    int toktype;
++kg_seal(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++        int conf_req_flag, gss_qop_t qop_req,
++        gss_buffer_t input_message_buffer, int *conf_state,
++        gss_buffer_t output_message_buffer, int toktype)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     krb5_error_code code;
+@@ -342,16 +336,10 @@ kg_seal(minor_status, context_handle, conf_req_flag, qop_req,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+-              qop_req, input_message_buffer, conf_state,
+-              output_message_buffer)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    int                 conf_req_flag;
+-    gss_qop_t           qop_req;
+-    gss_buffer_t        input_message_buffer;
+-    int                 *conf_state;
+-    gss_buffer_t        output_message_buffer;
++krb5_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++              int conf_req_flag, gss_qop_t qop_req,
++              gss_buffer_t input_message_buffer, int *conf_state,
++              gss_buffer_t output_message_buffer)
+ {
+     return(kg_seal(minor_status, context_handle, conf_req_flag,
+                    qop_req, input_message_buffer, conf_state,
+@@ -359,13 +347,9 @@ krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_get_mic(minor_status, context_handle, qop_req,
+-                 message_buffer, message_token)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    gss_qop_t           qop_req;
+-    gss_buffer_t        message_buffer;
+-    gss_buffer_t        message_token;
++krb5_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                 gss_qop_t qop_req, gss_buffer_t message_buffer,
++                 gss_buffer_t message_token)
+ {
+     return(kg_seal(minor_status, context_handle, 0,
+                    qop_req, message_buffer, NULL,
+diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
+index f0cc4a6809..e246365804 100644
+--- a/src/lib/gssapi/krb5/k5unseal.c
++++ b/src/lib/gssapi/krb5/k5unseal.c
+@@ -58,17 +58,10 @@
+    conf_state is only valid if SEAL. */
+ 
+ static OM_uint32
+-kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer,
+-             conf_state, qop_state, toktype)
+-    krb5_context context;
+-    OM_uint32 *minor_status;
+-    krb5_gss_ctx_id_rec *ctx;
+-    unsigned char *ptr;
+-    int bodysize;
+-    gss_buffer_t message_buffer;
+-    int *conf_state;
+-    gss_qop_t *qop_state;
+-    int toktype;
++kg_unseal_v1(krb5_context context, OM_uint32 *minor_status,
++             krb5_gss_ctx_id_rec *ctx, unsigned char *ptr, int bodysize,
++             gss_buffer_t message_buffer, int *conf_state,
++             gss_qop_t *qop_state, int toktype)
+ {
+     krb5_error_code code;
+     int conflen = 0;
+@@ -342,15 +335,9 @@ kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer,
+    conf_state is only valid if SEAL. */
+ 
+ OM_uint32
+-kg_unseal(minor_status, context_handle, input_token_buffer,
+-          message_buffer, conf_state, qop_state, toktype)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    gss_buffer_t input_token_buffer;
+-    gss_buffer_t message_buffer;
+-    int *conf_state;
+-    gss_qop_t *qop_state;
+-    int toktype;
++kg_unseal(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++          gss_buffer_t input_token_buffer, gss_buffer_t message_buffer,
++          int *conf_state, gss_qop_t *qop_state, int toktype)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     unsigned char *ptr;
+@@ -421,15 +408,10 @@ kg_unseal(minor_status, context_handle, input_token_buffer,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_unwrap(minor_status, context_handle,
+-                input_message_buffer, output_message_buffer,
+-                conf_state, qop_state)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    gss_buffer_t        input_message_buffer;
+-    gss_buffer_t        output_message_buffer;
+-    int                 *conf_state;
+-    gss_qop_t           *qop_state;
++krb5_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                gss_buffer_t input_message_buffer,
++                gss_buffer_t output_message_buffer, int *conf_state,
++                gss_qop_t *qop_state)
+ {
+     OM_uint32           rstat;
+ 
+@@ -440,14 +422,9 @@ krb5_gss_unwrap(minor_status, context_handle,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_verify_mic(minor_status, context_handle,
+-                    message_buffer, token_buffer,
+-                    qop_state)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    gss_buffer_t        message_buffer;
+-    gss_buffer_t        token_buffer;
+-    gss_qop_t           *qop_state;
++krb5_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                    gss_buffer_t message_buffer, gss_buffer_t token_buffer,
++                    gss_qop_t *qop_state)
+ {
+     OM_uint32           rstat;
+ 
+diff --git a/src/lib/gssapi/krb5/process_context_token.c b/src/lib/gssapi/krb5/process_context_token.c
+index a672f48c85..67805fba78 100644
+--- a/src/lib/gssapi/krb5/process_context_token.c
++++ b/src/lib/gssapi/krb5/process_context_token.c
+@@ -28,11 +28,9 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_process_context_token(minor_status, context_handle,
+-                               token_buffer)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    gss_buffer_t token_buffer;
++krb5_gss_process_context_token(OM_uint32 *minor_status,
++                               gss_ctx_id_t context_handle,
++                               gss_buffer_t token_buffer)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     OM_uint32 majerr;
+diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c
+index 0da6c1b950..9e04e2fa81 100644
+--- a/src/lib/gssapi/krb5/rel_cred.c
++++ b/src/lib/gssapi/krb5/rel_cred.c
+@@ -24,9 +24,7 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_release_cred(minor_status, cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t *cred_handle;
++krb5_gss_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle)
+ {
+     krb5_context context;
+     krb5_gss_cred_id_t cred;
+diff --git a/src/lib/gssapi/krb5/rel_name.c b/src/lib/gssapi/krb5/rel_name.c
+index 3dabe32f33..558bb6dbc5 100644
+--- a/src/lib/gssapi/krb5/rel_name.c
++++ b/src/lib/gssapi/krb5/rel_name.c
+@@ -24,9 +24,7 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_release_name(minor_status, input_name)
+-    OM_uint32 *minor_status;
+-    gss_name_t *input_name;
++krb5_gss_release_name(OM_uint32 *minor_status, gss_name_t *input_name)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/rel_oid.c b/src/lib/gssapi/krb5/rel_oid.c
+index 739efe4680..900c4105f9 100644
+--- a/src/lib/gssapi/krb5/rel_oid.c
++++ b/src/lib/gssapi/krb5/rel_oid.c
+@@ -27,9 +27,7 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32
+-krb5_gss_release_oid(minor_status, oid)
+-    OM_uint32   *minor_status;
+-    gss_OID     *oid;
++krb5_gss_release_oid(OM_uint32 *minor_status, gss_OID *oid)
+ {
+     /*
+      * The V2 API says the following!
+@@ -52,9 +50,7 @@ krb5_gss_release_oid(minor_status, oid)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_internal_release_oid(minor_status, oid)
+-    OM_uint32   *minor_status;
+-    gss_OID     *oid;
++krb5_gss_internal_release_oid(OM_uint32 *minor_status, gss_OID *oid)
+ {
+     /*
+      * This function only knows how to release internal OIDs. It will
+diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c
+index 9e2d32e98d..1129b6a1aa 100644
+--- a/src/lib/gssapi/krb5/ser_sctx.c
++++ b/src/lib/gssapi/krb5/ser_sctx.c
+@@ -137,10 +137,8 @@ kg_oid_size(gss_OID oid, size_t *sizep)
+ }
+ 
+ static krb5_error_code
+-kg_seqstate_externalize(arg, buffer, lenremain)
+-    g_seqnum_state      arg;
+-    krb5_octet          **buffer;
+-    size_t              *lenremain;
++kg_seqstate_externalize(g_seqnum_state arg, krb5_octet **buffer,
++                        size_t *lenremain)
+ {
+     krb5_error_code err;
+     err = krb5_ser_pack_int32(KV5M_GSS_QUEUE, buffer, lenremain);
+@@ -152,10 +150,8 @@ kg_seqstate_externalize(arg, buffer, lenremain)
+ }
+ 
+ static krb5_error_code
+-kg_seqstate_internalize(argp, buffer, lenremain)
+-    g_seqnum_state      *argp;
+-    krb5_octet          **buffer;
+-    size_t              *lenremain;
++kg_seqstate_internalize(g_seqnum_state *argp, krb5_octet **buffer,
++                        size_t *lenremain)
+ {
+     krb5_int32 ibuf;
+     krb5_octet         *bp;
+@@ -193,9 +189,7 @@ kg_seqstate_internalize(argp, buffer, lenremain)
+ }
+ 
+ static krb5_error_code
+-kg_seqstate_size(arg, sizep)
+-    g_seqnum_state      arg;
+-    size_t              *sizep;
++kg_seqstate_size(g_seqnum_state arg, size_t *sizep)
+ {
+     krb5_error_code kret;
+     size_t required;
+diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c
+index 5b87956393..5f7694f5e6 100644
+--- a/src/lib/gssapi/krb5/util_cksum.c
++++ b/src/lib/gssapi/krb5/util_cksum.c
+@@ -28,10 +28,8 @@
+ 
+ /* Checksumming the channel bindings always uses plain MD5.  */
+ krb5_error_code
+-kg_checksum_channel_bindings(context, cb, cksum)
+-    krb5_context context;
+-    gss_channel_bindings_t cb;
+-    krb5_checksum *cksum;
++kg_checksum_channel_bindings(krb5_context context, gss_channel_bindings_t cb,
++                             krb5_checksum *cksum)
+ {
+     struct k5buf buf;
+     size_t sumlen;
+diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c
+index 6e1c9ac8ae..685736314c 100644
+--- a/src/lib/gssapi/krb5/util_seed.c
++++ b/src/lib/gssapi/krb5/util_seed.c
+@@ -29,10 +29,7 @@
+ static const unsigned char zeros[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0};
+ 
+ krb5_error_code
+-kg_make_seed(context, key, seed)
+-    krb5_context context;
+-    krb5_key key;
+-    unsigned char *seed;
++kg_make_seed(krb5_context context, krb5_key key, unsigned char *seed)
+ {
+     krb5_error_code code;
+     krb5_key rkey = NULL;
+diff --git a/src/lib/gssapi/krb5/util_seqnum.c b/src/lib/gssapi/krb5/util_seqnum.c
+index bef631da9d..a5a4d5cf80 100644
+--- a/src/lib/gssapi/krb5/util_seqnum.c
++++ b/src/lib/gssapi/krb5/util_seqnum.c
+@@ -30,13 +30,8 @@
+  */
+ 
+ krb5_error_code
+-kg_make_seq_num(context, key, direction, seqnum, cksum, buf)
+-    krb5_context context;
+-    krb5_key key;
+-    int direction;
+-    krb5_ui_4 seqnum;
+-    unsigned char *cksum;
+-    unsigned char *buf;
++kg_make_seq_num(krb5_context context, krb5_key key, int direction,
++                krb5_ui_4 seqnum, unsigned char *cksum, unsigned char *buf)
+ {
+     unsigned char plain[8];
+ 
+@@ -59,13 +54,9 @@ kg_make_seq_num(context, key, direction, seqnum, cksum, buf)
+     return(kg_encrypt(context, key, KG_USAGE_SEQ, cksum, plain, buf, 8));
+ }
+ 
+-krb5_error_code kg_get_seq_num(context, key, cksum, buf, direction, seqnum)
+-    krb5_context context;
+-    krb5_key key;
+-    unsigned char *cksum;
+-    unsigned char *buf;
+-    int *direction;
+-    krb5_ui_4 *seqnum;
++krb5_error_code
++kg_get_seq_num(krb5_context context, krb5_key key, unsigned char *cksum,
++               unsigned char *buf, int *direction, krb5_ui_4 *seqnum)
+ {
+     krb5_error_code code;
+     unsigned char plain[8];
+diff --git a/src/lib/gssapi/krb5/val_cred.c b/src/lib/gssapi/krb5/val_cred.c
+index cb1cb9393a..83e7634106 100644
+--- a/src/lib/gssapi/krb5/val_cred.c
++++ b/src/lib/gssapi/krb5/val_cred.c
+@@ -57,9 +57,7 @@ krb5_gss_validate_cred_1(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
+ }
+ 
+ OM_uint32
+-krb5_gss_validate_cred(minor_status, cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t cred_handle;
++krb5_gss_validate_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/wrap_size_limit.c b/src/lib/gssapi/krb5/wrap_size_limit.c
+index 7959f424ec..8ea6ce1ad3 100644
+--- a/src/lib/gssapi/krb5/wrap_size_limit.c
++++ b/src/lib/gssapi/krb5/wrap_size_limit.c
+@@ -74,14 +74,9 @@
+ 
+ /* V2 interface */
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
+-                         qop_req, req_output_size, max_input_size)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    int                 conf_req_flag;
+-    gss_qop_t           qop_req;
+-    OM_uint32           req_output_size;
+-    OM_uint32           *max_input_size;
++krb5_gss_wrap_size_limit(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                         int conf_req_flag, gss_qop_t qop_req,
++                         OM_uint32 req_output_size, OM_uint32 *max_input_size)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     OM_uint32           data_size, conflen;
+diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c
+index 4f2a66e26a..e4eff1f52c 100644
+--- a/src/lib/gssapi/mechglue/g_accept_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c
+@@ -128,30 +128,13 @@ allow_mech_by_default(gss_OID mech)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_accept_sec_context (minor_status,
+-                        context_handle,
+-                        verifier_cred_handle,
+-                        input_token_buffer,
+-                        input_chan_bindings,
+-                        src_name,
+-                        mech_type,
+-                        output_token,
+-                        ret_flags,
+-                        time_rec,
+-                        d_cred)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t *		context_handle;
+-gss_cred_id_t		verifier_cred_handle;
+-gss_buffer_t		input_token_buffer;
+-gss_channel_bindings_t	input_chan_bindings;
+-gss_name_t *		src_name;
+-gss_OID *		mech_type;
+-gss_buffer_t		output_token;
+-OM_uint32 *		ret_flags;
+-OM_uint32 *		time_rec;
+-gss_cred_id_t *		d_cred;
+-
++gss_accept_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++		       gss_cred_id_t verifier_cred_handle,
++		       gss_buffer_t input_token_buffer,
++		       gss_channel_bindings_t input_chan_bindings,
++		       gss_name_t *src_name, gss_OID *mech_type,
++		       gss_buffer_t output_token, OM_uint32 *ret_flags,
++		       OM_uint32 *time_rec, gss_cred_id_t *d_cred)
+ {
+     OM_uint32		status, temp_status, temp_minor_status;
+     OM_uint32		temp_ret_flags = 0;
+diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
+index c885f56279..2fc9c5c786 100644
+--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
++++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
+@@ -85,24 +85,10 @@ val_acq_cred_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_acquire_cred(minor_status,
+-                 desired_name,
+-                 time_req,
+-                 desired_mechs,
+-		 cred_usage,
+-                 output_cred_handle,
+-                 actual_mechs,
+-                 time_rec)
+-
+-OM_uint32 *		minor_status;
+-gss_name_t		desired_name;
+-OM_uint32		time_req;
+-gss_OID_set		desired_mechs;
+-int			cred_usage;
+-gss_cred_id_t *		output_cred_handle;
+-gss_OID_set *		actual_mechs;
+-OM_uint32 *		time_rec;
+-
++gss_acquire_cred(OM_uint32 *minor_status, gss_name_t desired_name,
++		 OM_uint32 time_req, gss_OID_set desired_mechs,
++		 int cred_usage, gss_cred_id_t *output_cred_handle,
++		 gss_OID_set *actual_mechs, OM_uint32 *time_rec)
+ {
+     return gss_acquire_cred_from(minor_status, desired_name, time_req,
+ 				 desired_mechs, cred_usage, NULL,
+@@ -110,26 +96,11 @@ OM_uint32 *		time_rec;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_acquire_cred_from(minor_status,
+-		      desired_name,
+-		      time_req,
+-		      desired_mechs,
+-		      cred_usage,
+-		      cred_store,
+-		      output_cred_handle,
+-		      actual_mechs,
+-		      time_rec)
+-
+-OM_uint32 *			minor_status;
+-gss_name_t			desired_name;
+-OM_uint32			time_req;
+-gss_OID_set			desired_mechs;
+-int				cred_usage;
+-gss_const_key_value_set_t	cred_store;
+-gss_cred_id_t *			output_cred_handle;
+-gss_OID_set *			actual_mechs;
+-OM_uint32 *			time_rec;
+-
++gss_acquire_cred_from(OM_uint32 * minor_status, gss_name_t desired_name,
++		      OM_uint32 time_req, gss_OID_set desired_mechs,
++		      int cred_usage, gss_const_key_value_set_t cred_store,
++		      gss_cred_id_t *output_cred_handle,
++		      gss_OID_set *actual_mechs, OM_uint32 *time_rec)
+ {
+     OM_uint32 major = GSS_S_FAILURE, tmpMinor;
+     OM_uint32 first_major = GSS_S_COMPLETE, first_minor = 0;
+@@ -397,22 +368,12 @@ error:
+ 
+ /* V2 KRB5_CALLCONV */
+ OM_uint32 KRB5_CALLCONV
+-gss_add_cred(minor_status, input_cred_handle,
+-		  desired_name, desired_mech, cred_usage,
+-		  initiator_time_req, acceptor_time_req,
+-		  output_cred_handle, actual_mechs,
+-		  initiator_time_rec, acceptor_time_rec)
+-    OM_uint32		*minor_status;
+-    gss_cred_id_t	input_cred_handle;
+-    gss_name_t		desired_name;
+-    gss_OID		desired_mech;
+-    gss_cred_usage_t	cred_usage;
+-    OM_uint32		initiator_time_req;
+-    OM_uint32		acceptor_time_req;
+-    gss_cred_id_t	*output_cred_handle;
+-    gss_OID_set		*actual_mechs;
+-    OM_uint32		*initiator_time_rec;
+-    OM_uint32		*acceptor_time_rec;
++gss_add_cred(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++	     gss_name_t desired_name, gss_OID desired_mech,
++	     gss_cred_usage_t cred_usage, OM_uint32 initiator_time_req,
++	     OM_uint32 acceptor_time_req, gss_cred_id_t *output_cred_handle,
++	     gss_OID_set *actual_mechs, OM_uint32 *initiator_time_rec,
++	     OM_uint32 *acceptor_time_rec)
+ {
+     return gss_add_cred_from(minor_status, input_cred_handle, desired_name,
+ 			     desired_mech, cred_usage, initiator_time_req,
+@@ -422,25 +383,13 @@ gss_add_cred(minor_status, input_cred_handle,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_add_cred_from(minor_status, input_cred_handle,
+-		  desired_name, desired_mech,
+-		  cred_usage,
+-		  initiator_time_req, acceptor_time_req,
+-		  cred_store,
+-		  output_cred_handle, actual_mechs,
+-		  initiator_time_rec, acceptor_time_rec)
+-    OM_uint32		*minor_status;
+-    gss_cred_id_t	input_cred_handle;
+-    gss_name_t		desired_name;
+-    gss_OID		desired_mech;
+-    gss_cred_usage_t	cred_usage;
+-    OM_uint32		initiator_time_req;
+-    OM_uint32		acceptor_time_req;
+-    gss_const_key_value_set_t  cred_store;
+-    gss_cred_id_t	*output_cred_handle;
+-    gss_OID_set		*actual_mechs;
+-    OM_uint32		*initiator_time_rec;
+-    OM_uint32		*acceptor_time_rec;
++gss_add_cred_from(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++		  gss_name_t desired_name, gss_OID desired_mech,
++		  gss_cred_usage_t cred_usage, OM_uint32 initiator_time_req,
++		  OM_uint32 acceptor_time_req,
++		  gss_const_key_value_set_t cred_store,
++		  gss_cred_id_t *output_cred_handle, gss_OID_set *actual_mechs,
++		  OM_uint32 *initiator_time_rec, OM_uint32 *acceptor_time_rec)
+ {
+     OM_uint32		status, temp_minor_status;
+     OM_uint32		time_req, time_rec = 0, *time_recp = NULL;
+diff --git a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
+index cc34acc2bf..86abf984dc 100644
+--- a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
++++ b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
+@@ -98,26 +98,12 @@ val_acq_cred_pw_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_acquire_cred_with_password(
+-    minor_status,
+-    desired_name,
+-    password,
+-    time_req,
+-    desired_mechs,
+-    cred_usage,
+-    output_cred_handle,
+-    actual_mechs,
+-    time_rec)
+-
+-OM_uint32 *		minor_status;
+-const gss_name_t	desired_name;
+-const gss_buffer_t	password;
+-OM_uint32		time_req;
+-const gss_OID_set	desired_mechs;
+-int			cred_usage;
+-gss_cred_id_t *		output_cred_handle;
+-gss_OID_set *		actual_mechs;
+-OM_uint32 *		time_rec;
++gss_acquire_cred_with_password(OM_uint32 *minor_status,
++			       const gss_name_t desired_name,
++			       const gss_buffer_t password, OM_uint32 time_req,
++			       const gss_OID_set desired_mechs, int cred_usage,
++			       gss_cred_id_t *output_cred_handle,
++			       gss_OID_set *actual_mechs, OM_uint32 *time_rec)
+ {
+     OM_uint32 major = GSS_S_FAILURE;
+     OM_uint32 initTimeOut, acceptTimeOut, outTime = GSS_C_INDEFINITE;
+@@ -306,23 +292,19 @@ val_add_cred_pw_args(
+ 
+ /* V2 KRB5_CALLCONV */
+ OM_uint32 KRB5_CALLCONV
+-gss_add_cred_with_password(minor_status, input_cred_handle,
+-		  desired_name, desired_mech, password, cred_usage,
+-		  initiator_time_req, acceptor_time_req,
+-		  output_cred_handle, actual_mechs,
+-		  initiator_time_rec, acceptor_time_rec)
+-    OM_uint32		*minor_status;
+-    const gss_cred_id_t	input_cred_handle;
+-    const gss_name_t	desired_name;
+-    const gss_OID	desired_mech;
+-    const gss_buffer_t	password;
+-    gss_cred_usage_t	cred_usage;
+-    OM_uint32		initiator_time_req;
+-    OM_uint32		acceptor_time_req;
+-    gss_cred_id_t	*output_cred_handle;
+-    gss_OID_set		*actual_mechs;
+-    OM_uint32		*initiator_time_rec;
+-    OM_uint32		*acceptor_time_rec;
++gss_add_cred_with_password(
++    OM_uint32 *minor_status,
++    const gss_cred_id_t input_cred_handle,
++    const gss_name_t desired_name,
++    const gss_OID desired_mech,
++    const gss_buffer_t password,
++    gss_cred_usage_t cred_usage,
++    OM_uint32 initiator_time_req,
++    OM_uint32 acceptor_time_req,
++    gss_cred_id_t *output_cred_handle,
++    gss_OID_set *actual_mechs,
++    OM_uint32 *initiator_time_rec,
++    OM_uint32 *acceptor_time_rec)
+ {
+     OM_uint32		status, temp_minor_status;
+     OM_uint32		time_req, time_rec;
+diff --git a/src/lib/gssapi/mechglue/g_canon_name.c b/src/lib/gssapi/mechglue/g_canon_name.c
+index 61f657f91f..c5214db80a 100644
+--- a/src/lib/gssapi/mechglue/g_canon_name.c
++++ b/src/lib/gssapi/mechglue/g_canon_name.c
+@@ -54,14 +54,8 @@ val_canon_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_canonicalize_name(minor_status,
+-				input_name,
+-				mech_type,
+-				output_name)
+-OM_uint32 *minor_status;
+-const gss_name_t input_name;
+-const gss_OID mech_type;
+-gss_name_t *output_name;
++gss_canonicalize_name(OM_uint32 *minor_status, const gss_name_t input_name,
++		      const gss_OID mech_type, gss_name_t *output_name)
+ {
+ 	gss_union_name_t in_union, out_union = NULL, dest_union = NULL;
+ 	OM_uint32 major_status = GSS_S_FAILURE, tmpmin;
+diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
+index af2e76bbda..74a9529a35 100644
+--- a/src/lib/gssapi/mechglue/g_compare_name.c
++++ b/src/lib/gssapi/mechglue/g_compare_name.c
+@@ -59,16 +59,8 @@ val_comp_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_compare_name (minor_status,
+-                  name1,
+-                  name2,
+-                  name_equal)
+-
+-OM_uint32 *		minor_status;
+-gss_name_t		name1;
+-gss_name_t		name2;
+-int *			name_equal;
+-
++gss_compare_name(OM_uint32 * minor_status, gss_name_t name1, gss_name_t name2,
++		 int * name_equal)
+ {
+     OM_uint32		major_status, temp_minor;
+     gss_union_name_t	union_name1, union_name2;
+diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c
+index c947e7646c..b11b32d6bb 100644
+--- a/src/lib/gssapi/mechglue/g_context_time.c
++++ b/src/lib/gssapi/mechglue/g_context_time.c
+@@ -29,14 +29,8 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_context_time (minor_status,
+-                  context_handle,
+-                  time_rec)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-OM_uint32 *		time_rec;
+-
++gss_context_time(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++		 OM_uint32 * time_rec)
+ {
+     OM_uint32		status;
+     gss_union_ctx_id_t	ctx;
+diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
+index 574ff02944..dc86cce3d3 100644
+--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
+@@ -62,14 +62,8 @@ val_del_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_delete_sec_context (minor_status,
+-                        context_handle,
+-                        output_token)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t *		context_handle;
+-gss_buffer_t		output_token;
+-
++gss_delete_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++		       gss_buffer_t output_token)
+ {
+     OM_uint32		status;
+     gss_union_ctx_id_t	ctx;
+diff --git a/src/lib/gssapi/mechglue/g_dsp_name.c b/src/lib/gssapi/mechglue/g_dsp_name.c
+index 21867c814e..fae64f712e 100644
+--- a/src/lib/gssapi/mechglue/g_dsp_name.c
++++ b/src/lib/gssapi/mechglue/g_dsp_name.c
+@@ -70,16 +70,8 @@ val_dsp_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_display_name (minor_status,
+-                  input_name,
+-                  output_name_buffer,
+-                  output_name_type)
+-
+-OM_uint32 *		minor_status;
+-gss_name_t		input_name;
+-gss_buffer_t		output_name_buffer;
+-gss_OID *		output_name_type;
+-
++gss_display_name(OM_uint32 *minor_status, gss_name_t input_name,
++		 gss_buffer_t output_name_buffer, gss_OID *output_name_type)
+ {
+     OM_uint32		major_status;
+     gss_union_name_t	union_name;
+diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
+index 70e8492636..14a7a8200c 100644
+--- a/src/lib/gssapi/mechglue/g_dsp_status.c
++++ b/src/lib/gssapi/mechglue/g_dsp_status.c
+@@ -36,20 +36,9 @@
+ static OM_uint32 displayMajor(OM_uint32, OM_uint32 *, gss_buffer_t);
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_display_status (minor_status,
+-                    status_value,
+-                    status_type,
+-                    req_mech_type,
+-                    message_context,
+-                    status_string)
+-
+-OM_uint32 *		minor_status;
+-OM_uint32		status_value;
+-int			status_type;
+-gss_OID			req_mech_type;
+-OM_uint32 *		message_context;
+-gss_buffer_t		status_string;
+-
++gss_display_status(OM_uint32 *minor_status, OM_uint32 status_value,
++		   int status_type, gss_OID req_mech_type,
++		   OM_uint32 *message_context, gss_buffer_t status_string)
+ {
+     gss_OID		mech_type = (gss_OID) req_mech_type;
+     gss_mechanism	mech;
+@@ -147,10 +136,7 @@ gss_buffer_t		status_string;
+  *	>= 2 - the supplementary error code bit shifted by 1
+  */
+ static OM_uint32
+-displayMajor(status, msgCtxt, outStr)
+-OM_uint32 status;
+-OM_uint32 *msgCtxt;
+-gss_buffer_t outStr;
++displayMajor(OM_uint32 status, OM_uint32 *msgCtxt, gss_buffer_t outStr)
+ {
+ 	OM_uint32 oneVal, mask = 0x1, currErr;
+ 	char *errStr = NULL;
+diff --git a/src/lib/gssapi/mechglue/g_dup_name.c b/src/lib/gssapi/mechglue/g_dup_name.c
+index ff01db27dc..bf6eb602ea 100644
+--- a/src/lib/gssapi/mechglue/g_dup_name.c
++++ b/src/lib/gssapi/mechglue/g_dup_name.c
+@@ -51,12 +51,8 @@ val_dup_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_duplicate_name(minor_status,
+-		src_name,
+-		dest_name)
+-OM_uint32 *minor_status;
+-const gss_name_t src_name;
+-gss_name_t *dest_name;
++gss_duplicate_name(OM_uint32 *minor_status, const gss_name_t src_name,
++		   gss_name_t *dest_name)
+ {
+ 		gss_union_name_t src_union, dest_union;
+ 		OM_uint32 major_status = GSS_S_FAILURE;
+diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
+index a04afe3d1e..68a3267cf0 100644
+--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
+@@ -68,14 +68,8 @@ val_exp_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_export_sec_context(minor_status,
+-                       context_handle,
+-                       interprocess_token)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t *		context_handle;
+-gss_buffer_t		interprocess_token;
+-
++gss_export_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++		       gss_buffer_t interprocess_token)
+ {
+     OM_uint32		status;
+     OM_uint32 		length;
+diff --git a/src/lib/gssapi/mechglue/g_export_name.c b/src/lib/gssapi/mechglue/g_export_name.c
+index c845f8caf7..2e0611d2d5 100644
+--- a/src/lib/gssapi/mechglue/g_export_name.c
++++ b/src/lib/gssapi/mechglue/g_export_name.c
+@@ -20,12 +20,8 @@
+ #include <errno.h>
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_export_name(minor_status,
+-			input_name,
+-			exported_name)
+-OM_uint32 *		minor_status;
+-const gss_name_t	input_name;
+-gss_buffer_t		exported_name;
++gss_export_name(OM_uint32 *minor_status, const gss_name_t input_name,
++		gss_buffer_t exported_name)
+ {
+ 	gss_union_name_t		union_name;
+ 
+diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c
+index 176fbe63eb..47f499307a 100644
+--- a/src/lib/gssapi/mechglue/g_glue.c
++++ b/src/lib/gssapi/mechglue/g_glue.c
+@@ -75,9 +75,8 @@ static gss_OID_desc gss_krb5_mechanism_oid_desc =
+ 
+ #define NTLMSSP_SIGNATURE "NTLMSSP"
+ 
+-OM_uint32 gssint_get_mech_type(OID, token)
+-    gss_OID		OID;
+-    gss_buffer_t	token;
++OM_uint32
++gssint_get_mech_type(gss_OID OID, gss_buffer_t token)
+ {
+     /* Check for interoperability exceptions */
+     if (token->length >= sizeof(NTLMSSP_SIGNATURE) &&
+@@ -163,12 +162,10 @@ import_internal_attributes(OM_uint32 *minor,
+  *  Internal routines to get and release an internal mechanism name
+  */
+ 
+-OM_uint32 gssint_import_internal_name (minor_status, mech_type, union_name,
+-				internal_name)
+-OM_uint32	*minor_status;
+-gss_OID		mech_type;
+-gss_union_name_t	union_name;
+-gss_name_t	*internal_name;
++OM_uint32
++gssint_import_internal_name(OM_uint32 *minor_status, gss_OID mech_type,
++			    gss_union_name_t union_name,
++			    gss_name_t *internal_name)
+ {
+     OM_uint32		status, tmpMinor;
+     gss_mechanism	mech;
+@@ -220,12 +217,10 @@ gss_name_t	*internal_name;
+     return (status);
+ }
+ 
+-OM_uint32 gssint_export_internal_name(minor_status, mech_type,
+-				     internal_name, name_buf)
+-    OM_uint32		*minor_status;
+-    const gss_OID		mech_type;
+-    const gss_name_t	internal_name;
+-    gss_buffer_t		name_buf;
++OM_uint32
++gssint_export_internal_name(OM_uint32 *minor_status, const gss_OID mech_type,
++			    const gss_name_t internal_name,
++			    gss_buffer_t name_buf)
+ {
+     OM_uint32 status;
+     gss_mechanism mech;
+@@ -307,13 +302,10 @@ OM_uint32 gssint_export_internal_name(minor_status, mech_type,
+     return (GSS_S_COMPLETE);
+ } /*  gssint_export_internal_name */
+ 
+-OM_uint32 gssint_display_internal_name (minor_status, mech_type, internal_name,
+-				 external_name, name_type)
+-OM_uint32	*minor_status;
+-gss_OID		mech_type;
+-gss_name_t	internal_name;
+-gss_buffer_t	external_name;
+-gss_OID		*name_type;
++OM_uint32
++gssint_display_internal_name(OM_uint32 *minor_status, gss_OID mech_type,
++			     gss_name_t internal_name,
++			     gss_buffer_t external_name, gss_OID *name_type)
+ {
+     OM_uint32		status;
+     gss_mechanism	mech;
+@@ -337,10 +329,9 @@ gss_OID		*name_type;
+     return (GSS_S_BAD_MECH);
+ }
+ 
+-OM_uint32 gssint_release_internal_name (minor_status, mech_type, internal_name)
+-OM_uint32	*minor_status;
+-gss_OID		mech_type;
+-gss_name_t	*internal_name;
++OM_uint32
++gssint_release_internal_name(OM_uint32 *minor_status, gss_OID mech_type,
++			     gss_name_t *internal_name)
+ {
+     OM_uint32		status;
+     gss_mechanism	mech;
+@@ -362,14 +353,10 @@ gss_name_t	*internal_name;
+     return (GSS_S_BAD_MECH);
+ }
+ 
+-OM_uint32 gssint_delete_internal_sec_context (minor_status,
+-					      mech_type,
+-					      internal_ctx,
+-					      output_token)
+-OM_uint32	*minor_status;
+-gss_OID		mech_type;
+-gss_ctx_id_t	*internal_ctx;
+-gss_buffer_t	output_token;
++OM_uint32
++gssint_delete_internal_sec_context(OM_uint32 *minor_status, gss_OID mech_type,
++				   gss_ctx_id_t *internal_ctx,
++				   gss_buffer_t output_token)
+ {
+     OM_uint32		status;
+     gss_mechanism	mech;
+@@ -394,12 +381,10 @@ gss_buffer_t	output_token;
+  * name.  Note that internal_name should be considered "consumed" by
+  * this call, whether or not we return an error.
+  */
+-OM_uint32 gssint_convert_name_to_union_name(minor_status, mech,
+-					   internal_name, external_name)
+-    OM_uint32 *minor_status;
+-    gss_mechanism	mech;
+-    gss_name_t	internal_name;
+-    gss_name_t	*external_name;
++OM_uint32
++gssint_convert_name_to_union_name(OM_uint32 *minor_status, gss_mechanism mech,
++				  gss_name_t internal_name,
++				  gss_name_t *external_name)
+ {
+     OM_uint32 major_status,tmp;
+     gss_union_name_t union_name;
+@@ -473,9 +458,7 @@ allocation_failure:
+  * external union credential.
+  */
+ gss_cred_id_t
+-gssint_get_mechanism_cred(union_cred, mech_type)
+-    gss_union_cred_t	union_cred;
+-    gss_OID		mech_type;
++gssint_get_mechanism_cred(gss_union_cred_t union_cred, gss_OID mech_type)
+ {
+     int		i;
+ 
+@@ -494,10 +477,8 @@ gssint_get_mechanism_cred(union_cred, mech_type)
+  * Both space for the structure and the data is allocated.
+  */
+ OM_uint32
+-gssint_create_copy_buffer(srcBuf, destBuf, addNullChar)
+-    const gss_buffer_t	srcBuf;
+-    gss_buffer_t 		*destBuf;
+-    int			addNullChar;
++gssint_create_copy_buffer(const gss_buffer_t srcBuf, gss_buffer_t *destBuf,
++			  int addNullChar)
+ {
+     gss_buffer_t aBuf;
+     unsigned int len;
+diff --git a/src/lib/gssapi/mechglue/g_imp_name.c b/src/lib/gssapi/mechglue/g_imp_name.c
+index a805078a81..65fa6c0fb3 100644
+--- a/src/lib/gssapi/mechglue/g_imp_name.c
++++ b/src/lib/gssapi/mechglue/g_imp_name.c
+@@ -81,16 +81,8 @@ val_imp_name_args(
+ static gss_buffer_desc emptyNameBuffer;
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_import_name(minor_status,
+-                input_name_buffer,
+-                input_name_type,
+-                output_name)
+-
+-OM_uint32 *		minor_status;
+-gss_buffer_t		input_name_buffer;
+-gss_OID			input_name_type;
+-gss_name_t *		output_name;
+-
++gss_import_name(OM_uint32 * minor_status, gss_buffer_t input_name_buffer,
++		gss_OID input_name_type, gss_name_t * output_name)
+ {
+     gss_union_name_t	union_name;
+     OM_uint32		tmp, major_status = GSS_S_FAILURE;
+@@ -183,10 +175,8 @@ allocation_failure:
+ }
+ 
+ static OM_uint32
+-importExportName(minor, unionName, inputNameType)
+-    OM_uint32 *minor;
+-    gss_union_name_t unionName;
+-    gss_OID inputNameType;
++importExportName(OM_uint32 *minor, gss_union_name_t unionName,
++		 gss_OID inputNameType)
+ {
+     gss_OID_desc mechOid;
+     gss_buffer_desc expName;
+diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
+index 6315201a5f..55a3136df1 100644
+--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
+@@ -69,14 +69,9 @@ val_imp_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_import_sec_context(minor_status,
+-                       interprocess_token,
+-                       context_handle)
+-
+-OM_uint32 *		minor_status;
+-gss_buffer_t		interprocess_token;
+-gss_ctx_id_t *		context_handle;
+-
++gss_import_sec_context(OM_uint32 *minor_status,
++		       gss_buffer_t interprocess_token,
++		       gss_ctx_id_t *context_handle)
+ {
+     OM_uint32		length = 0;
+     OM_uint32		status;
+diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c
+index a58074c007..d639a8de3b 100644
+--- a/src/lib/gssapi/mechglue/g_init_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_init_sec_context.c
+@@ -88,34 +88,15 @@ val_init_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_init_sec_context (minor_status,
+-                      claimant_cred_handle,
+-                      context_handle,
+-                      target_name,
+-                      req_mech_type,
+-                      req_flags,
+-                      time_req,
+-                      input_chan_bindings,
+-                      input_token,
+-                      actual_mech_type,
+-                      output_token,
+-                      ret_flags,
+-                      time_rec)
+-
+-OM_uint32 *		minor_status;
+-gss_cred_id_t		claimant_cred_handle;
+-gss_ctx_id_t *		context_handle;
+-gss_name_t		target_name;
+-gss_OID			req_mech_type;
+-OM_uint32		req_flags;
+-OM_uint32		time_req;
+-gss_channel_bindings_t	input_chan_bindings;
+-gss_buffer_t		input_token;
+-gss_OID *		actual_mech_type;
+-gss_buffer_t		output_token;
+-OM_uint32 *		ret_flags;
+-OM_uint32 *		time_rec;
+-
++gss_init_sec_context(OM_uint32 *minor_status,
++		     gss_cred_id_t claimant_cred_handle,
++		     gss_ctx_id_t *context_handle, gss_name_t target_name,
++		     gss_OID req_mech_type, OM_uint32 req_flags,
++		     OM_uint32 time_req,
++		     gss_channel_bindings_t input_chan_bindings,
++		     gss_buffer_t input_token, gss_OID *actual_mech_type,
++		     gss_buffer_t output_token, OM_uint32 *ret_flags,
++		     OM_uint32 *time_rec)
+ {
+     OM_uint32		status, temp_minor_status;
+     gss_union_name_t	union_name;
+diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
+index 22f6c615c1..7e36c4a0d0 100644
+--- a/src/lib/gssapi/mechglue/g_initialize.c
++++ b/src/lib/gssapi/mechglue/g_initialize.c
+@@ -169,9 +169,7 @@ gssint_mechglue_initialize_library(void)
+  * This routine requires direct access to the mechList.
+  */
+ OM_uint32 KRB5_CALLCONV
+-gss_release_oid(minor_status, oid)
+-OM_uint32 *minor_status;
+-gss_OID *oid;
++gss_release_oid(OM_uint32 *minor_status, gss_OID *oid)
+ {
+ 	OM_uint32 major;
+ 	gss_mech_info aMech;
+@@ -267,9 +265,7 @@ prune_deprecated(gss_OID_set mech_set)
+  * a mech oid set, and only update it once the file has changed.
+  */
+ OM_uint32 KRB5_CALLCONV
+-gss_indicate_mechs(minorStatus, mechSet_out)
+-OM_uint32 *minorStatus;
+-gss_OID_set *mechSet_out;
++gss_indicate_mechs(OM_uint32 *minorStatus, gss_OID_set *mechSet_out)
+ {
+ 	OM_uint32 status;
+ 
+@@ -417,8 +413,7 @@ build_mechSet(void)
+  * caller is responsible for freeing the memory
+  */
+ char *
+-gssint_get_modOptions(oid)
+-const gss_OID oid;
++gssint_get_modOptions(const gss_OID oid)
+ {
+ 	gss_mech_info aMech;
+ 	char *modOptions = NULL;
+@@ -479,7 +474,7 @@ load_if_changed(const char *pathname, time_t last, time_t *highest)
+ /* Try to load any config files which have changed since the last call.  Config
+  * files are MECH_CONF and any files matching MECH_CONF_PATTERN. */
+ static void
+-loadConfigFiles()
++loadConfigFiles(void)
+ {
+ 	glob_t globbuf;
+ 	time_t highest = (time_t)-1, now;
+@@ -679,7 +674,8 @@ gssint_register_mechinfo(gss_mech_info template)
+ 		memset(&errinfo, 0, sizeof(errinfo)); \
+ 		if (krb5int_get_plugin_func(_dl, \
+ 					    #_symbol, \
+-					    (void (**)())&(_mech)->_symbol, \
++					    (void (**)(void)) \
++					    &(_mech)->_symbol, \
+ 					    &errinfo) || errinfo.code) {  \
+ 			(_mech)->_symbol = NULL; \
+ 			k5_clear_error(&errinfo); \
+@@ -801,7 +797,7 @@ build_dynamicMech(void *dl, const gss_OID mech_type)
+ 		memset(&errinfo, 0, sizeof(errinfo));			\
+ 		if (krb5int_get_plugin_func(_dl,			\
+ 					    "gssi" #_nsym,		\
+-					    (void (**)())&(_mech)->_psym \
++					    (void (**)(void))&(_mech)->_psym \
+ 					    ## _nsym,			\
+ 					    &errinfo) || errinfo.code) { \
+ 			(_mech)->_psym ## _nsym = NULL;			\
+@@ -948,7 +944,7 @@ loadInterMech(gss_mech_info minfo)
+ 	}
+ 
+ 	if (krb5int_get_plugin_func(dl, MECH_INTERPOSER_SYM,
+-				    (void (**)())&isym, &errinfo) != 0)
++				    (void (**)(void))&isym, &errinfo) != 0)
+ 		goto cleanup;
+ 
+ 	/* Get a list of mechs to interpose. */
+@@ -1184,7 +1180,7 @@ gssint_get_mechanism(gss_const_OID oid)
+ 		return ((gss_mechanism)NULL);
+ 	}
+ 
+-	if (krb5int_get_plugin_func(dl, MECH_SYM, (void (**)())&sym,
++	if (krb5int_get_plugin_func(dl, MECH_SYM, (void (**)(void))&sym,
+ 				    &errinfo) == 0) {
+ 		/* Call the symbol to get the mechanism table */
+ 		aMech->mech = (*sym)(aMech->mech_type);
+diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c
+index 4ed7774f1a..0aa9acc889 100644
+--- a/src/lib/gssapi/mechglue/g_inq_cred.c
++++ b/src/lib/gssapi/mechglue/g_inq_cred.c
+@@ -35,20 +35,9 @@
+ #include <time.h>
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_inquire_cred(minor_status,
+-                 cred_handle,
+-                 name,
+-                 lifetime,
+-		 cred_usage,
+-                 mechanisms)
+-
+-OM_uint32 *		minor_status;
+-gss_cred_id_t 		cred_handle;
+-gss_name_t *		name;
+-OM_uint32 *		lifetime;
+-int *			cred_usage;
+-gss_OID_set *		mechanisms;
+-
++gss_inquire_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
++		 gss_name_t *name, OM_uint32 *lifetime, int *cred_usage,
++		 gss_OID_set *mechanisms)
+ {
+     OM_uint32		status, temp_minor_status;
+     gss_union_cred_t	union_cred;
+@@ -159,15 +148,11 @@ error:
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
+-			 initiator_lifetime, acceptor_lifetime, cred_usage)
+-    OM_uint32		*minor_status;
+-    gss_cred_id_t	cred_handle;
+-    gss_OID		mech_type;
+-    gss_name_t		*name;
+-    OM_uint32		*initiator_lifetime;
+-    OM_uint32		*acceptor_lifetime;
+-    gss_cred_usage_t *cred_usage;
++gss_inquire_cred_by_mech(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
++			 gss_OID mech_type, gss_name_t *name,
++			 OM_uint32 *initiator_lifetime,
++			 OM_uint32 *acceptor_lifetime,
++			 gss_cred_usage_t *cred_usage)
+ {
+     gss_union_cred_t	union_cred;
+     gss_cred_id_t	mech_cred;
+diff --git a/src/lib/gssapi/mechglue/g_inq_names.c b/src/lib/gssapi/mechglue/g_inq_names.c
+index d22af8bcf9..066c00c042 100644
+--- a/src/lib/gssapi/mechglue/g_inq_names.c
++++ b/src/lib/gssapi/mechglue/g_inq_names.c
+@@ -32,12 +32,8 @@
+ 
+ /* Last argument new for V2 */
+ OM_uint32 KRB5_CALLCONV
+-gss_inquire_names_for_mech(minor_status, mechanism, name_types)
+-
+-OM_uint32 *	minor_status;
+-gss_OID 	mechanism;
+-gss_OID_set *	name_types;
+-
++gss_inquire_names_for_mech(OM_uint32 *minor_status, gss_OID mechanism,
++			   gss_OID_set *name_types)
+ {
+     OM_uint32		status;
+     gss_OID		selected_mech = GSS_C_NO_OID, public_mech;
+diff --git a/src/lib/gssapi/mechglue/g_mechname.c b/src/lib/gssapi/mechglue/g_mechname.c
+index cfb0a0d2af..5664fa157e 100644
+--- a/src/lib/gssapi/mechglue/g_mechname.c
++++ b/src/lib/gssapi/mechglue/g_mechname.c
+@@ -20,8 +20,8 @@ static gss_mech_spec_name name_list = NULL;
+ /*
+  * generic searching helper function.
+  */
+-static gss_mech_spec_name search_mech_spec(name_type)
+-    gss_OID name_type;
++static gss_mech_spec_name
++search_mech_spec(gss_OID name_type)
+ {
+     gss_mech_spec_name p;
+ 
+@@ -36,8 +36,8 @@ static gss_mech_spec_name search_mech_spec(name_type)
+  * Given a name_type, if it is specific to a mechanism, return the
+  * mechanism OID.  Otherwise, return NULL.
+  */
+-gss_OID gss_find_mechanism_from_name_type(name_type)
+-    gss_OID name_type;
++gss_OID
++gss_find_mechanism_from_name_type(gss_OID name_type)
+ {
+     gss_mech_spec_name p;
+ 
+@@ -54,10 +54,8 @@ gss_OID gss_find_mechanism_from_name_type(name_type)
+  * Otherwise, enter the pair into the registry.
+  */
+ OM_uint32
+-gss_add_mech_name_type(minor_status, name_type, mech)
+-    OM_uint32	*minor_status;
+-    gss_OID	name_type;
+-    gss_OID	mech;
++gss_add_mech_name_type(OM_uint32 *minor_status, gss_OID name_type,
++		       gss_OID mech)
+ {
+     OM_uint32	major_status, tmp;
+     gss_mech_spec_name p;
+diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c
+index 1d7970c5dd..f29fb3b33e 100644
+--- a/src/lib/gssapi/mechglue/g_oid_ops.c
++++ b/src/lib/gssapi/mechglue/g_oid_ops.c
+@@ -33,9 +33,7 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_create_empty_oid_set(minor_status, oid_set)
+-    OM_uint32	*minor_status;
+-    gss_OID_set	*oid_set;
++gss_create_empty_oid_set(OM_uint32 *minor_status, gss_OID_set *oid_set)
+ {
+     OM_uint32 status;
+     status = generic_gss_create_empty_oid_set(minor_status, oid_set);
+@@ -45,10 +43,8 @@ gss_create_empty_oid_set(minor_status, oid_set)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_add_oid_set_member(minor_status, member_oid, oid_set)
+-    OM_uint32	*minor_status;
+-    gss_OID	member_oid;
+-    gss_OID_set	*oid_set;
++gss_add_oid_set_member(OM_uint32 *minor_status, gss_OID member_oid,
++		       gss_OID_set *oid_set)
+ {
+     OM_uint32 status;
+     status = generic_gss_add_oid_set_member(minor_status, member_oid, oid_set);
+@@ -58,20 +54,14 @@ gss_add_oid_set_member(minor_status, member_oid, oid_set)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_test_oid_set_member(minor_status, member, set, present)
+-    OM_uint32	*minor_status;
+-    gss_OID	member;
+-    gss_OID_set	set;
+-    int		*present;
++gss_test_oid_set_member(OM_uint32 *minor_status, gss_OID member,
++			gss_OID_set set, int *present)
+ {
+     return generic_gss_test_oid_set_member(minor_status, member, set, present);
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_oid_to_str(minor_status, oid, oid_str)
+-    OM_uint32		*minor_status;
+-    gss_OID		oid;
+-    gss_buffer_t	oid_str;
++gss_oid_to_str(OM_uint32 *minor_status, gss_OID oid, gss_buffer_t oid_str)
+ {
+     OM_uint32 status = generic_gss_oid_to_str(minor_status, oid, oid_str);
+     if (status != GSS_S_COMPLETE)
+@@ -80,10 +70,7 @@ gss_oid_to_str(minor_status, oid, oid_str)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_str_to_oid(minor_status, oid_str, oid)
+-    OM_uint32		*minor_status;
+-    gss_buffer_t	oid_str;
+-    gss_OID		*oid;
++gss_str_to_oid(OM_uint32 *minor_status, gss_buffer_t oid_str, gss_OID *oid)
+ {
+     OM_uint32 status = generic_gss_str_to_oid(minor_status, oid_str, oid);
+     if (status != GSS_S_COMPLETE)
+diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c
+index 3968b5d9c6..2b3f6c704d 100644
+--- a/src/lib/gssapi/mechglue/g_process_context.c
++++ b/src/lib/gssapi/mechglue/g_process_context.c
+@@ -29,14 +29,8 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_process_context_token (minor_status,
+-                           context_handle,
+-                           token_buffer)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-gss_buffer_t		token_buffer;
+-
++gss_process_context_token(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++			  gss_buffer_t token_buffer)
+ {
+     OM_uint32		status;
+     gss_union_ctx_id_t	ctx;
+diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
+index 8c3328acc5..60117bdb56 100644
+--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
++++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
+@@ -33,11 +33,7 @@
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_buffer (minor_status,
+-		    buffer)
+-
+-OM_uint32 *		minor_status;
+-gss_buffer_t		buffer;
++gss_release_buffer(OM_uint32 *minor_status, gss_buffer_t buffer)
+ {
+     if (minor_status)
+ 	*minor_status = 0;
+diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
+index ccdee05a56..ee3d1d71e3 100644
+--- a/src/lib/gssapi/mechglue/g_rel_cred.c
++++ b/src/lib/gssapi/mechglue/g_rel_cred.c
+@@ -31,12 +31,7 @@
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_cred(minor_status,
+-                 cred_handle)
+-
+-OM_uint32 *		minor_status;
+-gss_cred_id_t *		cred_handle;
+-
++gss_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle)
+ {
+     OM_uint32		status, temp_status;
+     int			j;
+diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
+index e008692383..d490f9f290 100644
+--- a/src/lib/gssapi/mechglue/g_rel_name.c
++++ b/src/lib/gssapi/mechglue/g_rel_name.c
+@@ -34,12 +34,7 @@
+ #include <string.h>
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_name (minor_status,
+-		  input_name)
+-
+-OM_uint32 *		minor_status;
+-gss_name_t *		input_name;
+-
++gss_release_name(OM_uint32 *minor_status, gss_name_t *input_name)
+ {
+     gss_union_name_t	union_name;
+ 
+diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
+index fa008d6bb9..9151dd2e71 100644
+--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
++++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
+@@ -33,11 +33,7 @@
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_oid_set (minor_status,
+-		     set)
+-
+-OM_uint32 *		minor_status;
+-gss_OID_set *		set;
++gss_release_oid_set(OM_uint32 *minor_status, gss_OID_set *set)
+ {
+     return generic_gss_release_oid_set(minor_status, set);
+ }
+diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c
+index 03fbd8c01f..c9af1da570 100644
+--- a/src/lib/gssapi/mechglue/g_sign.c
++++ b/src/lib/gssapi/mechglue/g_sign.c
+@@ -66,18 +66,9 @@ val_get_mic_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_get_mic (minor_status,
+-	     context_handle,
+-	     qop_req,
+-	     message_buffer,
+-	     msg_token)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-gss_qop_t		qop_req;
+-gss_buffer_t		message_buffer;
+-gss_buffer_t		msg_token;
+-
++gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++	    gss_qop_t qop_req, gss_buffer_t message_buffer,
++	    gss_buffer_t msg_token)
+ {
+     OM_uint32		status;
+     gss_union_ctx_id_t	ctx;
+@@ -118,18 +109,8 @@ gss_buffer_t		msg_token;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_sign (minor_status,
+-          context_handle,
+-          qop_req,
+-          message_buffer,
+-          msg_token)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-int			qop_req;
+-gss_buffer_t		message_buffer;
+-gss_buffer_t		msg_token;
+-
++gss_sign(OM_uint32 *minor_status, gss_ctx_id_t context_handle, int qop_req,
++	 gss_buffer_t message_buffer, gss_buffer_t msg_token)
+ {
+ 	return (gss_get_mic(minor_status, context_handle, (gss_qop_t) qop_req,
+ 			    message_buffer, msg_token));
+diff --git a/src/lib/gssapi/mechglue/g_store_cred.c b/src/lib/gssapi/mechglue/g_store_cred.c
+index c2b6ddf3c0..231b3e81a0 100644
+--- a/src/lib/gssapi/mechglue/g_store_cred.c
++++ b/src/lib/gssapi/mechglue/g_store_cred.c
+@@ -93,24 +93,10 @@ val_store_cred_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_store_cred(minor_status,
+-	       input_cred_handle,
+-	       cred_usage,
+-	       desired_mech,
+-	       overwrite_cred,
+-	       default_cred,
+-	       elements_stored,
+-	       cred_usage_stored)
+-
+-OM_uint32		*minor_status;
+-gss_cred_id_t	         input_cred_handle;
+-gss_cred_usage_t	 cred_usage;
+-const gss_OID		 desired_mech;
+-OM_uint32		 overwrite_cred;
+-OM_uint32		 default_cred;
+-gss_OID_set		*elements_stored;
+-gss_cred_usage_t	*cred_usage_stored;
+-
++gss_store_cred(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++	       gss_cred_usage_t cred_usage, const gss_OID desired_mech,
++	       OM_uint32 overwrite_cred, OM_uint32 default_cred,
++	       gss_OID_set *elements_stored, gss_cred_usage_t *cred_usage_stored)
+ {
+ 	return gss_store_cred_into(minor_status, input_cred_handle, cred_usage,
+ 				   desired_mech, overwrite_cred, default_cred,
+@@ -119,26 +105,12 @@ gss_cred_usage_t	*cred_usage_stored;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_store_cred_into(minor_status,
+-		    input_cred_handle,
+-		    cred_usage,
+-		    desired_mech,
+-		    overwrite_cred,
+-		    default_cred,
+-		    cred_store,
+-		    elements_stored,
+-		    cred_usage_stored)
+-
+-OM_uint32			 *minor_status;
+-gss_cred_id_t			 input_cred_handle;
+-gss_cred_usage_t		 cred_usage;
+-gss_OID				 desired_mech;
+-OM_uint32			 overwrite_cred;
+-OM_uint32			 default_cred;
+-gss_const_key_value_set_t	 cred_store;
+-gss_OID_set			 *elements_stored;
+-gss_cred_usage_t		 *cred_usage_stored;
+-
++gss_store_cred_into(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++		    gss_cred_usage_t cred_usage, gss_OID desired_mech,
++		    OM_uint32 overwrite_cred, OM_uint32 default_cred,
++		    gss_const_key_value_set_t cred_store,
++		    gss_OID_set *elements_stored,
++		    gss_cred_usage_t *cred_usage_stored)
+ {
+ 	OM_uint32		major_status = GSS_S_FAILURE;
+ 	gss_union_cred_t	union_cred;
+diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c
+index c208635b67..2be3745d1f 100644
+--- a/src/lib/gssapi/mechglue/g_unseal.c
++++ b/src/lib/gssapi/mechglue/g_unseal.c
+@@ -29,20 +29,10 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unwrap (minor_status,
+-            context_handle,
+-            input_message_buffer,
+-            output_message_buffer,
+-            conf_state,
+-            qop_state)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-gss_buffer_t		input_message_buffer;
+-gss_buffer_t		output_message_buffer;
+-int *			conf_state;
+-gss_qop_t *		qop_state;
+-
++gss_unwrap(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++	   gss_buffer_t input_message_buffer,
++	   gss_buffer_t output_message_buffer,
++	   int *conf_state, gss_qop_t *qop_state)
+ {
+ /* EXPORT DELETE START */
+     OM_uint32		status;
+@@ -111,20 +101,9 @@ gss_qop_t *		qop_state;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unseal (minor_status,
+-            context_handle,
+-            input_message_buffer,
+-            output_message_buffer,
+-            conf_state,
+-            qop_state)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-gss_buffer_t		input_message_buffer;
+-gss_buffer_t		output_message_buffer;
+-int *			conf_state;
+-int *			qop_state;
+-
++gss_unseal(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++	   gss_buffer_t input_message_buffer,
++	   gss_buffer_t output_message_buffer, int *conf_state, int *qop_state)
+ {
+     return (gss_unwrap(minor_status, context_handle,
+ 		       input_message_buffer,
+diff --git a/src/lib/gssapi/mechglue/g_unwrap_aead.c b/src/lib/gssapi/mechglue/g_unwrap_aead.c
+index 0682bd8998..5c9ff30031 100644
+--- a/src/lib/gssapi/mechglue/g_unwrap_aead.c
++++ b/src/lib/gssapi/mechglue/g_unwrap_aead.c
+@@ -154,20 +154,11 @@ gssint_unwrap_aead (gss_mechanism mech,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unwrap_aead (minor_status,
+-                 context_handle,
+-		 input_message_buffer,
+-		 input_assoc_buffer,
+-		 output_payload_buffer,
+-                 conf_state,
+-                 qop_state)
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-gss_buffer_t		input_message_buffer;
+-gss_buffer_t		input_assoc_buffer;
+-gss_buffer_t		output_payload_buffer;
+-int 			*conf_state;
+-gss_qop_t		*qop_state;
++gss_unwrap_aead(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++		gss_buffer_t input_message_buffer,
++		gss_buffer_t input_assoc_buffer,
++		gss_buffer_t output_payload_buffer,
++		int *conf_state, gss_qop_t *qop_state)
+ {
+ 
+     OM_uint32		status;
+diff --git a/src/lib/gssapi/mechglue/g_unwrap_iov.c b/src/lib/gssapi/mechglue/g_unwrap_iov.c
+index 599be2c7b2..bf9c3bcc33 100644
+--- a/src/lib/gssapi/mechglue/g_unwrap_iov.c
++++ b/src/lib/gssapi/mechglue/g_unwrap_iov.c
+@@ -59,18 +59,9 @@ val_unwrap_iov_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unwrap_iov (minor_status,
+-                context_handle,
+-                conf_state,
+-                qop_state,
+-                iov,
+-                iov_count)
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-int *			conf_state;
+-gss_qop_t		*qop_state;
+-gss_iov_buffer_desc  *	iov;
+-int			iov_count;
++gss_unwrap_iov(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++	       int *conf_state, gss_qop_t *qop_state,
++	       gss_iov_buffer_desc *iov, int iov_count)
+ {
+  /* EXPORT DELETE START */
+ 
+diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c
+index 8996fce8d5..86ade66877 100644
+--- a/src/lib/gssapi/mechglue/g_verify.c
++++ b/src/lib/gssapi/mechglue/g_verify.c
+@@ -29,18 +29,9 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_verify_mic (minor_status,
+-		context_handle,
+-		message_buffer,
+-		token_buffer,
+-		qop_state)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-gss_buffer_t		message_buffer;
+-gss_buffer_t		token_buffer;
+-gss_qop_t *		qop_state;
+-
++gss_verify_mic(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++	       gss_buffer_t message_buffer, gss_buffer_t token_buffer,
++	       gss_qop_t *qop_state)
+ {
+     OM_uint32		status;
+     gss_union_ctx_id_t	ctx;
+@@ -89,18 +80,9 @@ gss_qop_t *		qop_state;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_verify (minor_status,
+-            context_handle,
+-            message_buffer,
+-            token_buffer,
+-            qop_state)
+-
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-gss_buffer_t		message_buffer;
+-gss_buffer_t		token_buffer;
+-int *			qop_state;
+-
++gss_verify(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++	   gss_buffer_t message_buffer, gss_buffer_t token_buffer,
++	   int *qop_state)
+ {
+ 	return (gss_verify_mic(minor_status, context_handle,
+ 			       message_buffer, token_buffer,
+diff --git a/src/lib/gssapi/mechglue/g_wrap_aead.c b/src/lib/gssapi/mechglue/g_wrap_aead.c
+index 7fe3b7b35b..5a6570f7f9 100644
+--- a/src/lib/gssapi/mechglue/g_wrap_aead.c
++++ b/src/lib/gssapi/mechglue/g_wrap_aead.c
+@@ -177,15 +177,11 @@ gssint_wrap_aead_iov_shim(gss_mechanism mech,
+ }
+ 
+ OM_uint32
+-gssint_wrap_aead (gss_mechanism mech,
+-		  OM_uint32 *minor_status,
+-		  gss_union_ctx_id_t ctx,
+-		  int conf_req_flag,
+-		  gss_qop_t qop_req,
+-		  gss_buffer_t input_assoc_buffer,
+-		  gss_buffer_t input_payload_buffer,
+-		  int *conf_state,
+-		  gss_buffer_t output_message_buffer)
++gssint_wrap_aead(gss_mechanism mech, OM_uint32 *minor_status,
++		 gss_union_ctx_id_t ctx, int conf_req_flag, gss_qop_t qop_req,
++		 gss_buffer_t input_assoc_buffer,
++		 gss_buffer_t input_payload_buffer,
++		 int *conf_state, gss_buffer_t output_message_buffer)
+ {
+  /* EXPORT DELETE START */
+     OM_uint32		status;
+@@ -223,22 +219,15 @@ gssint_wrap_aead (gss_mechanism mech,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_wrap_aead (minor_status,
+-               context_handle,
+-               conf_req_flag,
+-               qop_req,
+-	       input_assoc_buffer,
+-	       input_payload_buffer,
+-               conf_state,
+-               output_message_buffer)
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-int			conf_req_flag;
+-gss_qop_t		qop_req;
+-gss_buffer_t		input_assoc_buffer;
+-gss_buffer_t		input_payload_buffer;
+-int *			conf_state;
+-gss_buffer_t		output_message_buffer;
++gss_wrap_aead (
++    OM_uint32 * minor_status,
++    gss_ctx_id_t context_handle,
++    int conf_req_flag,
++    gss_qop_t qop_req,
++    gss_buffer_t input_assoc_buffer,
++    gss_buffer_t input_payload_buffer,
++    int * conf_state,
++    gss_buffer_t output_message_buffer)
+ {
+     OM_uint32		status;
+     gss_mechanism	mech;
+diff --git a/src/lib/gssapi/mechglue/g_wrap_iov.c b/src/lib/gssapi/mechglue/g_wrap_iov.c
+index 14447c4ee1..aaf3a9308e 100644
+--- a/src/lib/gssapi/mechglue/g_wrap_iov.c
++++ b/src/lib/gssapi/mechglue/g_wrap_iov.c
+@@ -60,20 +60,9 @@ val_wrap_iov_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_wrap_iov (minor_status,
+-              context_handle,
+-              conf_req_flag,
+-              qop_req,
+-              conf_state,
+-              iov,
+-              iov_count)
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-int			conf_req_flag;
+-gss_qop_t		qop_req;
+-int *			conf_state;
+-gss_iov_buffer_desc  *	iov;
+-int			iov_count;
++gss_wrap_iov(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++	     int conf_req_flag, gss_qop_t qop_req, int *conf_state,
++	     gss_iov_buffer_desc *iov, int iov_count)
+ {
+  /* EXPORT DELETE START */
+ 
+@@ -120,20 +109,10 @@ int			iov_count;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_wrap_iov_length (minor_status,
+-                     context_handle,
+-                     conf_req_flag,
+-                     qop_req,
+-                     conf_state,
+-                     iov,
+-                     iov_count)
+-OM_uint32 *		minor_status;
+-gss_ctx_id_t		context_handle;
+-int			conf_req_flag;
+-gss_qop_t		qop_req;
+-int *			conf_state;
+-gss_iov_buffer_desc  *	iov;
+-int			iov_count;
++gss_wrap_iov_length(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++		    int conf_req_flag, gss_qop_t qop_req,
++		    int *conf_state, gss_iov_buffer_desc *iov,
++		    int iov_count)
+ {
+  /* EXPORT DELETE START */
+ 
+@@ -239,12 +218,8 @@ gss_get_mic_iov_length(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_iov_buffer (minor_status,
+-			iov,
+-			iov_count)
+-OM_uint32 *		minor_status;
+-gss_iov_buffer_desc *	iov;
+-int			iov_count;
++gss_release_iov_buffer(OM_uint32 * minor_status, gss_iov_buffer_desc *iov,
++		       int iov_count)
+ {
+     OM_uint32		status = GSS_S_COMPLETE;
+     int			i;
+diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
+index d84d158b46..c8d844e4c7 100644
+--- a/src/lib/kadm5/clnt/client_rpc.c
++++ b/src/lib/kadm5/clnt/client_rpc.c
+@@ -1,6 +1,7 @@
+ /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
+ #include <gssrpc/rpc.h>
+ #include <kadm5/kadm_rpc.h>
++#include <kadm5/admin_xdr.h>
+ #include <krb5.h>
+ #include <kadm5/admin.h>
+ #include <string.h>  /* for memset prototype */
+diff --git a/src/lib/kadm5/kadm_rpc.h b/src/lib/kadm5/kadm_rpc.h
+index 5099c6c145..9efe49a373 100644
+--- a/src/lib/kadm5/kadm_rpc.h
++++ b/src/lib/kadm5/kadm_rpc.h
+@@ -360,49 +360,4 @@ extern enum clnt_stat get_principal_keys_2(getpkeys_arg *, getpkeys_ret *,
+ 					   CLIENT *);
+ extern  bool_t get_principal_keys_2_svc(getpkeys_arg *, getpkeys_ret *,
+ 					struct svc_req *);
+-
+-extern bool_t xdr_cprinc_arg ();
+-extern bool_t xdr_cprinc3_arg ();
+-extern bool_t xdr_generic_ret ();
+-extern bool_t xdr_dprinc_arg ();
+-extern bool_t xdr_mprinc_arg ();
+-extern bool_t xdr_rprinc_arg ();
+-extern bool_t xdr_gprincs_arg ();
+-extern bool_t xdr_gprincs_ret ();
+-extern bool_t xdr_chpass_arg ();
+-extern bool_t xdr_chpass3_arg ();
+-extern bool_t xdr_setkey_arg ();
+-extern bool_t xdr_setkey3_arg ();
+-extern bool_t xdr_setkey4_arg ();
+-extern bool_t xdr_chrand_arg ();
+-extern bool_t xdr_chrand3_arg ();
+-extern bool_t xdr_chrand_ret ();
+-extern bool_t xdr_gprinc_arg ();
+-extern bool_t xdr_gprinc_ret ();
+-extern bool_t xdr_kadm5_ret_t ();
+-extern bool_t xdr_kadm5_principal_ent_rec ();
+-extern bool_t xdr_kadm5_policy_ent_rec ();
+-extern bool_t	xdr_krb5_keyblock ();
+-extern bool_t	xdr_krb5_principal ();
+-extern bool_t	xdr_krb5_enctype ();
+-extern bool_t	xdr_krb5_octet ();
+-extern bool_t	xdr_krb5_int32 ();
+-extern bool_t	xdr_u_int32 ();
+-extern bool_t xdr_cpol_arg ();
+-extern bool_t xdr_dpol_arg ();
+-extern bool_t xdr_mpol_arg ();
+-extern bool_t xdr_gpol_arg ();
+-extern bool_t xdr_gpol_ret ();
+-extern bool_t xdr_gpols_arg ();
+-extern bool_t xdr_gpols_ret ();
+-extern bool_t xdr_getprivs_ret ();
+-extern bool_t xdr_purgekeys_arg ();
+-extern bool_t xdr_gstrings_arg ();
+-extern bool_t xdr_gstrings_ret ();
+-extern bool_t xdr_sstring_arg ();
+-extern bool_t xdr_krb5_string_attr ();
+-extern bool_t xdr_kadm5_key_data ();
+-extern bool_t xdr_getpkeys_arg ();
+-extern bool_t xdr_getpkeys_ret ();
+-
+ #endif /* __KADM_RPC_H__ */
+diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
+index 287cae750f..5e052dd90c 100644
+--- a/src/lib/kadm5/kadm_rpc_xdr.c
++++ b/src/lib/kadm5/kadm_rpc_xdr.c
+@@ -408,7 +408,7 @@ _xdr_kadm5_principal_ent_rec(XDR *xdrs, kadm5_principal_ent_rec *objp,
+ 		return (FALSE);
+ 	}
+ 	if (!xdr_nulltype(xdrs, (void **) &objp->mod_name,
+-			  xdr_krb5_principal)) {
++			  (xdrproc_t)xdr_krb5_principal)) {
+ 		return (FALSE);
+ 	}
+ 	if (!xdr_krb5_timestamp(xdrs, &objp->mod_date)) {
+@@ -451,12 +451,13 @@ _xdr_kadm5_principal_ent_rec(XDR *xdrs, kadm5_principal_ent_rec *objp,
+ 		return (FALSE);
+ 	}
+ 	if (!xdr_nulltype(xdrs, (void **) &objp->tl_data,
+-			  xdr_krb5_tl_data)) {
++			  (xdrproc_t)xdr_krb5_tl_data)) {
+ 		return FALSE;
+ 	}
+ 	n = objp->n_key_data;
+ 	r = xdr_array(xdrs, (caddr_t *) &objp->key_data, &n, objp->n_key_data,
+-		      sizeof(krb5_key_data), xdr_krb5_key_data_nocontents);
++		      sizeof(krb5_key_data),
++		      (xdrproc_t)xdr_krb5_key_data_nocontents);
+ 	objp->n_key_data = n;
+ 	if (!r) {
+ 		return (FALSE);
+@@ -528,7 +529,7 @@ _xdr_kadm5_policy_ent_rec(XDR *xdrs, kadm5_policy_ent_rec *objp, int vers)
+ 			return (FALSE);
+ 		}
+ 		if (!xdr_nulltype(xdrs, (void **) &objp->tl_data,
+-				  xdr_krb5_tl_data)) {
++				  (xdrproc_t)xdr_krb5_tl_data)) {
+ 			return FALSE;
+ 		}
+ 	}
+@@ -576,7 +577,7 @@ xdr_cprinc3_arg(XDR *xdrs, cprinc3_arg *objp)
+ 	if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple,
+ 		       (unsigned int *)&objp->n_ks_tuple, ~0,
+ 		       sizeof(krb5_key_salt_tuple),
+-		       xdr_krb5_key_salt_tuple)) {
++		       (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+ 		return (FALSE);
+ 	}
+ 	if (!xdr_nullstring(xdrs, &objp->passwd)) {
+@@ -668,7 +669,7 @@ xdr_gprincs_ret(XDR *xdrs, gprincs_ret *objp)
+ 	  }
+ 	  if (!xdr_array(xdrs, (caddr_t *) &objp->princs,
+ 			 (unsigned int *) &objp->count, ~0,
+-			 sizeof(char *), xdr_nullstring)) {
++			 sizeof(char *), (xdrproc_t)xdr_nullstring)) {
+ 	       return (FALSE);
+ 	  }
+      }
+@@ -706,7 +707,7 @@ xdr_chpass3_arg(XDR *xdrs, chpass3_arg *objp)
+ 	if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple,
+ 		       (unsigned int*)&objp->n_ks_tuple, ~0,
+ 		       sizeof(krb5_key_salt_tuple),
+-		       xdr_krb5_key_salt_tuple)) {
++		       (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+ 		return (FALSE);
+ 	}
+ 	if (!xdr_nullstring(xdrs, &objp->pass)) {
+@@ -726,7 +727,7 @@ xdr_setkey_arg(XDR *xdrs, setkey_arg *objp)
+ 	}
+ 	if (!xdr_array(xdrs, (caddr_t *) &objp->keyblocks,
+ 		       (unsigned int *) &objp->n_keys, ~0,
+-		       sizeof(krb5_keyblock), xdr_krb5_keyblock)) {
++		       sizeof(krb5_keyblock), (xdrproc_t)xdr_krb5_keyblock)) {
+ 		return (FALSE);
+ 	}
+ 	return (TRUE);
+@@ -746,12 +747,13 @@ xdr_setkey3_arg(XDR *xdrs, setkey3_arg *objp)
+ 	}
+ 	if (!xdr_array(xdrs, (caddr_t *) &objp->ks_tuple,
+ 		       (unsigned int *) &objp->n_ks_tuple, ~0,
+-		       sizeof(krb5_key_salt_tuple), xdr_krb5_key_salt_tuple)) {
++		       sizeof(krb5_key_salt_tuple),
++		       (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+ 		return (FALSE);
+ 	}
+ 	if (!xdr_array(xdrs, (caddr_t *) &objp->keyblocks,
+ 		       (unsigned int *) &objp->n_keys, ~0,
+-		       sizeof(krb5_keyblock), xdr_krb5_keyblock)) {
++		       sizeof(krb5_keyblock), (xdrproc_t)xdr_krb5_keyblock)) {
+ 		return (FALSE);
+ 	}
+ 	return (TRUE);
+@@ -771,7 +773,8 @@ xdr_setkey4_arg(XDR *xdrs, setkey4_arg *objp)
+ 	}
+ 	if (!xdr_array(xdrs, (caddr_t *) &objp->key_data,
+ 		       (unsigned int *) &objp->n_key_data, ~0,
+-		       sizeof(kadm5_key_data), xdr_kadm5_key_data)) {
++		       sizeof(kadm5_key_data),
++		       (xdrproc_t)xdr_kadm5_key_data)) {
+ 		return FALSE;
+ 	}
+ 	return TRUE;
+@@ -804,7 +807,7 @@ xdr_chrand3_arg(XDR *xdrs, chrand3_arg *objp)
+ 	if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple,
+ 		       (unsigned int*)&objp->n_ks_tuple, ~0,
+ 		       sizeof(krb5_key_salt_tuple),
+-		       xdr_krb5_key_salt_tuple)) {
++		       (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+ 		return (FALSE);
+ 	}
+ 	return (TRUE);
+@@ -822,7 +825,8 @@ xdr_chrand_ret(XDR *xdrs, chrand_ret *objp)
+ 	if (objp->code == KADM5_OK) {
+ 		if (!xdr_array(xdrs, (char **)&objp->keys,
+ 			       (unsigned int *)&objp->n_keys, ~0,
+-			       sizeof(krb5_keyblock), xdr_krb5_keyblock))
++			       sizeof(krb5_keyblock),
++			       (xdrproc_t)xdr_krb5_keyblock))
+ 			return FALSE;
+ 	}
+ 
+@@ -965,7 +969,7 @@ xdr_gpols_ret(XDR *xdrs, gpols_ret *objp)
+ 	  }
+ 	  if (!xdr_array(xdrs, (caddr_t *) &objp->pols,
+ 			 (unsigned int *) &objp->count, ~0,
+-			 sizeof(char *), xdr_nullstring)) {
++			 sizeof(char *), (xdrproc_t)xdr_nullstring)) {
+ 	       return (FALSE);
+ 	  }
+      }
+@@ -1030,7 +1034,7 @@ xdr_gstrings_ret(XDR *xdrs, gstrings_ret *objp)
+ 		if (!xdr_array(xdrs, (caddr_t *) &objp->strings,
+ 			       (unsigned int *) &objp->count, ~0,
+ 			       sizeof(krb5_string_attr),
+-			       xdr_krb5_string_attr)) {
++			       (xdrproc_t)xdr_krb5_string_attr)) {
+ 			return (FALSE);
+ 		}
+ 	}
+@@ -1198,7 +1202,8 @@ xdr_getpkeys_ret(XDR *xdrs, getpkeys_ret *objp)
+ 	if (objp->code == KADM5_OK) {
+ 		if (!xdr_array(xdrs, (caddr_t *) &objp->key_data,
+ 			       (unsigned int *) &objp->n_key_data, ~0,
+-			       sizeof(kadm5_key_data), xdr_kadm5_key_data)) {
++			       sizeof(kadm5_key_data),
++			       (xdrproc_t)xdr_kadm5_key_data)) {
+ 		    return FALSE;
+ 		}
+ 	}
+diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c
+index 74d23760fb..9ac47bb87f 100644
+--- a/src/lib/kadm5/misc_free.c
++++ b/src/lib/kadm5/misc_free.c
+@@ -41,9 +41,8 @@ kadm5_free_name_list(void *server_handle, char **names, int count)
+ }
+ 
+ /* XXX this ought to be in libkrb5.a, but isn't */
+-kadm5_ret_t krb5_free_key_data_contents(context, key)
+-    krb5_context context;
+-    krb5_key_data *key;
++kadm5_ret_t
++krb5_free_key_data_contents(krb5_context context, krb5_key_data *key)
+ {
+     int i, idx;
+ 
+diff --git a/src/lib/kadm5/srv/adb_xdr.c b/src/lib/kadm5/srv/adb_xdr.c
+index fc732971d2..b6ffdb8c7a 100644
+--- a/src/lib/kadm5/srv/adb_xdr.c
++++ b/src/lib/kadm5/srv/adb_xdr.c
+@@ -53,8 +53,7 @@ xdr_osa_pw_hist_ent(XDR *xdrs, osa_pw_hist_ent *objp)
+ {
+     if (!xdr_array(xdrs, (caddr_t *) &objp->key_data,
+ 		   (u_int *) &objp->n_key_data, ~0,
+-		   sizeof(krb5_key_data),
+-		   xdr_krb5_key_data))
++		   sizeof(krb5_key_data), (xdrproc_t)xdr_krb5_key_data))
+ 	return (FALSE);
+     return (TRUE);
+ }
+@@ -88,8 +87,7 @@ xdr_osa_princ_ent_rec(XDR *xdrs, osa_princ_ent_t objp)
+ 	return (FALSE);
+     if (!xdr_array(xdrs, (caddr_t *) &objp->old_keys,
+ 		   (unsigned int *) &objp->old_key_len, ~0,
+-		   sizeof(osa_pw_hist_ent),
+-		   xdr_osa_pw_hist_ent))
++		   sizeof(osa_pw_hist_ent), (xdrproc_t)xdr_osa_pw_hist_ent))
+ 	return (FALSE);
+     return (TRUE);
+ }
+diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
+index 8c3ad3a691..d5bb0b167d 100644
+--- a/src/lib/kadm5/srv/svr_principal.c
++++ b/src/lib/kadm5/srv/svr_principal.c
+@@ -30,9 +30,9 @@ static int decrypt_key_data(krb5_context context,
+ /*
+  * XXX Functions that ought to be in libkrb5.a, but aren't.
+  */
+-kadm5_ret_t krb5_copy_key_data_contents(context, from, to)
+-    krb5_context context;
+-    krb5_key_data *from, *to;
++kadm5_ret_t
++krb5_copy_key_data_contents(krb5_context context, krb5_key_data *from,
++                            krb5_key_data *to)
+ {
+     int i, idx;
+ 
+@@ -75,10 +75,8 @@ static krb5_tl_data *dup_tl_data(krb5_tl_data *tl)
+ }
+ 
+ /* This is in lib/kdb/kdb_cpw.c, but is static */
+-static void cleanup_key_data(context, count, data)
+-    krb5_context   context;
+-    int                    count;
+-    krb5_key_data        * data;
++static void
++cleanup_key_data(krb5_context context, int count, krb5_key_data *data)
+ {
+     int i;
+ 
+diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
+index 7982956062..f2fae832eb 100644
+--- a/src/lib/kadm5/str_conv.c
++++ b/src/lib/kadm5/str_conv.c
+@@ -267,11 +267,8 @@ cleanup:
+  *      Salttype may be negative to indicate a search for only a enctype.
+  */
+ krb5_boolean
+-krb5_keysalt_is_present(ksaltlist, nksalts, enctype, salttype)
+-    krb5_key_salt_tuple *ksaltlist;
+-    krb5_int32          nksalts;
+-    krb5_enctype        enctype;
+-    krb5_int32          salttype;
++krb5_keysalt_is_present(krb5_key_salt_tuple *ksaltlist, krb5_int32 nksalts,
++                        krb5_enctype enctype, krb5_int32 salttype)
+ {
+     krb5_boolean        foundit;
+     int                 i;
+@@ -375,12 +372,11 @@ cleanup:
+  * If ignoresalt set, then salttype is ignored.
+  */
+ krb5_error_code
+-krb5_keysalt_iterate(ksaltlist, nksalt, ignoresalt, iterator, arg)
+-    krb5_key_salt_tuple *ksaltlist;
+-    krb5_int32          nksalt;
+-    krb5_boolean        ignoresalt;
+-    krb5_error_code     (*iterator) (krb5_key_salt_tuple *, krb5_pointer);
+-    krb5_pointer        arg;
++krb5_keysalt_iterate(krb5_key_salt_tuple *ksaltlist, krb5_int32 nksalt,
++                     krb5_boolean ignoresalt,
++                     krb5_error_code (*iterator)(krb5_key_salt_tuple *,
++                                                 void *),
++                     void *arg)
+ {
+     int                 i;
+     krb5_error_code     kret;
+diff --git a/src/lib/kadm5/t_kadm5.c b/src/lib/kadm5/t_kadm5.c
+index 153147ffbf..b3ab1004f3 100644
+--- a/src/lib/kadm5/t_kadm5.c
++++ b/src/lib/kadm5/t_kadm5.c
+@@ -276,7 +276,7 @@ cpw_test_succeed(char *user, krb5_principal princ, char *pass)
+ }
+ 
+ static void
+-test_chpass()
++test_chpass(void)
+ {
+     krb5_principal princ = parse_princ("chpass-test");
+     krb5_principal hist_princ = parse_princ("kadmin/history");
+@@ -334,7 +334,7 @@ cpol_test_compare(char *user, kadm5_policy_ent_t ent, uint32_t mask)
+ }
+ 
+ static void
+-test_create_policy()
++test_create_policy(void)
+ {
+     void *handle;
+     kadm5_policy_ent_rec ent;
+@@ -440,7 +440,7 @@ cprinc_test_compare(char *user, kadm5_principal_ent_t ent, uint32_t mask,
+ }
+ 
+ static void
+-test_create_principal()
++test_create_principal(void)
+ {
+     void *handle;
+     kadm5_principal_ent_rec ent;
+@@ -535,7 +535,7 @@ dpol_test_succeed(char *user, char *name)
+ }
+ 
+ static void
+-test_delete_policy()
++test_delete_policy(void)
+ {
+     krb5_principal princ = parse_princ("delete-policy-test-princ");
+ 
+@@ -587,7 +587,7 @@ dprinc_test_succeed(char *user, krb5_principal princ)
+ }
+ 
+ static void
+-test_delete_principal()
++test_delete_principal(void)
+ {
+     krb5_principal princ = parse_princ("delete-principal-test");
+ 
+@@ -638,7 +638,7 @@ gpol_test_fail(char *user, char *name, krb5_error_code code)
+ }
+ 
+ static void
+-test_get_policy()
++test_get_policy(void)
+ {
+     /* Fails with unknown policy. */
+     dpol_test_fail("admin", "unknown-policy", KADM5_UNK_POLICY);
+@@ -684,7 +684,7 @@ gprinc_test_fail(char *user, krb5_principal princ, krb5_error_code code)
+ }
+ 
+ static void
+-test_get_principal()
++test_get_principal(void)
+ {
+     void *handle;
+     kadm5_principal_ent_rec ent;
+@@ -743,7 +743,7 @@ test_get_principal()
+ }
+ 
+ static void
+-test_init_destroy()
++test_init_destroy(void)
+ {
+     krb5_context ctx;
+     kadm5_ret_t ret;
+@@ -1019,7 +1019,7 @@ mpol_test_compare(void *handle, kadm5_policy_ent_t ent, uint32_t mask)
+ }
+ 
+ static void
+-test_modify_policy()
++test_modify_policy(void)
+ {
+     kadm5_policy_ent_rec ent;
+ 
+@@ -1109,7 +1109,7 @@ mprinc_test_compare(char *user, kadm5_principal_ent_t ent, uint32_t mask)
+ }
+ 
+ static void
+-test_modify_principal()
++test_modify_principal(void)
+ {
+     void *handle;
+     krb5_principal princ = parse_princ("modify-principal-test");
+@@ -1233,7 +1233,7 @@ rnd_test_succeed(char *user, krb5_principal princ)
+ }
+ 
+ static void
+-test_randkey()
++test_randkey(void)
+ {
+     void *handle;
+     krb5_principal princ = parse_princ("randkey-principal-test");
+diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
+index 415ae64e22..0837f567cc 100644
+--- a/src/lib/kdb/kdb5.c
++++ b/src/lib/kdb/kdb5.c
+@@ -75,13 +75,13 @@ free_mkey_list(krb5_context context, krb5_keylist_node *mkey_list)
+ }
+ 
+ int
+-kdb_init_lock_list()
++kdb_init_lock_list(void)
+ {
+     return k5_mutex_finish_init(&db_lock);
+ }
+ 
+ static int
+-kdb_lock_list()
++kdb_lock_list(void)
+ {
+     int err;
+     err = CALL_INIT_FUNCTION (kdb_init_lock_list);
+@@ -92,14 +92,14 @@ kdb_lock_list()
+ }
+ 
+ void
+-kdb_fini_lock_list()
++kdb_fini_lock_list(void)
+ {
+     if (INITIALIZER_RAN(kdb_init_lock_list))
+         k5_mutex_destroy(&db_lock);
+ }
+ 
+ static void
+-kdb_unlock_list()
++kdb_unlock_list(void)
+ {
+     k5_mutex_unlock(&db_lock);
+ }
+diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
+index 450860f470..c33c7cf8d0 100644
+--- a/src/lib/kdb/kdb_cpw.c
++++ b/src/lib/kdb/kdb_cpw.c
+@@ -57,10 +57,7 @@
+ enum save { DISCARD_ALL, KEEP_LAST_KVNO, KEEP_ALL };
+ 
+ int
+-krb5_db_get_key_data_kvno(context, count, data)
+-    krb5_context          context;
+-    int                   count;
+-    krb5_key_data       * data;
++krb5_db_get_key_data_kvno(krb5_context context, int count, krb5_key_data *data)
+ {
+     int i, kvno;
+     /* Find last key version number */
+@@ -73,10 +70,7 @@ krb5_db_get_key_data_kvno(context, count, data)
+ }
+ 
+ static void
+-cleanup_key_data(context, count, data)
+-    krb5_context          context;
+-    int                   count;
+-    krb5_key_data       * data;
++cleanup_key_data(krb5_context context, int count, krb5_key_data *data)
+ {
+     int i;
+ 
+@@ -149,13 +143,9 @@ preserve_old_keys(krb5_context context, krb5_keyblock *mkey,
+ }
+ 
+ static krb5_error_code
+-add_key_rnd(context, master_key, ks_tuple, ks_tuple_count, db_entry, kvno)
+-    krb5_context          context;
+-    krb5_keyblock       * master_key;
+-    krb5_key_salt_tuple * ks_tuple;
+-    int                   ks_tuple_count;
+-    krb5_db_entry       * db_entry;
+-    int                   kvno;
++add_key_rnd(krb5_context context, krb5_keyblock *master_key,
++            krb5_key_salt_tuple *ks_tuple, int ks_tuple_count,
++            krb5_db_entry *db_entry, int kvno)
+ {
+     krb5_keyblock         key;
+     int                   i, j;
+@@ -246,15 +236,9 @@ make_random_salt(krb5_context context, krb5_keysalt *salt_out)
+  * If passwd is NULL the assumes that the caller wants a random password.
+  */
+ static krb5_error_code
+-add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd,
+-            db_entry, kvno)
+-    krb5_context          context;
+-    krb5_keyblock       * master_key;
+-    krb5_key_salt_tuple * ks_tuple;
+-    int                   ks_tuple_count;
+-    const char          * passwd;
+-    krb5_db_entry       * db_entry;
+-    int                   kvno;
++add_key_pwd(krb5_context context, krb5_keyblock *master_key,
++            krb5_key_salt_tuple *ks_tuple, int ks_tuple_count,
++            const char *passwd, krb5_db_entry *db_entry, int kvno)
+ {
+     krb5_error_code       retval;
+     krb5_keysalt          key_salt;
+diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c
+index a623e001ec..346cf962e8 100644
+--- a/src/lib/kdb/keytab.c
++++ b/src/lib/kdb/keytab.c
+@@ -71,10 +71,7 @@ krb5_db_register_keytab(krb5_context context)
+ }
+ 
+ krb5_error_code
+-krb5_ktkdb_resolve(context, name, id)
+-    krb5_context          context;
+-    const char          * name;
+-    krb5_keytab         * id;
++krb5_ktkdb_resolve(krb5_context context, const char *name, krb5_keytab *id)
+ {
+     if ((*id = (krb5_keytab) malloc(sizeof(**id))) == NULL)
+         return(ENOMEM);
+@@ -84,9 +81,7 @@ krb5_ktkdb_resolve(context, name, id)
+ }
+ 
+ krb5_error_code
+-krb5_ktkdb_close(context, kt)
+-    krb5_context context;
+-    krb5_keytab kt;
++krb5_ktkdb_close(krb5_context context, krb5_keytab kt)
+ {
+     /*
+      * This routine is responsible for freeing all memory allocated
+@@ -119,13 +114,9 @@ krb5_ktkdb_set_context(krb5_context ctx)
+ }
+ 
+ krb5_error_code
+-krb5_ktkdb_get_entry(in_context, id, principal, kvno, enctype, entry)
+-    krb5_context          in_context;
+-    krb5_keytab           id;
+-    krb5_const_principal  principal;
+-    krb5_kvno             kvno;
+-    krb5_enctype          enctype;
+-    krb5_keytab_entry   * entry;
++krb5_ktkdb_get_entry(krb5_context in_context, krb5_keytab id,
++                     krb5_const_principal principal, krb5_kvno kvno,
++                     krb5_enctype enctype, krb5_keytab_entry *entry)
+ {
+     krb5_context          context;
+     krb5_error_code       kerror = 0;
+diff --git a/src/lib/kdb/t_stringattr.c b/src/lib/kdb/t_stringattr.c
+index 11740368ea..2c643018b5 100644
+--- a/src/lib/kdb/t_stringattr.c
++++ b/src/lib/kdb/t_stringattr.c
+@@ -38,7 +38,7 @@
+  */
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_db_entry *ent;
+     krb5_context context;
+diff --git a/src/lib/krad/packet.c b/src/lib/krad/packet.c
+index fc2d248001..c5446b890c 100644
+--- a/src/lib/krad/packet.c
++++ b/src/lib/krad/packet.c
+@@ -200,7 +200,7 @@ auth_generate_response(krb5_context ctx, const char *secret,
+ 
+ /* Create a new packet. */
+ static krad_packet *
+-packet_new()
++packet_new(void)
+ {
+     krad_packet *pkt;
+ 
+diff --git a/src/lib/krad/t_attr.c b/src/lib/krad/t_attr.c
+index 4d285ad9de..d5dd99a174 100644
+--- a/src/lib/krad/t_attr.c
++++ b/src/lib/krad/t_attr.c
+@@ -40,7 +40,7 @@ const static unsigned char auth[] = {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     unsigned char outbuf[MAX_ATTRSETSIZE];
+     const char *decoded = "accept";
+diff --git a/src/lib/krad/t_attrset.c b/src/lib/krad/t_attrset.c
+index 0f95762534..4cdb8b7d8e 100644
+--- a/src/lib/krad/t_attrset.c
++++ b/src/lib/krad/t_attrset.c
+@@ -40,7 +40,7 @@ const static unsigned char encpass[] = {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     unsigned char buffer[KRAD_PACKET_SIZE_MAX], encoded[MAX_ATTRSETSIZE];
+     const char *username = "testUser", *password = "accept";
+diff --git a/src/lib/krad/t_code.c b/src/lib/krad/t_code.c
+index b245a7efc0..6cd522af55 100644
+--- a/src/lib/krad/t_code.c
++++ b/src/lib/krad/t_code.c
+@@ -30,7 +30,7 @@
+ #include "t_test.h"
+ 
+ int
+-main()
++main(void)
+ {
+     const char *tmp;
+ 
+diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c
+index 1dadeef64f..ab3cda6fef 100644
+--- a/src/lib/krb5/ccache/cc_keyring.c
++++ b/src/lib/krb5/ccache/cc_keyring.c
+@@ -314,7 +314,7 @@ get_persistent_real(uid_t uid)
+  * for the session anchor.
+  */
+ static key_serial_t
+-session_write_anchor()
++session_write_anchor(void)
+ {
+     key_serial_t s, u;
+ 
+diff --git a/src/lib/krb5/krb/plugin.c b/src/lib/krb5/krb/plugin.c
+index 3bb7a38d44..1286e9e383 100644
+--- a/src/lib/krb5/krb/plugin.c
++++ b/src/lib/krb5/krb/plugin.c
+@@ -355,7 +355,7 @@ load_if_needed(krb5_context context, struct plugin_mapping *map,
+     krb5_error_code ret;
+     char *symname = NULL;
+     struct plugin_file_handle *handle = NULL;
+-    void (*initvt_fn)();
++    void (*initvt_fn)(void);
+ 
+     if (map->module != NULL || map->dyn_path == NULL)
+         return;
+diff --git a/src/lib/krb5/krb/t_authdata.c b/src/lib/krb5/krb/t_authdata.c
+index dd834b9b0c..44f4a1cbd6 100644
+--- a/src/lib/krb5/krb/t_authdata.c
++++ b/src/lib/krb5/krb/t_authdata.c
+@@ -74,7 +74,7 @@ static void compare_authdata(const krb5_authdata *adc1, krb5_authdata *adc2) {
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_context context;
+     krb5_authdata **results;
+diff --git a/src/lib/krb5/krb/t_response_items.c b/src/lib/krb5/krb/t_response_items.c
+index 0deb9292a1..a6b02ca055 100644
+--- a/src/lib/krb5/krb/t_response_items.c
++++ b/src/lib/krb5/krb/t_response_items.c
+@@ -61,7 +61,7 @@ nstrcmp(const char *a, const char *b)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     k5_response_items *ri;
+ 
+diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c
+index d6746b74bd..9780c2e564 100644
+--- a/src/lib/krb5/krb/t_ser.c
++++ b/src/lib/krb5/krb/t_ser.c
+@@ -195,7 +195,7 @@ ser_checksum(krb5_checksum *cksum)
+ }
+ 
+ static void
+-ser_context_test()
++ser_context_test(void)
+ {
+     krb5_context context;
+     profile_t sprofile;
+@@ -216,7 +216,7 @@ ser_context_test()
+ }
+ 
+ static void
+-ser_acontext_test()
++ser_acontext_test(void)
+ {
+     krb5_auth_context   actx;
+     krb5_address        local_address;
+@@ -306,7 +306,7 @@ ser_acontext_test()
+ }
+ 
+ static void
+-ser_princ_test()
++ser_princ_test(void)
+ {
+     krb5_principal      princ;
+     char                pname[1024];
+@@ -320,7 +320,7 @@ ser_princ_test()
+ }
+ 
+ static void
+-ser_cksum_test()
++ser_cksum_test(void)
+ {
+     krb5_checksum       checksum;
+     krb5_octet          ckdata[24];
+diff --git a/src/lib/krb5/krb/t_sname_match.c b/src/lib/krb5/krb/t_sname_match.c
+index 021b720d65..ee5623c158 100644
+--- a/src/lib/krb5/krb/t_sname_match.c
++++ b/src/lib/krb5/krb/t_sname_match.c
+@@ -80,7 +80,7 @@ struct test {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i;
+     struct test *t;
+diff --git a/src/lib/krb5/krb/t_valid_times.c b/src/lib/krb5/krb/t_valid_times.c
+index e4b5f1bce4..1a8036e811 100644
+--- a/src/lib/krb5/krb/t_valid_times.c
++++ b/src/lib/krb5/krb/t_valid_times.c
+@@ -36,7 +36,7 @@
+ #define BOUNDARY (uint32_t)INT32_MIN
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_error_code ret;
+     krb5_context context;
+diff --git a/src/lib/krb5/rcache/t_memrcache.c b/src/lib/krb5/rcache/t_memrcache.c
+index 6f212b0ecd..665da75ea5 100644
+--- a/src/lib/krb5/rcache/t_memrcache.c
++++ b/src/lib/krb5/rcache/t_memrcache.c
+@@ -33,7 +33,7 @@
+ #include "memrcache.c"
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_error_code ret;
+     krb5_context context;
+diff --git a/src/lib/rpc/auth_gss.c b/src/lib/rpc/auth_gss.c
+index 319bc759b1..f61322d82b 100644
+--- a/src/lib/rpc/auth_gss.c
++++ b/src/lib/rpc/auth_gss.c
+@@ -445,9 +445,9 @@ authgss_refresh(AUTH *auth, struct rpc_msg *msg)
+ 			memset(&gr, 0, sizeof(gr));
+ 
+ 			call_stat = clnt_call(gd->clnt, NULLPROC,
+-					      xdr_rpc_gss_init_args,
++					      (xdrproc_t)xdr_rpc_gss_init_args,
+ 					      &send_token,
+-					      xdr_rpc_gss_init_res,
++					      (xdrproc_t)xdr_rpc_gss_init_res,
+ 					      (caddr_t)&gr, AUTH_TIMEOUT);
+ 
+ 			gss_release_buffer(&min_stat, &send_token);
+diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c
+index 8ab7ab5ba7..b5e03b9641 100644
+--- a/src/lib/rpc/auth_gssapi.c
++++ b/src/lib/rpc/auth_gssapi.c
+@@ -283,11 +283,11 @@ next_token:
+ 
+ 	  PRINTF(("gssapi_create: calling GSSAPI_INIT (%d)\n", init_func));
+ 
+-	  xdr_free(xdr_authgssapi_init_res, &call_res);
++	  xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res);
+ 	  memset(&call_res, 0, sizeof(call_res));
+ 	  callstat = clnt_call(clnt, init_func,
+-			       xdr_authgssapi_init_arg, &call_arg,
+-			       xdr_authgssapi_init_res, &call_res,
++			       (xdrproc_t)xdr_authgssapi_init_arg, &call_arg,
++			       (xdrproc_t)xdr_authgssapi_init_res, &call_res,
+ 			       timeout);
+ 	  gss_release_buffer(minor_stat, &call_arg.token);
+ 
+@@ -436,7 +436,7 @@ next_token:
+      /* don't assume the caller will want to change clnt->cl_auth */
+      clnt->cl_auth = save_auth;
+ 
+-     xdr_free(xdr_authgssapi_init_res, &call_res);
++     xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res);
+      return auth;
+ 
+      /******************************************************************/
+@@ -458,7 +458,7 @@ cleanup:
+      if (rpc_createerr.cf_stat == 0)
+ 	  rpc_createerr.cf_stat = RPC_AUTHERROR;
+ 
+-     xdr_free(xdr_authgssapi_init_res, &call_res);
++     xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res);
+      return auth;
+ }
+ 
+@@ -760,7 +760,7 @@ skip_call:
+ static bool_t auth_gssapi_wrap(
+      AUTH *auth,
+      XDR *out_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      OM_uint32 gssstat, minor_stat;
+@@ -791,7 +791,7 @@ static bool_t auth_gssapi_wrap(
+ static bool_t auth_gssapi_unwrap(
+      AUTH *auth,
+      XDR *in_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      OM_uint32 gssstat, minor_stat;
+diff --git a/src/lib/rpc/auth_gssapi_misc.c b/src/lib/rpc/auth_gssapi_misc.c
+index a60eb7f7cb..57fc1fb39f 100644
+--- a/src/lib/rpc/auth_gssapi_misc.c
++++ b/src/lib/rpc/auth_gssapi_misc.c
+@@ -199,7 +199,7 @@ bool_t auth_gssapi_wrap_data(
+      gss_ctx_id_t context,
+      uint32_t seq_num,
+      XDR *out_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      gss_buffer_desc in_buf, out_buf;
+@@ -267,7 +267,7 @@ bool_t auth_gssapi_unwrap_data(
+      gss_ctx_id_t context,
+      uint32_t seq_num,
+      XDR *in_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      gss_buffer_desc in_buf, out_buf;
+diff --git a/src/lib/rpc/authunix_prot.c b/src/lib/rpc/authunix_prot.c
+index 512d5a51b7..92276c3ad4 100644
+--- a/src/lib/rpc/authunix_prot.c
++++ b/src/lib/rpc/authunix_prot.c
+@@ -58,7 +58,8 @@ xdr_authunix_parms(XDR *xdrs, struct authunix_parms *p)
+ 	    && xdr_int(xdrs, &(p->aup_uid))
+ 	    && xdr_int(xdrs, &(p->aup_gid))
+ 	    && xdr_array(xdrs, (caddr_t *)&(p->aup_gids),
+-		    &(p->aup_len), NGRPS, sizeof(int), xdr_int) ) {
++			 &(p->aup_len), NGRPS, sizeof(int),
++			 (xdrproc_t)xdr_int)) {
+ 		return (TRUE);
+ 	}
+ 	return (FALSE);
+diff --git a/src/lib/rpc/clnt_perror.c b/src/lib/rpc/clnt_perror.c
+index fcc3657464..912b267867 100644
+--- a/src/lib/rpc/clnt_perror.c
++++ b/src/lib/rpc/clnt_perror.c
+@@ -76,7 +76,6 @@ char *
+ clnt_sperror(CLIENT *rpch, char *s)
+ {
+ 	struct rpc_err e;
+-	void clnt_perrno();
+ 	char *err;
+ 	char *bufstart = get_buf();
+ 	char *str = bufstart;
+diff --git a/src/lib/rpc/clnt_raw.c b/src/lib/rpc/clnt_raw.c
+index dcbb5cf23d..7e62a5c776 100644
+--- a/src/lib/rpc/clnt_raw.c
++++ b/src/lib/rpc/clnt_raw.c
+@@ -80,7 +80,7 @@ static struct clnt_ops client_ops = {
+ 	clntraw_control
+ };
+ 
+-void	svc_getreq();
++void	svc_getreq(int);
+ 
+ /*
+  * Create a client handle for memory based rpc.
+diff --git a/src/lib/rpc/dyn.c b/src/lib/rpc/dyn.c
+index bce1fd2a7d..a505f34817 100644
+--- a/src/lib/rpc/dyn.c
++++ b/src/lib/rpc/dyn.c
+@@ -30,10 +30,8 @@
+ /*
+  * Made obsolete by DynInsert, now just a convenience function.
+  */
+-int DynAppend(obj, els, num)
+-   DynObjectP obj;
+-   DynPtr els;
+-   int num;
++int
++DynAppend(DynObjectP obj, DynPtr els, int num)
+ {
+      return DynInsert(obj, DynSize(obj), els, num);
+ }
+@@ -52,8 +50,8 @@ int DynAppend(obj, els, num)
+ 
+ static int default_increment = DEFAULT_INC;
+ 
+-DynObjectP DynCreate(el_size, inc)
+-   int	el_size, inc;
++DynObjectP
++DynCreate(int el_size, int inc)
+ {
+      DynObjectP obj;
+ 
+@@ -77,8 +75,8 @@ DynObjectP DynCreate(el_size, inc)
+      return obj;
+ }
+ 
+-DynObjectP DynCopy(obj)
+-   DynObjectP obj;
++DynObjectP
++DynCopy(DynObjectP obj)
+ {
+      DynObjectP obj1;
+ 
+@@ -104,8 +102,8 @@ DynObjectP DynCopy(obj)
+      return obj1;
+ }
+ 
+-int DynDestroy(obj)
+-     /*@only@*/DynObjectP obj;
++int
++DynDestroy(/*@only@*/DynObjectP obj)
+ {
+      if (obj->paranoid) {
+ 	  if (obj->debug)
+@@ -118,8 +116,8 @@ int DynDestroy(obj)
+      return DYN_OK;
+ }
+ 
+-int DynRelease(obj)
+-   DynObjectP obj;
++int
++DynRelease(DynObjectP obj)
+ {
+      if (obj->debug)
+ 	  fprintf(stderr, "dyn: release: freeing object structure.\n");
+@@ -134,9 +132,8 @@ int DynRelease(obj)
+  * contains the source code for the function DynDebug().
+  */
+ 
+-int DynDebug(obj, state)
+-   DynObjectP obj;
+-   int state;
++int
++DynDebug(DynObjectP obj, int state)
+ {
+      obj->debug = state;
+ 
+@@ -155,9 +152,8 @@ int DynDebug(obj, state)
+  * Checkers!  Get away from that "hard disk erase" button!
+  *    (Stupid dog.  He almost did it to me again ...)
+  */
+-int DynDelete(obj, idx)
+-   DynObjectP obj;
+-   int idx;
++int
++DynDelete(DynObjectP obj, int idx)
+ {
+      if (idx < 0) {
+ 	  if (obj->debug)
+@@ -219,9 +215,8 @@ int DynDelete(obj, idx)
+  * contains the source code for the function DynInitZero().
+  */
+ 
+-int DynInitzero(obj, state)
+-   DynObjectP obj;
+-   int state;
++int
++DynInitzero(DynObjectP obj, int state)
+ {
+      obj->initzero = state;
+ 
+@@ -237,10 +232,8 @@ int DynInitzero(obj, state)
+  * contains the source code for the function DynInsert().
+  */
+ 
+-int DynInsert(obj, idx, els_in, num)
+-   DynObjectP obj;
+-   void *els_in;
+-   int idx, num;
++int
++DynInsert(DynObjectP obj, int idx, void *els_in, int num)
+ {
+      DynPtr els = (DynPtr) els_in;
+      int ret;
+@@ -290,9 +283,8 @@ int DynInsert(obj, idx, els_in, num)
+  * contains the source code for the function DynDebug().
+  */
+ 
+-int DynParanoid(obj, state)
+-   DynObjectP obj;
+-   int state;
++int
++DynParanoid(DynObjectP obj, int state)
+ {
+      obj->paranoid = state;
+ 
+@@ -308,8 +300,8 @@ int DynParanoid(obj, state)
+  * contains the source code for the functions DynGet() and DynAdd().
+  */
+ 
+-DynPtr DynArray(obj)
+-   DynObjectP obj;
++DynPtr
++DynArray(DynObjectP obj)
+ {
+      if (obj->debug)
+ 	  fprintf(stderr, "dyn: array: returning array pointer %p.\n",
+@@ -318,9 +310,8 @@ DynPtr DynArray(obj)
+      return obj->array;
+ }
+ 
+-DynPtr DynGet(obj, num)
+-   DynObjectP obj;
+-   int num;
++DynPtr
++DynGet(DynObjectP obj, int num)
+ {
+      if (num < 0) {
+ 	  if (obj->debug)
+@@ -342,9 +333,7 @@ DynPtr DynGet(obj, num)
+      return (DynPtr) obj->array + obj->el_size*num;
+ }
+ 
+-int DynAdd(obj, el)
+-   DynObjectP obj;
+-   void *el;
++int DynAdd(DynObjectP obj, void *el)
+ {
+      int	ret;
+ 
+@@ -364,10 +353,8 @@ int DynAdd(obj, el)
+  * obj->num_el) will not be updated properly and many other functions
+  * in the library will lose.  Have a nice day.
+  */
+-int DynPut(obj, el_in, idx)
+-   DynObjectP obj;
+-   void *el_in;
+-   int idx;
++int
++DynPut(DynObjectP obj, void *el_in, int idx)
+ {
+      DynPtr el = (DynPtr) el_in;
+      int ret;
+@@ -397,9 +384,8 @@ int DynPut(obj, el_in, idx)
+ /*
+  * Resize the array so that element req exists.
+  */
+-int _DynResize(obj, req)
+-   DynObjectP obj;
+-   int req;
++int
++_DynResize(DynObjectP obj, int req)
+ {
+      int size;
+ 
+@@ -430,9 +416,8 @@ int _DynResize(obj, req)
+  * Ideally, this function should not be called from outside the
+  * library.  However, nothing will break if it is.
+  */
+-int _DynRealloc(obj, num_incs)
+-   DynObjectP obj;
+-   int num_incs;
++int
++_DynRealloc(DynObjectP obj, int num_incs)
+ {
+      DynPtr temp;
+      int new_size_in_bytes;
+@@ -475,8 +460,8 @@ int _DynRealloc(obj, num_incs)
+  * contains the source code for the function DynSize().
+  */
+ 
+-int DynSize(obj)
+-   DynObjectP obj;
++int
++DynSize(DynObjectP obj)
+ {
+      if (obj->debug)
+ 	  fprintf(stderr, "dyn: size: returning size %d.\n", obj->num_el);
+@@ -484,8 +469,8 @@ int DynSize(obj)
+      return obj->num_el;
+ }
+ 
+-int DynCapacity(obj)
+-   DynObjectP obj;
++int
++DynCapacity(DynObjectP obj)
+ {
+      if (obj->debug)
+ 	  fprintf(stderr, "dyn: capacity: returning cap of %d.\n", obj->size);
+diff --git a/src/lib/rpc/pmap_clnt.c b/src/lib/rpc/pmap_clnt.c
+index 952a251453..5c3bba3528 100644
+--- a/src/lib/rpc/pmap_clnt.c
++++ b/src/lib/rpc/pmap_clnt.c
+@@ -54,8 +54,6 @@ static char sccsid[] = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
+ static struct timeval timeout = { 5, 0 };
+ static struct timeval tottimeout = { 60, 0 };
+ 
+-void clnt_perror();
+-
+ /*
+  * Set a mapping between program,version and port.
+  * Calls the pmap service remotely to do the mapping.
+@@ -128,7 +126,8 @@ pmap_set(
+ 	    }
+ 	}
+ #endif
+-	if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt,
++	if (CLNT_CALL(client, PMAPPROC_SET, (xdrproc_t)xdr_pmap, &parms,
++		      (xdrproc_t)xdr_bool, &rslt,
+ 	    tottimeout) != RPC_SUCCESS) {
+ 		clnt_perror(client, "Cannot register service");
+ 		return (FALSE);
+@@ -161,8 +160,8 @@ pmap_unset(
+ 	parms.pm_prog = program;
+ 	parms.pm_vers = version;
+ 	parms.pm_port = parms.pm_prot = 0;
+-	CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt,
+-	    tottimeout);
++	CLNT_CALL(client, PMAPPROC_UNSET, (xdrproc_t)xdr_pmap, &parms,
++		  (xdrproc_t)xdr_bool, &rslt, tottimeout);
+ 	CLNT_DESTROY(client);
+ 	(void)close(sock);
+ 	return (rslt);
+diff --git a/src/lib/rpc/pmap_getmaps.c b/src/lib/rpc/pmap_getmaps.c
+index b8a9cecf7e..a9c4c52906 100644
+--- a/src/lib/rpc/pmap_getmaps.c
++++ b/src/lib/rpc/pmap_getmaps.c
+@@ -77,8 +77,9 @@ pmap_getmaps(struct sockaddr_in *address)
+ 	client = clnttcp_create(address, PMAPPROG,
+ 	    PMAPVERS, &sock, 50, 500);
+ 	if (client != (CLIENT *)NULL) {
+-		if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL, xdr_pmaplist,
+-		    &head, minutetimeout) != RPC_SUCCESS) {
++		if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL,
++			      (xdrproc_t)xdr_pmaplist, &head,
++			      minutetimeout) != RPC_SUCCESS) {
+ 			clnt_perror(client, "pmap_getmaps rpc problem");
+ 		}
+ 		CLNT_DESTROY(client);
+diff --git a/src/lib/rpc/pmap_getport.c b/src/lib/rpc/pmap_getport.c
+index 66635a1034..2d0792b698 100644
+--- a/src/lib/rpc/pmap_getport.c
++++ b/src/lib/rpc/pmap_getport.c
+@@ -79,8 +79,10 @@ pmap_getport(
+ 		parms.pm_vers = version;
+ 		parms.pm_prot = protocol;
+ 		parms.pm_port = 0;  /* not needed or used */
+-		if (CLNT_CALL(client, PMAPPROC_GETPORT, xdr_pmap, &parms,
+-		    xdr_u_short, &port, tottimeout) != RPC_SUCCESS){
++		if (CLNT_CALL(client, PMAPPROC_GETPORT,
++			      (xdrproc_t)xdr_pmap, &parms,
++			      (xdrproc_t)xdr_u_short, &port,
++			      tottimeout) != RPC_SUCCESS){
+ 			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
+ 			clnt_geterr(client, &rpc_createerr.cf_error);
+ 		} else if (port == 0) {
+diff --git a/src/lib/rpc/pmap_prot2.c b/src/lib/rpc/pmap_prot2.c
+index aeccac6637..3c0c612bec 100644
+--- a/src/lib/rpc/pmap_prot2.c
++++ b/src/lib/rpc/pmap_prot2.c
+@@ -109,7 +109,8 @@ xdr_pmaplist(XDR *xdrs, struct pmaplist **rp)
+ 		if (freeing)
+ 			next = &((*rp)->pml_next);
+ 		if (! xdr_reference(xdrs, (caddr_t *)rp,
+-		    (u_int)sizeof(struct pmaplist), xdr_pmap))
++				    (u_int)sizeof(struct pmaplist),
++				    (xdrproc_t)xdr_pmap))
+ 			return (FALSE);
+ 		rp = (freeing) ? next : &((*rp)->pml_next);
+ 	}
+diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c
+index 8c7e30c21a..434e4eea65 100644
+--- a/src/lib/rpc/pmap_rmt.c
++++ b/src/lib/rpc/pmap_rmt.c
+@@ -105,8 +105,9 @@ pmap_rmtcall(
+ 		r.port_ptr = port_ptr;
+ 		r.results_ptr = resp;
+ 		r.xdr_results = xdrres;
+-		stat = CLNT_CALL(client, PMAPPROC_CALLIT, xdr_rmtcall_args, &a,
+-		    xdr_rmtcallres, &r, tout);
++		stat = CLNT_CALL(client, PMAPPROC_CALLIT,
++				 (xdrproc_t)xdr_rmtcall_args, &a,
++				 (xdrproc_t)xdr_rmtcallres, &r, tout);
+ 		CLNT_DESTROY(client);
+ 	} else {
+ 		stat = RPC_FAILED;
+@@ -161,7 +162,8 @@ xdr_rmtcallres(
+ 
+ 	port_ptr = (caddr_t)(void *)crp->port_ptr;
+ 	if (xdr_reference(xdrs, &port_ptr, sizeof (uint32_t),
+-	    xdr_u_int32) && xdr_u_int32(xdrs, &crp->resultslen)) {
++			  (xdrproc_t)xdr_u_int32) &&
++	    xdr_u_int32(xdrs, &crp->resultslen)) {
+ 		crp->port_ptr = (uint32_t *)(void *)port_ptr;
+ 		return ((*(crp->xdr_results))(xdrs, crp->results_ptr));
+ 	}
+@@ -343,7 +345,7 @@ clnt_broadcast(
+ 	recv_again:
+ 		msg.acpted_rply.ar_verf = gssrpc__null_auth;
+ 		msg.acpted_rply.ar_results.where = (caddr_t)&r;
+-                msg.acpted_rply.ar_results.proc = xdr_rmtcallres;
++		msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_rmtcallres;
+ 		readfds = mask;
+ 		t2 = t;
+ 		switch (select(gssrpc__rpc_dtablesize(), &readfds, (fd_set *)NULL,
+diff --git a/src/lib/rpc/rpc_prot.c b/src/lib/rpc/rpc_prot.c
+index 9b82e12c34..296968b946 100644
+--- a/src/lib/rpc/rpc_prot.c
++++ b/src/lib/rpc/rpc_prot.c
+@@ -132,8 +132,8 @@ xdr_rejected_reply(XDR *xdrs, struct rejected_reply *rr)
+ }
+ 
+ static struct xdr_discrim reply_dscrm[3] = {
+-	{ (int)MSG_ACCEPTED, xdr_accepted_reply },
+-	{ (int)MSG_DENIED, xdr_rejected_reply },
++	{ (int)MSG_ACCEPTED, (xdrproc_t)xdr_accepted_reply },
++	{ (int)MSG_DENIED, (xdrproc_t)xdr_rejected_reply },
+ 	{ __dontcare__, NULL_xdrproc_t } };
+ 
+ /*
+diff --git a/src/lib/rpc/svc.c b/src/lib/rpc/svc.c
+index cfbc7aad4d..0bcf04e8d4 100644
+--- a/src/lib/rpc/svc.c
++++ b/src/lib/rpc/svc.c
+@@ -80,7 +80,7 @@ static struct svc_callout {
+ 	struct svc_callout *sc_next;
+ 	rpcprog_t		    sc_prog;
+ 	rpcprog_t		    sc_vers;
+-	void		    (*sc_dispatch)();
++	void		    (*sc_dispatch)(struct svc_req *, SVCXPRT *);
+ } *svc_head;
+ 
+ static struct svc_callout *svc_find(rpcprog_t, rpcvers_t,
+@@ -162,7 +162,7 @@ svc_register(
+ 	SVCXPRT *xprt,
+ 	rpcprog_t prog,
+ 	rpcvers_t vers,
+-	void (*dispatch)(),
++	void (*dispatch)(struct svc_req *, SVCXPRT *),
+ 	int protocol)
+ {
+ 	struct svc_callout *prev;
+diff --git a/src/lib/rpc/svc_auth_gss.c b/src/lib/rpc/svc_auth_gss.c
+index aba7694807..98d601c8ab 100644
+--- a/src/lib/rpc/svc_auth_gss.c
++++ b/src/lib/rpc/svc_auth_gss.c
+@@ -193,7 +193,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
+ 	/* Deserialize arguments. */
+ 	memset(&recv_tok, 0, sizeof(recv_tok));
+ 
+-	if (!svc_getargs(rqst->rq_xprt, xdr_rpc_gss_init_args,
++	if (!svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args,
+ 			 (caddr_t)&recv_tok))
+ 		return (FALSE);
+ 
+@@ -209,7 +209,8 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
+ 					      NULL,
+ 					      NULL);
+ 
+-	svc_freeargs(rqst->rq_xprt, xdr_rpc_gss_init_args, (caddr_t)&recv_tok);
++	svc_freeargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args,
++		     (caddr_t)&recv_tok);
+ 
+ 	log_status("accept_sec_context", gr->gr_major, gr->gr_minor);
+ 	if (gr->gr_major != GSS_S_COMPLETE &&
+@@ -495,7 +496,8 @@ gssrpc__svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg,
+ 		}
+ 		*no_dispatch = TRUE;
+ 
+-		call_stat = svc_sendreply(rqst->rq_xprt, xdr_rpc_gss_init_res,
++		call_stat = svc_sendreply(rqst->rq_xprt,
++					  (xdrproc_t)xdr_rpc_gss_init_res,
+ 					  (caddr_t)&gr);
+ 
+ 		gss_release_buffer(&min_stat, &gr.gr_token);
+@@ -544,7 +546,7 @@ gssrpc__svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg,
+ 	}
+ 	retstat = AUTH_OK;
+ freegc:
+-	xdr_free(xdr_rpc_gss_cred, gc);
++	xdr_free((xdrproc_t)xdr_rpc_gss_cred, gc);
+ 	log_debug("returning %d from svcauth_gss()", retstat);
+ 	return (retstat);
+ }
+diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c
+index b7ffee4515..267c1545bd 100644
+--- a/src/lib/rpc/svc_auth_gssapi.c
++++ b/src/lib/rpc/svc_auth_gssapi.c
+@@ -201,7 +201,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+      if (! xdr_authgssapi_creds(&xdrs, &creds)) {
+ 	  PRINTF(("svcauth_gssapi: failed decoding creds\n"));
+ 	  LOG_MISCERR("protocol error in client credentials");
+-	  xdr_free(xdr_authgssapi_creds, &creds);
++	  xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+ 	  XDR_DESTROY(&xdrs);
+ 	  ret = AUTH_BADCRED;
+ 	  goto error;
+@@ -223,7 +223,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 	  if (creds.auth_msg && rqst->rq_proc == AUTH_GSSAPI_EXIT) {
+ 	       PRINTF(("svcauth_gssapi: GSSAPI_EXIT, cleaning up\n"));
+ 	       svc_sendreply(rqst->rq_xprt, xdr_void, NULL);
+-	       xdr_free(xdr_authgssapi_creds, &creds);
++	       xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+ 	       cleanup();
+ 	       exit(0);
+ 	  }
+@@ -306,7 +306,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 
+ 	  /* call is for us, deserialize arguments */
+ 	  memset(&call_arg, 0, sizeof(call_arg));
+-	  if (! svc_getargs(rqst->rq_xprt, xdr_authgssapi_init_arg,
++	  if (! svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_arg,
+ 			    &call_arg)) {
+ 	       PRINTF(("svcauth_gssapi: cannot decode args\n"));
+ 	       LOG_MISCERR("protocol error in procedure arguments");
+@@ -446,7 +446,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 	  minor_stat = call_res.gss_minor;
+ 
+ 	  /* done with call args */
+-	  xdr_free(xdr_authgssapi_init_arg, &call_arg);
++	  xdr_free((xdrproc_t)xdr_authgssapi_init_arg, &call_arg);
+ 
+ 	  PRINTF(("svcauth_gssapi: accept_sec_context returned %#x %#x\n",
+ 		  call_res.gss_major, call_res.gss_minor));
+@@ -459,7 +459,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 	       badauth(call_res.gss_major, call_res.gss_minor, rqst->rq_xprt);
+ 
+ 	       gss_release_buffer(&minor_stat, &output_token);
+-	       svc_sendreply(rqst->rq_xprt, xdr_authgssapi_init_res,
++	       svc_sendreply(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_res,
+ 			     (caddr_t) &call_res);
+ 	       *no_dispatch = TRUE;
+ 	       ret = AUTH_OK;
+@@ -492,7 +492,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 	  }
+ 
+ 	  PRINTF(("svcauth_gssapi: sending reply\n"));
+-	  svc_sendreply(rqst->rq_xprt, xdr_authgssapi_init_res,
++	  svc_sendreply(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_res,
+ 			(caddr_t) &call_res);
+ 	  *no_dispatch = TRUE;
+ 
+@@ -583,11 +583,13 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 	       case AUTH_GSSAPI_MSG:
+ 		    PRINTF(("svcauth_gssapi: GSSAPI_MSG, getting args\n"));
+ 		    memset(&call_arg, 0, sizeof(call_arg));
+-		    if (! svc_getargs(rqst->rq_xprt, xdr_authgssapi_init_arg,
++		    if (! svc_getargs(rqst->rq_xprt,
++				      (xdrproc_t)xdr_authgssapi_init_arg,
+ 				      &call_arg)) {
+ 			 PRINTF(("svcauth_gssapi: cannot decode args\n"));
+ 			 LOG_MISCERR("protocol error in call arguments");
+-			 xdr_free(xdr_authgssapi_init_arg, &call_arg);
++			 xdr_free((xdrproc_t)xdr_authgssapi_init_arg,
++				  &call_arg);
+ 			 ret = AUTH_BADCRED;
+ 			 goto error;
+ 		    }
+@@ -598,7 +600,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 							&call_arg.token);
+ 
+ 		    /* done with call args */
+-		    xdr_free(xdr_authgssapi_init_arg, &call_arg);
++		    xdr_free((xdrproc_t)xdr_authgssapi_init_arg, &call_arg);
+ 
+ 		    if (gssstat != GSS_S_COMPLETE) {
+ 			 AUTH_GSSAPI_DISPLAY_STATUS(("processing token",
+@@ -641,7 +643,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+      if (creds.client_handle.length != 0) {
+ 	  PRINTF(("svcauth_gssapi: freeing client_handle len %d\n",
+ 		  (int) creds.client_handle.length));
+-	  xdr_free(xdr_authgssapi_creds, &creds);
++	  xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+      }
+ 
+      PRINTF(("\n"));
+@@ -651,7 +653,7 @@ error:
+      if (creds.client_handle.length != 0) {
+ 	  PRINTF(("svcauth_gssapi: freeing client_handle len %d\n",
+ 		  (int) creds.client_handle.length));
+-	  xdr_free(xdr_authgssapi_creds, &creds);
++	  xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+      }
+ 
+      PRINTF(("\n"));
+@@ -1079,7 +1081,7 @@ void svcauth_gssapi_set_log_miscerr_func(
+ static bool_t svc_auth_gssapi_wrap(
+      SVCAUTH *auth,
+      XDR *out_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      OM_uint32 gssstat, minor_stat;
+@@ -1102,7 +1104,7 @@ static bool_t svc_auth_gssapi_wrap(
+ static bool_t svc_auth_gssapi_unwrap(
+      SVCAUTH *auth,
+      XDR *in_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      svc_auth_gssapi_data *client_data = SVCAUTH_PRIVATE(auth);
+diff --git a/src/lib/rpc/svc_simple.c b/src/lib/rpc/svc_simple.c
+index 315275f5fd..aa6c0a63d0 100644
+--- a/src/lib/rpc/svc_simple.c
++++ b/src/lib/rpc/svc_simple.c
+@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
+ #include <netdb.h>
+ 
+ static struct proglst {
+-	char *(*p_progname)();
++	char *(*p_progname)(void *);
+ 	int  p_prognum;
+ 	int  p_procnum;
+ 	xdrproc_t p_inproc, p_outproc;
+@@ -62,7 +62,7 @@ registerrpc(
+ 	rpcprog_t prognum,
+ 	rpcvers_t versnum,
+ 	rpcproc_t procnum,
+-	char *(*progname)(),
++	char *(*progname)(void *),
+ 	xdrproc_t inproc,
+ 	xdrproc_t outproc)
+ {
+diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c
+index c9a812bc5a..9b907bcdc6 100644
+--- a/src/lib/rpc/unit-test/client.c
++++ b/src/lib/rpc/unit-test/client.c
+@@ -42,7 +42,7 @@ char *whoami;
+ #ifdef __GNUC__
+ __attribute__((noreturn))
+ #endif
+-static void usage()
++static void usage(void)
+ {
+      fprintf(stderr, "usage: %s {-t|-u} [-a] [-s num] [-m num] host service [count]\n",
+ 	     whoami);
+@@ -50,9 +50,7 @@ static void usage()
+ }
+ 
+ int
+-main(argc, argv)
+-   int argc;
+-   char **argv;
++main(int argc, char **argv)
+ {
+      char        *host, *port, *target, *echo_arg, **echo_resp, buf[BIG_BUF];
+      CLIENT      *clnt;
+@@ -172,7 +170,7 @@ main(argc, argv)
+ 	      strcmp(echo_arg, (*echo_resp) + 6) != 0)
+ 	       fprintf(stderr, "RPC_TEST_ECHO call %d response wrong: "
+ 		       "arg = %s, resp = %s\n", i, echo_arg, *echo_resp);
+-	  gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++	  gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+      }
+ 
+      /*
+@@ -194,7 +192,7 @@ main(argc, argv)
+ 	       clnt_perror(clnt, whoami);
+      } else {
+ 	  fprintf(stderr, "bad seq didn't cause failure\n");
+-	  gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++	  gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+      }
+ 
+      AUTH_PRIVATE(clnt->cl_auth)->seq_num -= 3;
+@@ -207,7 +205,7 @@ main(argc, argv)
+      if (echo_resp == NULL)
+ 	  clnt_perror(clnt, "Sequence number improperly reset");
+      else
+-	  gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++	  gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+ 
+      /*
+       * Now simulate a lost server response, and see if
+@@ -219,7 +217,7 @@ main(argc, argv)
+      if (echo_resp == NULL)
+ 	  clnt_perror(clnt, "Auto-resynchronization failed");
+      else
+-	  gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++	  gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+ 
+      /*
+       * Now make sure auto-resyncrhonization actually worked
+@@ -229,7 +227,7 @@ main(argc, argv)
+      if (echo_resp == NULL)
+ 	  clnt_perror(clnt, "Auto-resynchronization did not work");
+      else
+-	  gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++	  gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+ 
+      if (! auth_once) {
+ 	  tmp_auth = clnt->cl_auth;
+@@ -259,7 +257,7 @@ main(argc, argv)
+ 		   strcmp(echo_arg, (*echo_resp) + 6) != 0)
+ 		    fprintf(stderr,
+ 			    "RPC_TEST_LENGTHS call %d response wrong\n", i);
+-	       gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++	       gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+ 	  }
+ 
+ 	  /* cycle from 1 to 255 */
+diff --git a/src/lib/rpc/unit-test/rpc_test_clnt.c b/src/lib/rpc/unit-test/rpc_test_clnt.c
+index 4e4a18a720..b9141672b1 100644
+--- a/src/lib/rpc/unit-test/rpc_test_clnt.c
++++ b/src/lib/rpc/unit-test/rpc_test_clnt.c
+@@ -5,9 +5,7 @@
+ static struct timeval TIMEOUT = { 25, 0 };
+ 
+ char **
+-rpc_test_echo_1(argp, clnt)
+-	char **argp;
+-	CLIENT *clnt;
++rpc_test_echo_1(char **argp, CLIENT *clnt)
+ {
+ 	static char *clnt_res;
+ 
+diff --git a/src/lib/rpc/unit-test/rpc_test_svc.c b/src/lib/rpc/unit-test/rpc_test_svc.c
+index c54c0813db..3aa7674c51 100644
+--- a/src/lib/rpc/unit-test/rpc_test_svc.c
++++ b/src/lib/rpc/unit-test/rpc_test_svc.c
+@@ -14,16 +14,14 @@ static int _rpcsvcstate = _IDLE;	/* Set when a request is serviced */
+ static int _rpcsvccount = 0;		/* Number of requests being serviced */
+ 
+ void
+-rpc_test_prog_1_svc(rqstp, transp)
+-	struct svc_req *rqstp;
+-	SVCXPRT *transp;
++rpc_test_prog_1_svc(struct svc_req *rqstp, SVCXPRT *transp)
+ {
+ 	union {
+ 		char *rpc_test_echo_1_arg;
+ 	} argument;
+ 	char *result;
+-	bool_t (*xdr_argument)(), (*xdr_result)();
+-	char *(*local)();
++	xdrproc_t xdr_argument, xdr_result;
++	char *(*local)(char *, struct svc_req *);
+ 
+ 	_rpcsvccount++;
+ 	switch (rqstp->rq_proc) {
+@@ -35,9 +33,9 @@ rpc_test_prog_1_svc(rqstp, transp)
+ 		return;
+ 
+ 	case RPC_TEST_ECHO:
+-		xdr_argument = xdr_wrapstring;
+-		xdr_result = xdr_wrapstring;
+-		local = (char *(*)()) rpc_test_echo_1_svc;
++		xdr_argument = (xdrproc_t)xdr_wrapstring;
++		xdr_result = (xdrproc_t)xdr_wrapstring;
++		local = (char *(*)(char *, struct svc_req *)) rpc_test_echo_1_svc;
+ 		break;
+ 
+ 	default:
+@@ -53,7 +51,7 @@ rpc_test_prog_1_svc(rqstp, transp)
+ 		_rpcsvcstate = _SERVED;
+ 		return;
+ 	}
+-	result = (*local)(&argument, rqstp);
++	result = (*local)((char *)&argument, rqstp);
+ 	if (result != NULL && !svc_sendreply(transp, xdr_result, result)) {
+ 		svcerr_systemerr(transp);
+ 	}
+diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c
+index c3bbcbf8cf..4400b969f6 100644
+--- a/src/lib/rpc/unit-test/server.c
++++ b/src/lib/rpc/unit-test/server.c
+@@ -40,7 +40,7 @@ static void rpc_test_badverf(gss_name_t client, gss_name_t server,
+ #define SERVICE_NAME "host"
+ #endif
+ 
+-static void usage()
++static void usage(void)
+ {
+      fprintf(stderr, "Usage: server {-t|-u} [svc-debug] [misc-debug]\n");
+      exit(1);
+diff --git a/src/lib/rpc/xdr.c b/src/lib/rpc/xdr.c
+index 24c3de4bd9..49c31b3d1b 100644
+--- a/src/lib/rpc/xdr.c
++++ b/src/lib/rpc/xdr.c
+@@ -579,14 +579,14 @@ xdr_union(
+ 	 */
+ 	for (; choices->proc != NULL_xdrproc_t; choices++) {
+ 		if (choices->value == dscm)
+-			return ((*(choices->proc))(xdrs, unp, LASTUNSIGNED));
++			return choices->proc(xdrs, unp);
+ 	}
+ 
+ 	/*
+ 	 * no match - execute the default xdr routine if there is one
+ 	 */
+ 	return ((dfault == NULL_xdrproc_t) ? FALSE :
+-	    (*dfault)(xdrs, unp, LASTUNSIGNED));
++	    (*dfault)(xdrs, unp));
+ }
+ 
+ 
+diff --git a/src/lib/rpc/xdr_array.c b/src/lib/rpc/xdr_array.c
+index aeaa7f2bb0..3507d53aef 100644
+--- a/src/lib/rpc/xdr_array.c
++++ b/src/lib/rpc/xdr_array.c
+@@ -113,7 +113,7 @@ xdr_array(
+ 	 * now we xdr each element of array
+ 	 */
+ 	for (i = 0; (i < c) && stat; i++) {
+-		stat = (*elproc)(xdrs, target, LASTUNSIGNED);
++		stat = (*elproc)(xdrs, target);
+ 		target += elsize;
+ 	}
+ 
+@@ -150,7 +150,7 @@ xdr_vector(
+ 
+ 	elptr = basep;
+ 	for (i = 0; i < nelem; i++) {
+-		if (! (*xdr_elem)(xdrs, elptr, LASTUNSIGNED)) {
++		if (! (*xdr_elem)(xdrs, elptr)) {
+ 			return(FALSE);
+ 		}
+ 		elptr += elemsize;
+diff --git a/src/lib/rpc/xdr_rec.c b/src/lib/rpc/xdr_rec.c
+index 1f6a7762fd..185254018a 100644
+--- a/src/lib/rpc/xdr_rec.c
++++ b/src/lib/rpc/xdr_rec.c
+@@ -99,7 +99,7 @@ typedef struct rec_strm {
+ 	/*
+ 	 * out-goung bits
+ 	 */
+-	int (*writeit)();
++	int (*writeit)(caddr_t, caddr_t, int);
+ 	caddr_t out_base;	/* output buffer (points to frag header) */
+ 	caddr_t out_finger;	/* next output position */
+ 	caddr_t out_boundry;	/* data cannot up to this address */
+@@ -108,7 +108,7 @@ typedef struct rec_strm {
+ 	/*
+ 	 * in-coming bits
+ 	 */
+-	int (*readit)();
++	int (*readit)(caddr_t, caddr_t, int);
+ 	uint32_t in_size;	/* fixed size of the input buffer */
+ 	caddr_t in_base;
+ 	caddr_t in_finger;	/* location of next byte to be had */
+@@ -140,8 +140,10 @@ xdrrec_create(
+ 	u_int sendsize,
+ 	u_int recvsize,
+ 	caddr_t tcp_handle,
+-	int (*readit)(), /* like read, but pass it a tcp_handle, not sock */
+-	int (*writeit)() /* like write, but pass it a tcp_handle, not sock */
++	/* like read, but pass it a tcp_handle, not sock */
++	int (*readit)(caddr_t, caddr_t, int),
++	 /* like write, but pass it a tcp_handle, not sock */
++	int (*writeit)(caddr_t, caddr_t, int)
+ 	)
+ {
+ 	RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM));
+@@ -528,8 +530,7 @@ get_input_bytes(RECSTREAM *rstrm, caddr_t addr, int len)
+ }
+ 
+ static bool_t  /* next four bytes of input stream are treated as a header */
+-set_input_fragment(rstrm)
+-	RECSTREAM *rstrm;
++set_input_fragment(RECSTREAM *rstrm)
+ {
+ 	uint32_t header;
+ 
+diff --git a/src/lib/rpc/xdr_reference.c b/src/lib/rpc/xdr_reference.c
+index eff279dadf..f3d4b7dfb8 100644
+--- a/src/lib/rpc/xdr_reference.c
++++ b/src/lib/rpc/xdr_reference.c
+@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
+ #include <gssrpc/types.h>
+ #include <gssrpc/xdr.h>
+ 
+-#define LASTUNSIGNED	((u_int)0-1)
+-
+ /*
+  * XDR an indirect pointer
+  * xdr_reference is for recursively translating a structure that is
+@@ -88,7 +86,7 @@ xdr_reference(
+ 			break;
+ 	}
+ 
+-	stat = (*proc)(xdrs, loc, LASTUNSIGNED);
++	stat = (*proc)(xdrs, loc);
+ 
+ 	if (xdrs->x_op == XDR_FREE) {
+ 		mem_free(loc, size);
+diff --git a/src/lib/rpc/xdr_sizeof.c b/src/lib/rpc/xdr_sizeof.c
+index 5b77fa6ac0..0c460e7cdb 100644
+--- a/src/lib/rpc/xdr_sizeof.c
++++ b/src/lib/rpc/xdr_sizeof.c
+@@ -43,9 +43,7 @@
+ 
+ /* ARGSUSED */
+ static bool_t
+-x_putlong(xdrs, longp)
+-	XDR *xdrs;
+-	long *longp;
++x_putlong(XDR *xdrs, long *longp)
+ {
+ 	xdrs->x_handy += BYTES_PER_XDR_UNIT;
+ 	return (TRUE);
+@@ -53,10 +51,7 @@ x_putlong(xdrs, longp)
+ 
+ /* ARGSUSED */
+ static bool_t
+-x_putbytes(xdrs, bp, len)
+-	XDR *xdrs;
+-	char  *bp;
+-	int len;
++x_putbytes(XDR *xdrs, char *bp, u_int len)
+ {
+ 	xdrs->x_handy += len;
+ 
+@@ -64,26 +59,21 @@ x_putbytes(xdrs, bp, len)
+ }
+ 
+ static u_int
+-x_getpostn(xdrs)
+-	XDR *xdrs;
++x_getpostn(XDR *xdrs)
+ {
+ 	return (xdrs->x_handy);
+ }
+ 
+ /* ARGSUSED */
+ static bool_t
+-x_setpostn(xdrs, pos)
+-	XDR *xdrs;
+-	u_int pos;
++x_setpostn(XDR *xdrs, u_int pos)
+ {
+ 	/* This is not allowed */
+ 	return (FALSE);
+ }
+ 
+ static rpc_inline_t *
+-x_inline(xdrs, len)
+-	XDR *xdrs;
+-	int len;
++x_inline(XDR *xdrs, int len)
+ {
+ 	if (len == 0) {
+ 		return (NULL);
+@@ -110,15 +100,14 @@ x_inline(xdrs, len)
+ }
+ 
+ static int
+-harmless()
++harmless(void)
+ {
+ 	/* Always return FALSE/NULL, as the case may be */
+ 	return (0);
+ }
+ 
+ static void
+-x_destroy(xdrs)
+-	XDR *xdrs;
++x_destroy(XDR *xdrs)
+ {
+ 	xdrs->x_handy = 0;
+ 	xdrs->x_private = NULL;
+@@ -130,9 +119,7 @@ x_destroy(xdrs)
+ }
+ 
+ unsigned long
+-xdr_sizeof(func, data)
+-	xdrproc_t func;
+-	void *data;
++xdr_sizeof(xdrproc_t func, void *data)
+ {
+ 	XDR x;
+ 	struct xdr_ops ops;
+diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
+index 7cf8aa4d99..9b75f34a11 100644
+--- a/src/plugins/kdb/db2/db2_exp.c
++++ b/src/plugins/kdb/db2/db2_exp.c
+@@ -68,7 +68,7 @@ k5_mutex_t *krb5_db2_mutex;
+         return result;                                  \
+     }                                                   \
+     /* hack: decl to allow a following ";" */           \
+-    static TYPE wrap_##NAME ()
++    static TYPE wrap_##NAME ARGLIST
+ 
+ /* Two special cases: void (can't assign result), and krb5_error_code
+    (return error from locking code).  */
+@@ -81,7 +81,7 @@ k5_mutex_t *krb5_db2_mutex;
+         k5_mutex_unlock (krb5_db2_mutex);               \
+     }                                                   \
+     /* hack: decl to allow a following ";" */           \
+-    static void wrap_##NAME ()
++    static void wrap_##NAME ARGLIST
+ 
+ #define WRAP_K(NAME,ARGLIST,ARGNAMES)                   \
+     WRAP(NAME,krb5_error_code,ARGLIST,ARGNAMES)
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_close.c b/src/plugins/kdb/db2/libdb2/btree/bt_close.c
+index 11be134113..f12d74ba32 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_close.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_close.c
+@@ -61,8 +61,7 @@ static int bt_meta __P((BTREE *));
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__bt_close(dbp)
+-	DB *dbp;
++__bt_close(DB *dbp)
+ {
+ 	BTREE *t;
+ 	int fd;
+@@ -116,9 +115,7 @@ __bt_close(dbp)
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__bt_sync(dbp, flags)
+-	const DB *dbp;
+-	u_int flags;
++__bt_sync(const DB *dbp, u_int flags)
+ {
+ 	BTREE *t;
+ 	int status;
+@@ -160,8 +157,7 @@ __bt_sync(dbp, flags)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ static int
+-bt_meta(t)
+-	BTREE *t;
++bt_meta(BTREE *t)
+ {
+ 	BTMETA m;
+ 	void *p;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_conv.c b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
+index c0644ed713..99c4af56c0 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
+@@ -59,10 +59,7 @@ static void mswap __P((PAGE *));
+  *	h:	page to convert
+  */
+ void
+-__bt_pgin(t, pg, pp)
+-	void *t;
+-	db_pgno_t pg;
+-	void *pp;
++__bt_pgin(void *t, db_pgno_t pg, void *pp)
+ {
+ 	PAGE *h;
+ 	indx_t i, top;
+@@ -128,10 +125,7 @@ __bt_pgin(t, pg, pp)
+ }
+ 
+ void
+-__bt_pgout(t, pg, pp)
+-	void *t;
+-	db_pgno_t pg;
+-	void *pp;
++__bt_pgout(void *t, db_pgno_t pg, void *pp)
+ {
+ 	PAGE *h;
+ 	indx_t i, top;
+@@ -203,8 +197,7 @@ __bt_pgout(t, pg, pp)
+  *	p:	page to convert
+  */
+ static void
+-mswap(pg)
+-	PAGE *pg;
++mswap(PAGE *pg)
+ {
+ 	char *p;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_delete.c b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
+index 28cc24d15a..f8dd59e85a 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
+@@ -59,10 +59,7 @@ static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *));
+  * Return RET_SPECIAL if the key is not found.
+  */
+ int
+-__bt_delete(dbp, key, flags)
+-	const DB *dbp;
+-	const DBT *key;
+-	u_int flags;
++__bt_delete(const DB *dbp, const DBT *key, u_int flags)
+ {
+ 	BTREE *t;
+ 	CURSOR *c;
+@@ -140,10 +137,7 @@ __bt_delete(dbp, key, flags)
+  *	0 on success, 1 on failure
+  */
+ static int
+-__bt_stkacq(t, hp, c)
+-	BTREE *t;
+-	PAGE **hp;
+-	CURSOR *c;
++__bt_stkacq(BTREE *t, PAGE **hp, CURSOR *c)
+ {
+ 	BINTERNAL *bi;
+ 	EPG *e;
+@@ -288,9 +282,7 @@ ret:	mpool_put(t->bt_mp, h, 0);
+  *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ static int
+-__bt_bdelete(t, key)
+-	BTREE *t;
+-	const DBT *key;
++__bt_bdelete(BTREE *t, const DBT *key)
+ {
+ 	EPG *e;
+ 	PAGE *h;
+@@ -375,9 +367,7 @@ loop:	if ((e = __bt_search(t, key, &exact)) == NULL)
+  *	mpool_put's the page
+  */
+ static int
+-__bt_pdelete(t, h)
+-	BTREE *t;
+-	PAGE *h;
++__bt_pdelete(BTREE *t, PAGE *h)
+ {
+ 	BINTERNAL *bi;
+ 	PAGE *pg;
+@@ -471,11 +461,7 @@ __bt_pdelete(t, h)
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__bt_dleaf(t, key, h, idx)
+-	BTREE *t;
+-	const DBT *key;
+-	PAGE *h;
+-	u_int idx;
++__bt_dleaf(BTREE *t, const DBT *key, PAGE *h, u_int idx)
+ {
+ 	BLEAF *bl;
+ 	indx_t cnt, *ip, offset;
+@@ -536,11 +522,7 @@ __bt_dleaf(t, key, h, idx)
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ static int
+-__bt_curdel(t, key, h, idx)
+-	BTREE *t;
+-	const DBT *key;
+-	PAGE *h;
+-	u_int idx;
++__bt_curdel(BTREE *t, const DBT *key, PAGE *h, u_int idx)
+ {
+ 	CURSOR *c;
+ 	EPG e;
+@@ -635,9 +617,7 @@ dup2:				c->pg.pgno = e.page->pgno;
+  *	h:	page to be deleted
+  */
+ int
+-__bt_relink(t, h)
+-	BTREE *t;
+-	PAGE *h;
++__bt_relink(BTREE *t, PAGE *h)
+ {
+ 	PAGE *pg;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_get.c b/src/plugins/kdb/db2/libdb2/btree/bt_get.c
+index b6318211a1..012a341b25 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_get.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_get.c
+@@ -60,11 +60,7 @@ static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
+  *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ int
+-__bt_get(dbp, key, data, flags)
+-	const DB *dbp;
+-	const DBT *key;
+-	DBT *data;
+-	u_int flags;
++__bt_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
+ {
+ 	BTREE *t;
+ 	EPG *e;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+index d5809a5a93..a2910422eb 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+@@ -90,10 +90,8 @@ static int tmp __P((void));
+  *
+  */
+ DB *
+-__bt_open(fname, flags, mode, openinfo, dflags)
+-	const char *fname;
+-	int flags, mode, dflags;
+-	const BTREEINFO *openinfo;
++__bt_open(const char *fname, int flags, int mode, const BTREEINFO *openinfo,
++	  int dflags)
+ {
+ 	struct stat sb;
+ 	BTMETA m;
+@@ -353,8 +351,7 @@ err:	if (t) {
+  *	RET_ERROR, RET_SUCCESS
+  */
+ static int
+-nroot(t)
+-	BTREE *t;
++nroot(BTREE *t)
+ {
+ 	PAGE *meta, *root;
+ 	db_pgno_t npg;
+@@ -459,8 +456,7 @@ byteorder()
+ }
+ 
+ int
+-__bt_fd(dbp)
+-        const DB *dbp;
++__bt_fd(const DB *dbp)
+ {
+ 	BTREE *t;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
+index 8b1f597912..8301b5d19d 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
+@@ -77,12 +77,7 @@ static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__ovfl_get(t, p, ssz, buf, bufsz)
+-	BTREE *t;
+-	void *p;
+-	size_t *ssz;
+-	void **buf;
+-	size_t *bufsz;
++__ovfl_get(BTREE *t, void *p, size_t *ssz, void **buf, size_t *bufsz)
+ {
+ 	PAGE *h;
+ 	db_pgno_t pg;
+@@ -136,10 +131,7 @@ __ovfl_get(t, p, ssz, buf, bufsz)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__ovfl_put(t, dbt, pg)
+-	BTREE *t;
+-	const DBT *dbt;
+-	db_pgno_t *pg;
++__ovfl_put(BTREE *t, const DBT *dbt, db_pgno_t *pg)
+ {
+ 	PAGE *h, *last;
+ 	void *p;
+@@ -190,9 +182,7 @@ __ovfl_put(t, dbt, pg)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__ovfl_delete(t, p)
+-	BTREE *t;
+-	void *p;
++__ovfl_delete(BTREE *t, void *p)
+ {
+ 	PAGE *h;
+ 	db_pgno_t pg;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_page.c b/src/plugins/kdb/db2/libdb2/btree/bt_page.c
+index 3663cf7f93..38aa39acfb 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_page.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_page.c
+@@ -57,9 +57,7 @@ static char sccsid[] = "@(#)bt_page.c	8.4 (Berkeley) 11/2/95";
+  *	mpool_put's the page.
+  */
+ int
+-__bt_free(t, h)
+-	BTREE *t;
+-	PAGE *h;
++__bt_free(BTREE *t, PAGE *h)
+ {
+ 	/* Insert the page at the head of the free list. */
+ 	h->prevpg = P_INVALID;
+@@ -83,9 +81,7 @@ __bt_free(t, h)
+  *	Pointer to a page, NULL on error.
+  */
+ PAGE *
+-__bt_new(t, npg)
+-	BTREE *t;
+-	db_pgno_t *npg;
++__bt_new(BTREE *t, db_pgno_t *npg)
+ {
+ 	PAGE *h;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_put.c b/src/plugins/kdb/db2/libdb2/btree/bt_put.c
+index 7d6592841a..1303c0baef 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_put.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_put.c
+@@ -64,11 +64,7 @@ static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
+  *	tree and R_NOOVERWRITE specified.
+  */
+ int
+-__bt_put(dbp, key, data, flags)
+-	const DB *dbp;
+-	DBT *key;
+-	const DBT *data;
+-	u_int flags;
++__bt_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
+ {
+ 	BTREE *t;
+ 	DBT tkey, tdata;
+@@ -272,10 +268,7 @@ u_long bt_cache_hit, bt_cache_miss;
+  * 	EPG for new record or NULL if not found.
+  */
+ static EPG *
+-bt_fast(t, key, data, exactp)
+-	BTREE *t;
+-	const DBT *key, *data;
+-	int *exactp;
++bt_fast(BTREE *t, const DBT *key, const DBT *data, int *exactp)
+ {
+ 	PAGE *h;
+ 	u_int32_t nbytes;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_search.c b/src/plugins/kdb/db2/libdb2/btree/bt_search.c
+index c633d14dc6..ed512ccb65 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_search.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_search.c
+@@ -63,10 +63,7 @@ static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *));
+  *	the bt_cur field of the tree.  A pointer to the field is returned.
+  */
+ EPG *
+-__bt_search(t, key, exactp)
+-	BTREE *t;
+-	const DBT *key;
+-	int *exactp;
++__bt_search(BTREE *t, const DBT *key, int *exactp)
+ {
+ 	PAGE *h;
+ 	indx_t base, idx, lim;
+@@ -148,11 +145,7 @@ next:		BT_PUSH(t, h->pgno, idx);
+  *	If an exact match found.
+  */
+ static int
+-__bt_snext(t, h, key, exactp)
+-	BTREE *t;
+-	PAGE *h;
+-	const DBT *key;
+-	int *exactp;
++__bt_snext(BTREE *t, PAGE *h, const DBT *key, int *exactp)
+ {
+ 	BINTERNAL *bi;
+ 	EPG e;
+@@ -228,11 +221,7 @@ __bt_snext(t, h, key, exactp)
+  *	If an exact match found.
+  */
+ static int
+-__bt_sprev(t, h, key, exactp)
+-	BTREE *t;
+-	PAGE *h;
+-	const DBT *key;
+-	int *exactp;
++__bt_sprev(BTREE *t, PAGE *h, const DBT *key, int *exactp)
+ {
+ 	BINTERNAL *bi;
+ 	EPG e;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_seq.c b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
+index 2c8c2de96c..97db44abc8 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
+@@ -102,10 +102,7 @@ static int bt_rseq_prev(BTREE *, EPG *);
+  *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ int
+-__bt_seq(dbp, key, data, flags)
+-	const DB *dbp;
+-	DBT *key, *data;
+-	u_int flags;
++__bt_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
+ {
+ 	BTREE *t;
+ 	EPG e;
+@@ -179,11 +176,7 @@ __bt_seq(dbp, key, data, flags)
+  *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ static int
+-__bt_seqset(t, ep, key, flags)
+-	BTREE *t;
+-	EPG *ep;
+-	DBT *key;
+-	int flags;
++__bt_seqset(BTREE *t, EPG *ep, DBT *key, int flags)
+ {
+ 	PAGE *h;
+ 	db_pgno_t pg;
+@@ -273,10 +266,7 @@ __bt_seqset(t, ep, key, flags)
+  *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ static int
+-__bt_seqadv(t, ep, flags)
+-	BTREE *t;
+-	EPG *ep;
+-	int flags;
++__bt_seqadv(BTREE *t, EPG *ep, int flags)
+ {
+ 	CURSOR *c;
+ 	PAGE *h;
+@@ -495,11 +485,7 @@ bt_rseq_prev(BTREE *t, EPG *ep)
+  *	or RET_SPECIAL if no such key exists.
+  */
+ static int
+-__bt_first(t, key, erval, exactp)
+-	BTREE *t;
+-	const DBT *key;
+-	EPG *erval;
+-	int *exactp;
++__bt_first(BTREE *t, const DBT *key, EPG *erval, int *exactp)
+ {
+ 	PAGE *h, *hprev;
+ 	EPG *ep, save;
+@@ -596,10 +582,7 @@ __bt_first(t, key, erval, exactp)
+  *  index:	page index
+  */
+ void
+-__bt_setcur(t, pgno, idx)
+-	BTREE *t;
+-	db_pgno_t pgno;
+-	u_int idx;
++__bt_setcur(BTREE *t, db_pgno_t pgno, u_int idx)
+ {
+ 	/* Lose any already deleted key. */
+ 	if (t->bt_cursor.key.data != NULL) {
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_split.c b/src/plugins/kdb/db2/libdb2/btree/bt_split.c
+index c7e4e72a90..8901bd64be 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_split.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_split.c
+@@ -79,13 +79,8 @@ u_long	bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__bt_split(t, sp, key, data, flags, ilen, argskip)
+-	BTREE *t;
+-	PAGE *sp;
+-	const DBT *key, *data;
+-	int flags;
+-	size_t ilen;
+-	u_int32_t argskip;
++__bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags,
++	   size_t ilen, u_int32_t argskip)
+ {
+ 	BINTERNAL *bi = NULL;
+ 	BLEAF *bl = NULL, *tbl;
+@@ -345,11 +340,7 @@ err2:	mpool_put(t->bt_mp, l, 0);
+  *	Pointer to page in which to insert or NULL on error.
+  */
+ static PAGE *
+-bt_page(t, h, lp, rp, skip, ilen)
+-	BTREE *t;
+-	PAGE *h, **lp, **rp;
+-	indx_t *skip;
+-	size_t ilen;
++bt_page(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
+ {
+ 	PAGE *l, *r, *tp;
+ 	db_pgno_t npg;
+@@ -450,11 +441,7 @@ bt_page(t, h, lp, rp, skip, ilen)
+  *	Pointer to page in which to insert or NULL on error.
+  */
+ static PAGE *
+-bt_root(t, h, lp, rp, skip, ilen)
+-	BTREE *t;
+-	PAGE *h, **lp, **rp;
+-	indx_t *skip;
+-	size_t ilen;
++bt_root(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
+ {
+ 	PAGE *l, *r, *tp;
+ 	db_pgno_t lnpg, rnpg;
+@@ -497,9 +484,7 @@ bt_root(t, h, lp, rp, skip, ilen)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ static int
+-bt_rroot(t, h, l, r)
+-	BTREE *t;
+-	PAGE *h, *l, *r;
++bt_rroot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
+ {
+ 	char *dest;
+ 
+@@ -537,9 +522,7 @@ bt_rroot(t, h, l, r)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ static int
+-bt_broot(t, h, l, r)
+-	BTREE *t;
+-	PAGE *h, *l, *r;
++bt_broot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
+ {
+ 	BINTERNAL *bi;
+ 	BLEAF *bl;
+@@ -617,11 +600,7 @@ bt_broot(t, h, l, r)
+  *	Pointer to page in which to insert.
+  */
+ static PAGE *
+-bt_psplit(t, h, l, r, pskip, ilen)
+-	BTREE *t;
+-	PAGE *h, *l, *r;
+-	indx_t *pskip;
+-	size_t ilen;
++bt_psplit(BTREE *t, PAGE *h, PAGE *l, PAGE *r, indx_t *pskip, size_t ilen)
+ {
+ 	BINTERNAL *bi;
+ 	BLEAF *bl;
+@@ -796,9 +775,7 @@ bt_psplit(t, h, l, r, pskip, ilen)
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ static int
+-bt_preserve(t, pg)
+-	BTREE *t;
+-	db_pgno_t pg;
++bt_preserve(BTREE *t, db_pgno_t pg)
+ {
+ 	PAGE *h;
+ 
+@@ -824,8 +801,7 @@ bt_preserve(t, pg)
+  * all the way back to bt_split/bt_rroot and it's not very clean.
+  */
+ static recno_t
+-rec_total(h)
+-	PAGE *h;
++rec_total(PAGE *h)
+ {
+ 	recno_t recs;
+ 	indx_t nxt, top;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_utils.c b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
+index be2f24f219..13d1f2c84f 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
+@@ -64,11 +64,8 @@ static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__bt_ret(t, e, key, rkey, data, rdata, copy)
+-	BTREE *t;
+-	EPG *e;
+-	DBT *key, *rkey, *data, *rdata;
+-	int copy;
++__bt_ret(BTREE *t, EPG *e, DBT *key, DBT *rkey, DBT *data, DBT *rdata,
++	 int copy)
+ {
+ 	BLEAF *bl;
+ 	void *p;
+@@ -150,10 +147,7 @@ dataonly:
+  *	> 0 if k1 is > record
+  */
+ int
+-__bt_cmp(t, k1, e)
+-	BTREE *t;
+-	const DBT *k1;
+-	EPG *e;
++__bt_cmp(BTREE *t, const DBT *k1, EPG *e)
+ {
+ 	BINTERNAL *bi;
+ 	BLEAF *bl;
+@@ -213,8 +207,7 @@ __bt_cmp(t, k1, e)
+  *	> 0 if a is > b
+  */
+ int
+-__bt_defcmp(a, b)
+-	const DBT *a, *b;
++__bt_defcmp(const DBT *a, const DBT *b)
+ {
+ 	size_t len;
+ 	u_char *p1, *p2;
+@@ -243,8 +236,7 @@ __bt_defcmp(a, b)
+  *	Number of bytes needed to distinguish b from a.
+  */
+ size_t
+-__bt_defpfx(a, b)
+-	const DBT *a, *b;
++__bt_defpfx(const DBT *a, const DBT *b)
+ {
+ 	u_char *p1, *p2;
+ 	size_t cnt, len;
+diff --git a/src/plugins/kdb/db2/libdb2/db/db.c b/src/plugins/kdb/db2/libdb2/db/db.c
+index fba7795342..f85484f077 100644
+--- a/src/plugins/kdb/db2/libdb2/db/db.c
++++ b/src/plugins/kdb/db2/libdb2/db/db.c
+@@ -45,11 +45,8 @@ static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
+ #include "db-int.h"
+ 
+ DB *
+-kdb2_dbopen(fname, flags, mode, type, openinfo)
+-	const char *fname;
+-	int flags, mode;
+-	DBTYPE type;
+-	const void *openinfo;
++kdb2_dbopen(const char *fname, int flags, int mode, DBTYPE type,
++	    const void *openinfo)
+ {
+ 
+ #define	DB_FLAGS	(DB_LOCK | DB_SHMEM | DB_TXN)
+@@ -74,7 +71,7 @@ kdb2_dbopen(fname, flags, mode, type, openinfo)
+ }
+ 
+ static int
+-__dberr()
++__dberr(void)
+ {
+ 	return (RET_ERROR);
+ }
+@@ -86,14 +83,15 @@ __dberr()
+  *	dbp:	pointer to the DB structure.
+  */
+ void
+-__dbpanic(dbp)
+-	DB *dbp;
++__dbpanic(DB *dbp)
+ {
+ 	/* The only thing that can succeed is a close. */
+-	dbp->del = (int (*)())__dberr;
+-	dbp->fd = (int (*)())__dberr;
+-	dbp->get = (int (*)())__dberr;
+-	dbp->put = (int (*)())__dberr;
+-	dbp->seq = (int (*)())__dberr;
+-	dbp->sync = (int (*)())__dberr;
++	dbp->del = (int (*)(const struct __db *, const DBT *, u_int))__dberr;
++	dbp->fd = (int (*)(const struct __db *))__dberr;
++	dbp->get = (int (*)(const struct __db *, const DBT *, DBT *,
++			    u_int))__dberr;
++	dbp->put = (int (*)(const struct __db *, DBT *, const DBT *,
++			    u_int))__dberr;
++	dbp->seq = (int (*)(const struct __db *, DBT *, DBT *, u_int))__dberr;
++	dbp->sync = (int (*)(const struct __db *, u_int))__dberr;
+ }
+diff --git a/src/plugins/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+index 4878cbc0b6..2dca256dc3 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/dbm.c
++++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+@@ -69,8 +69,7 @@ static DBM *__cur_db;
+ static void no_open_db __P((void));
+ 
+ int
+-kdb2_dbminit(file)
+-	char *file;
++kdb2_dbminit(char *file)
+ {
+ 	if (__cur_db != NULL)
+ 		(void)kdb2_dbm_close(__cur_db);
+@@ -82,8 +81,7 @@ kdb2_dbminit(file)
+ }
+ 
+ datum
+-kdb2_fetch(key)
+-	datum key;
++kdb2_fetch(datum key)
+ {
+ 	datum item;
+ 
+@@ -111,8 +109,7 @@ kdb2_firstkey()
+ }
+ 
+ datum
+-kdb2_nextkey(key)
+-	datum key;
++kdb2_nextkey(datum key)
+ {
+ 	datum item;
+ 
+@@ -126,8 +123,7 @@ kdb2_nextkey(key)
+ }
+ 
+ int
+-kdb2_delete(key)
+-	datum key;
++kdb2_delete(datum key)
+ {
+ 	if (__cur_db == NULL) {
+ 		no_open_db();
+@@ -137,8 +133,7 @@ kdb2_delete(key)
+ }
+ 
+ int
+-kdb2_store(key, dat)
+-	datum key, dat;
++kdb2_store(datum key, datum dat)
+ {
+ 	if (__cur_db == NULL) {
+ 		no_open_db();
+@@ -159,9 +154,7 @@ no_open_db()
+  *	 NULL on failure
+  */
+ DBM *
+-kdb2_dbm_open(file, flags, mode)
+-	const char *file;
+-	int flags, mode;
++kdb2_dbm_open(const char *file, int flags, int mode)
+ {
+ 	HASHINFO info;
+ 	char path[MAXPATHLEN];
+@@ -183,8 +176,7 @@ kdb2_dbm_open(file, flags, mode)
+  *	Nothing.
+  */
+ void
+-kdb2_dbm_close(db)
+-	DBM *db;
++kdb2_dbm_close(DBM *db)
+ {
+ 	(void)(db->close)(db);
+ }
+@@ -195,9 +187,7 @@ kdb2_dbm_close(db)
+  *	NULL on failure
+  */
+ datum
+-kdb2_dbm_fetch(db, key)
+-	DBM *db;
+-	datum key;
++kdb2_dbm_fetch(DBM *db, datum key)
+ {
+ 	datum retval;
+ 	int status;
+@@ -226,8 +216,7 @@ kdb2_dbm_fetch(db, key)
+  *	NULL on failure
+  */
+ datum
+-kdb2_dbm_firstkey(db)
+-	DBM *db;
++kdb2_dbm_firstkey(DBM *db)
+ {
+ 	int status;
+ 	datum retkey;
+@@ -254,8 +243,7 @@ kdb2_dbm_firstkey(db)
+  *	NULL on failure
+  */
+ datum
+-kdb2_dbm_nextkey(db)
+-	DBM *db;
++kdb2_dbm_nextkey(DBM *db)
+ {
+ 	int status;
+ 	datum retkey;
+@@ -282,9 +270,7 @@ kdb2_dbm_nextkey(db)
+  *	<0 failure
+  */
+ int
+-kdb2_dbm_delete(db, key)
+-	DBM *db;
+-	datum key;
++kdb2_dbm_delete(DBM *db, datum key)
+ {
+ 	int status;
+ 
+@@ -310,10 +296,7 @@ kdb2_dbm_delete(db, key)
+  *	 1 if DBM_INSERT and entry exists
+  */
+ int
+-kdb2_dbm_store(db, key, content, flags)
+-	DBM *db;
+-	datum key, content;
+-	int flags;
++kdb2_dbm_store(DBM *db, datum key, datum content, int flags)
+ {
+ #ifdef NEED_COPY
+ 	DBT k, c;
+@@ -331,8 +314,7 @@ kdb2_dbm_store(db, key, content, flags)
+ }
+ 
+ int
+-kdb2_dbm_error(db)
+-	DBM *db;
++kdb2_dbm_error(DBM *db)
+ {
+ 	HTAB *hp;
+ 
+@@ -341,8 +323,7 @@ kdb2_dbm_error(db)
+ }
+ 
+ int
+-kdb2_dbm_clearerr(db)
+-	DBM *db;
++kdb2_dbm_clearerr(DBM *db)
+ {
+ 	HTAB *hp;
+ 
+@@ -352,8 +333,7 @@ kdb2_dbm_clearerr(db)
+ }
+ 
+ int
+-kdb2_dbm_dirfno(db)
+-	DBM *db;
++kdb2_dbm_dirfno(DBM *db)
+ {
+ 	return(((HTAB *)db->internal)->fp);
+ }
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash.c b/src/plugins/kdb/db2/libdb2/hash/hash.c
+index 686a960c96..9528b62538 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash.c
+@@ -95,10 +95,8 @@ u_int32_t hash_accesses, hash_collisions, hash_expansions, hash_overflows,
+ /* OPEN/CLOSE */
+ 
+ extern DB *
+-__kdb2_hash_open(file, flags, mode, info, dflags)
+-	const char *file;
+-	int flags, mode, dflags;
+-	const HASHINFO *info;	/* Special directives for create */
++__kdb2_hash_open(const char *file, int flags, int mode, const HASHINFO *info,
++		 int dflags)
+ {
+ 	struct stat statbuf;
+ 	DB *dbp;
+@@ -261,8 +259,7 @@ error0:
+ }
+ 
+ static int32_t
+-hash_close(dbp)
+-	DB *dbp;
++hash_close(DB *dbp)
+ {
+ 	HTAB *hashp;
+ 	int32_t retval;
+@@ -277,8 +274,7 @@ hash_close(dbp)
+ }
+ 
+ static int32_t
+-hash_fd(dbp)
+-	const DB *dbp;
++hash_fd(const DB *dbp)
+ {
+ 	HTAB *hashp;
+ 
+@@ -295,10 +291,7 @@ hash_fd(dbp)
+ 
+ /************************** LOCAL CREATION ROUTINES **********************/
+ static HTAB *
+-init_hash(hashp, file, info)
+-	HTAB *hashp;
+-	const char *file;
+-	const HASHINFO *info;
++init_hash(HTAB *hashp, const char *file, const HASHINFO *info)
+ {
+ 	struct stat statbuf;
+ 
+@@ -350,9 +343,7 @@ init_hash(hashp, file, info)
+  * Returns 0 on No Error
+  */
+ static int32_t
+-init_htab(hashp, nelem)
+-	HTAB *hashp;
+-	int32_t nelem;
++init_htab(HTAB *hashp, int32_t nelem)
+ {
+ 	int32_t l2, nbuckets;
+ 
+@@ -404,9 +395,7 @@ init_htab(hashp, nelem)
+  * Functions to get/put hash header.  We access the file directly.
+  */
+ static u_int32_t
+-hget_header(hashp, page_size)
+-	HTAB *hashp;
+-	u_int32_t page_size;
++hget_header(HTAB *hashp, u_int32_t page_size)
+ {
+ 	u_int32_t num_copied;
+ 	u_int8_t *hdr_dest;
+@@ -432,8 +421,7 @@ hget_header(hashp, page_size)
+ }
+ 
+ static void
+-hput_header(hashp)
+-	HTAB *hashp;
++hput_header(HTAB *hashp)
+ {
+ 	HASHHDR *whdrp;
+ #if DB_BYTE_ORDER == DB_LITTLE_ENDIAN
+@@ -463,8 +451,7 @@ hput_header(hashp)
+  * structure, freeing all allocated space.
+  */
+ static int32_t
+-hdestroy(hashp)
+-	HTAB *hashp;
++hdestroy(HTAB *hashp)
+ {
+ 	int32_t save_errno;
+ 
+@@ -550,9 +537,7 @@ hdestroy(hashp)
+  *	-1 ERROR
+  */
+ static int32_t
+-hash_sync(dbp, flags)
+-	const DB *dbp;
+-	u_int32_t flags;
++hash_sync(const DB *dbp, u_int32_t flags)
+ {
+ 	HTAB *hashp;
+ 
+@@ -571,8 +556,7 @@ hash_sync(dbp, flags)
+  *	-1 indicates that errno should be set
+  */
+ static int32_t
+-flush_meta(hashp)
+-	HTAB *hashp;
++flush_meta(HTAB *hashp)
+ {
+ 	int32_t i;
+ 
+@@ -608,11 +592,7 @@ flush_meta(hashp)
+ /* *** make sure this is true! */
+ 
+ static int32_t
+-hash_get(dbp, key, data, flag)
+-	const DB *dbp;
+-	const DBT *key;
+-	DBT *data;
+-	u_int32_t flag;
++hash_get(const DB *dbp, const DBT *key, DBT *data, u_int32_t flag)
+ {
+ 	HTAB *hashp;
+ 
+@@ -625,11 +605,7 @@ hash_get(dbp, key, data, flag)
+ }
+ 
+ static int32_t
+-hash_put(dbp, key, data, flag)
+-	const DB *dbp;
+-	DBT *key;
+-	const DBT *data;
+-	u_int32_t flag;
++hash_put(const DB *dbp, DBT *key, const DBT *data, u_int32_t flag)
+ {
+ 	HTAB *hashp;
+ 
+@@ -647,10 +623,7 @@ hash_put(dbp, key, data, flag)
+ }
+ 
+ static int32_t
+-hash_delete(dbp, key, flag)
+-	const DB *dbp;
+-	const DBT *key;
+-	u_int32_t flag;		/* Ignored */
++hash_delete(const DB *dbp, const DBT *key, u_int32_t flag)
+ {
+ 	HTAB *hashp;
+ 
+@@ -671,11 +644,7 @@ hash_delete(dbp, key, flag)
+  * Assume that hashp has been set in wrapper routine.
+  */
+ static int32_t
+-hash_access(hashp, action, key, val)
+-	HTAB *hashp;
+-	ACTION action;
+-	const DBT *key;
+-	DBT *val;
++hash_access(HTAB *hashp, ACTION action, const DBT *key, DBT *val)
+ {
+ 	DBT page_key, page_val;
+ 	CURSOR cursor;
+@@ -792,8 +761,7 @@ found:	__get_item_done(hashp, &cursor);
+ 
+ /* ****************** CURSORS ********************************** */
+ CURSOR *
+-__cursor_creat(dbp)
+-	const DB *dbp;
++__cursor_creat(const DB *dbp)
+ {
+ 	CURSOR *new_curs;
+ 	HTAB *hashp;
+@@ -824,11 +792,7 @@ __cursor_creat(dbp)
+ }
+ 
+ static int32_t
+-cursor_get(dbp, cursorp, key, val, flags)
+-	const DB *dbp;
+-	CURSOR *cursorp;
+-	DBT *key, *val;
+-	u_int32_t flags;
++cursor_get(const DB *dbp, CURSOR *cursorp, DBT *key, DBT *val, u_int32_t flags)
+ {
+ 	HTAB *hashp;
+ 	ITEM_INFO item_info;
+@@ -897,10 +861,7 @@ cursor_get(dbp, cursorp, key, val, flags)
+ }
+ 
+ static int32_t
+-cursor_delete(dbp, cursor, flags)
+-	const DB *dbp;
+-	CURSOR *cursor;
+-	u_int32_t flags;
++cursor_delete(const DB *dbp, CURSOR *cursor, u_int32_t flags)
+ {
+ 	/* XXX this is empirically determined, so it might not be completely
+ 	   correct, but it seems to work.  At the very least it fixes
+@@ -913,10 +874,7 @@ cursor_delete(dbp, cursor, flags)
+ }
+ 
+ static int32_t
+-hash_seq(dbp, key, val, flag)
+-	const DB *dbp;
+-	DBT *key, *val;
+-	u_int32_t flag;
++hash_seq(const DB *dbp, DBT *key, DBT *val, u_int32_t flag)
+ {
+ 	HTAB *hashp;
+ 
+@@ -940,8 +898,7 @@ hash_seq(dbp, key, val, flag)
+  *	-1 ==> Error
+  */
+ int32_t
+-__expand_table(hashp)
+-	HTAB *hashp;
++__expand_table(HTAB *hashp)
+ {
+ 	u_int32_t old_bucket, new_bucket;
+ 	int32_t spare_ndx;
+@@ -980,10 +937,7 @@ __expand_table(hashp)
+ }
+ 
+ u_int32_t
+-__call_hash(hashp, k, len)
+-	HTAB *hashp;
+-	int8_t *k;
+-	int32_t len;
++__call_hash(HTAB *hashp, int8_t *k, int32_t len)
+ {
+ 	u_int32_t n, bucket;
+ 
+@@ -999,8 +953,7 @@ __call_hash(hashp, k, len)
+  * Hashp->hdr needs to be byteswapped.
+  */
+ static void
+-swap_header_copy(srcp, destp)
+-	HASHHDR *srcp, *destp;
++swap_header_copy(HASHHDR *srcp, HASHHDR *destp)
+ {
+ 	int32_t i;
+ 
+@@ -1025,8 +978,7 @@ swap_header_copy(srcp, destp)
+ }
+ 
+ static void
+-swap_header(hashp)
+-	HTAB *hashp;
++swap_header(HTAB *hashp)
+ {
+ 	HASHHDR *hdrp;
+ 	int32_t i;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
+index 4b95278f53..6befb7a57e 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
+@@ -83,10 +83,7 @@ static int32_t collect_data __P((HTAB *, PAGE16 *, int32_t));
+  *	-1 ==> ERROR
+  */
+ int32_t
+-__big_insert(hashp, pagep, key, val)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
+-	const DBT *key, *val;
++__big_insert(HTAB *hashp, PAGE16 *pagep, const DBT *key, const DBT *val)
+ {
+ 	size_t  key_size, val_size;
+ 	indx_t  key_move_bytes, val_move_bytes;
+@@ -185,11 +182,7 @@ __big_delete(hashp, pagep, ndx)
+  *	-1 error
+  */
+ int32_t
+-__find_bigpair(hashp, cursorp, key, size)
+-	HTAB *hashp;
+-	CURSOR *cursorp;
+-	int8_t *key;
+-	int32_t size;
++__find_bigpair(HTAB *hashp, CURSOR *cursorp, int8_t *key, int32_t size)
+ {
+ 	PAGE16 *pagep, *hold_pagep;
+ 	db_pgno_t  next_pgno;
+@@ -257,11 +250,7 @@ __find_bigpair(hashp, cursorp, key, size)
+  * Fill in the key and data for this big pair.
+  */
+ int32_t
+-__big_keydata(hashp, pagep, key, val, ndx)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
+-	DBT *key, *val;
+-	int32_t ndx;
++__big_keydata(HTAB *hashp, PAGE16 *pagep, DBT *key, DBT *val, int32_t ndx)
+ {
+ 	ITEM_INFO ii;
+ 	PAGE16 *key_pagep;
+@@ -315,11 +304,8 @@ __get_bigkey(hashp, pagep, ndx, key)
+  * Return the big key and data indicated in item_info.
+  */
+ int32_t
+-__big_return(hashp, item_info, val, on_bigkey_page)
+-	HTAB *hashp;
+-	ITEM_INFO *item_info;
+-	DBT *val;
+-	int32_t on_bigkey_page;
++__big_return(HTAB *hashp, ITEM_INFO *item_info, DBT *val,
++	     int32_t on_bigkey_page)
+ {
+ 	PAGE16 *pagep;
+ 	db_pgno_t next_pgno;
+@@ -366,11 +352,7 @@ __big_return(hashp, item_info, val, on_bigkey_page)
+  * Return total length of data; -1 if error.
+  */
+ static int32_t
+-collect_key(hashp, pagep, len, last_page)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
+-	int32_t len;
+-	db_pgno_t *last_page;
++collect_key(HTAB *hashp, PAGE16 *pagep, int32_t len, db_pgno_t *last_page)
+ {
+ 	PAGE16 *next_pagep;
+ 	int32_t totlen, retval;
+@@ -434,10 +416,7 @@ collect_key(hashp, pagep, len, last_page)
+  * Return total length of data; -1 if error.
+  */
+ static int32_t
+-collect_data(hashp, pagep, len)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
+-	int32_t len;
++collect_data(HTAB *hashp, PAGE16 *pagep, int32_t len)
+ {
+ 	PAGE16 *next_pagep;
+ 	int32_t totlen, retval;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_func.c b/src/plugins/kdb/db2/libdb2/hash/hash_func.c
+index 1dee694608..f169be685e 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_func.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_func.c
+@@ -66,9 +66,7 @@ u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
+ 
+ #if 0
+ static u_int32_t
+-hash1(key, len)
+-	const void *key;
+-	size_t len;
++hash1(const void *key, size_t len)
+ {
+ 	u_int32_t h;
+ 	u_int8_t *k;
+@@ -88,9 +86,7 @@ hash1(key, len)
+ #define dcharhash(h, c)	((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
+ 
+ static u_int32_t
+-hash2(key, len)
+-	const void *key;
+-	size_t len;
++hash2(const void *key, size_t len)
+ {
+ 	u_int32_t h;
+ 	u_int8_t *e, c, *k;
+@@ -116,9 +112,7 @@ hash2(key, len)
+  * Ozan Yigit's original sdbm hash.
+  */
+ static u_int32_t
+-hash3(key, len)
+-	const void *key;
+-	size_t len;
++hash3(const void *key, size_t len)
+ {
+ 	u_int32_t n, loop;
+ 	u_int8_t *k;
+@@ -159,9 +153,7 @@ hash3(key, len)
+ 
+ /* Chris Torek's hash function. */
+ static u_int32_t
+-hash4(key, len)
+-	const void *key;
+-	size_t len;
++hash4(const void *key, size_t len)
+ {
+ 	u_int32_t h, loop;
+ 	const u_int8_t *k;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_log2.c b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
+index 8c710e5d21..7fdfd854d2 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
+@@ -44,8 +44,7 @@ static char sccsid[] = "@(#)hash_log2.c	8.4 (Berkeley) 11/7/95";
+ #include "extern.h"
+ 
+ u_int32_t
+-__kdb2_log2(num)
+-	u_int32_t num;
++__kdb2_log2(u_int32_t num)
+ {
+ 	u_int32_t i, limit;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_page.c b/src/plugins/kdb/db2/libdb2/hash/hash_page.c
+index 0da357108a..dba29e0cb5 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_page.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_page.c
+@@ -84,11 +84,8 @@ static void	 account_page(HTAB *, db_pgno_t, int);
+ #endif
+ 
+ u_int32_t
+-__get_item(hashp, cursorp, key, val, item_info)
+-	HTAB *hashp;
+-	CURSOR *cursorp;
+-	DBT *key, *val;
+-	ITEM_INFO *item_info;
++__get_item(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val,
++	   ITEM_INFO *item_info)
+ {
+ 	db_pgno_t next_pgno;
+ 	int32_t i;
+@@ -159,9 +156,7 @@ __get_item(hashp, cursorp, key, val, item_info)
+ }
+ 
+ u_int32_t
+-__get_item_reset(hashp, cursorp)
+-	HTAB *hashp;
+-	CURSOR *cursorp;
++__get_item_reset(HTAB *hashp, CURSOR *cursorp)
+ {
+ 	if (cursorp->pagep)
+ 		__put_page(hashp, cursorp->pagep, A_RAW, 0);
+@@ -174,9 +169,7 @@ __get_item_reset(hashp, cursorp)
+ }
+ 
+ u_int32_t
+-__get_item_done(hashp, cursorp)
+-	HTAB *hashp;
+-	CURSOR *cursorp;
++__get_item_done(HTAB *hashp, CURSOR *cursorp)
+ {
+ 	if (cursorp->pagep)
+ 		__put_page(hashp, cursorp->pagep, A_RAW, 0);
+@@ -190,11 +183,8 @@ __get_item_done(hashp, cursorp)
+ }
+ 
+ u_int32_t
+-__get_item_first(hashp, cursorp, key, val, item_info)
+-	HTAB *hashp;
+-	CURSOR *cursorp;
+-	DBT *key, *val;
+-	ITEM_INFO *item_info;
++__get_item_first(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val,
++		 ITEM_INFO *item_info)
+ {
+ 	__get_item_reset(hashp, cursorp);
+ 	cursorp->bucket = 0;
+@@ -206,11 +196,8 @@ __get_item_first(hashp, cursorp, key, val, item_info)
+  * just returns the page number and index of the bigkey pointer pair.
+  */
+ u_int32_t
+-__get_item_next(hashp, cursorp, key, val, item_info)
+-	HTAB *hashp;
+-	CURSOR *cursorp;
+-	DBT *key, *val;
+-	ITEM_INFO *item_info;
++__get_item_next(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val,
++		ITEM_INFO *item_info)
+ {
+ 	int status;
+ 
+@@ -224,9 +211,7 @@ __get_item_next(hashp, cursorp, key, val, item_info)
+  * Put a non-big pair on a page.
+  */
+ static void
+-putpair(p, key, val)
+-	PAGE8 *p;
+-	const DBT *key, *val;
++putpair(PAGE8 *p, const DBT *key, const DBT *val)
+ {
+ 	u_int16_t *pagep, n, off;
+ 
+@@ -275,10 +260,7 @@ prev_realkey(pagep, n)
+  *      -1 error
+  */
+ extern int32_t
+-__delpair(hashp, cursorp, item_info)
+-	HTAB *hashp;
+-	CURSOR *cursorp;
+-	ITEM_INFO *item_info;
++__delpair(HTAB *hashp, CURSOR *cursorp, ITEM_INFO *item_info)
+ {
+ 	PAGE16 *pagep;
+ 	indx_t ndx;
+@@ -412,9 +394,7 @@ __delpair(hashp, cursorp, item_info)
+ }
+ 
+ extern int32_t
+-__split_page(hashp, obucket, nbucket)
+-	HTAB *hashp;
+-	u_int32_t obucket, nbucket;
++__split_page(HTAB *hashp, u_int32_t obucket, u_int32_t nbucket)
+ {
+ 	DBT key, val;
+ 	ITEM_INFO old_ii, new_ii;
+@@ -661,9 +641,7 @@ add_bigptr(hashp, item_info, big_pgno)
+  *      NULL on error
+  */
+ extern PAGE16 *
+-__add_ovflpage(hashp, pagep)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
++__add_ovflpage(HTAB *hashp, PAGE16 *pagep)
+ {
+ 	PAGE16 *new_pagep;
+ 	u_int16_t ovfl_num;
+@@ -768,10 +746,7 @@ page_init(hashp, pagep, pgno, type)
+ }
+ 
+ int32_t
+-__new_page(hashp, addr, addr_type)
+-	HTAB *hashp;
+-	u_int32_t addr;
+-	int32_t addr_type;
++__new_page(HTAB *hashp, u_int32_t addr, int32_t addr_type)
+ {
+ 	db_pgno_t paddr;
+ 	PAGE16 *pagep;
+@@ -804,10 +779,7 @@ __new_page(hashp, addr, addr_type)
+ }
+ 
+ int32_t
+-__delete_page(hashp, pagep, page_type)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
+-	int32_t page_type;
++__delete_page(HTAB *hashp, PAGE16 *pagep, int32_t page_type)
+ {
+ 	if (page_type == A_OVFL)
+ 		__free_ovflpage(hashp, pagep);
+@@ -815,9 +787,7 @@ __delete_page(hashp, pagep, page_type)
+ }
+ 
+ static u_int8_t
+-is_bitmap_pgno(hashp, pgno)
+-	HTAB *hashp;
+-	db_pgno_t pgno;
++is_bitmap_pgno(HTAB *hashp, db_pgno_t pgno)
+ {
+ 	int32_t i;
+ 
+@@ -828,10 +798,7 @@ is_bitmap_pgno(hashp, pgno)
+ }
+ 
+ void
+-__pgin_routine(pg_cookie, pgno, page)
+-	void *pg_cookie;
+-	db_pgno_t pgno;
+-	void *page;
++__pgin_routine(void *pg_cookie, db_pgno_t pgno, void *page)
+ {
+ 	HTAB *hashp;
+ 	PAGE16 *pagep;
+@@ -868,10 +835,7 @@ __pgin_routine(pg_cookie, pgno, page)
+ }
+ 
+ void
+-__pgout_routine(pg_cookie, pgno, page)
+-	void *pg_cookie;
+-	db_pgno_t pgno;
+-	void *page;
++__pgout_routine(void *pg_cookie, db_pgno_t pgno, void *page)
+ {
+ 	HTAB *hashp;
+ 	PAGE16 *pagep;
+@@ -905,10 +869,7 @@ __pgout_routine(pg_cookie, pgno, page)
+  *      -1 ==>failure
+  */
+ extern int32_t
+-__put_page(hashp, pagep, addr_type, is_dirty)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
+-	int32_t addr_type, is_dirty;
++__put_page(HTAB *hashp, PAGE16 *pagep, int32_t addr_type, int32_t is_dirty)
+ {
+ #if DEBUG_SLOW
+ 	account_page(hashp,
+@@ -924,10 +885,7 @@ __put_page(hashp, pagep, addr_type, is_dirty)
+  *      -1 indicates FAILURE
+  */
+ extern PAGE16 *
+-__get_page(hashp, addr, addr_type)
+-	HTAB *hashp;
+-	u_int32_t addr;
+-	int32_t addr_type;
++__get_page(HTAB *hashp, u_int32_t addr, int32_t addr_type)
+ {
+ 	PAGE16 *pagep;
+ 	db_pgno_t paddr;
+@@ -958,8 +916,7 @@ __get_page(hashp, addr, addr_type)
+ }
+ 
+ static void
+-swap_page_header_in(pagep)
+-	PAGE16 *pagep;
++swap_page_header_in(PAGE16 *pagep)
+ {
+ 	u_int32_t i;
+ 
+@@ -977,8 +934,7 @@ swap_page_header_in(pagep)
+ }
+ 
+ static void
+-swap_page_header_out(pagep)
+-	PAGE16 *pagep;
++swap_page_header_out(PAGE16 *pagep)
+ {
+ 	u_int32_t i;
+ 
+@@ -1001,9 +957,7 @@ swap_page_header_out(pagep)
+  * once they are read in.
+  */
+ extern int32_t
+-__ibitmap(hashp, pnum, nbits, ndx)
+-	HTAB *hashp;
+-	int32_t pnum, nbits, ndx;
++__ibitmap(HTAB *hashp, int32_t pnum, int32_t nbits, int32_t ndx)
+ {
+ 	u_int32_t *ip;
+ 	int32_t clearbytes, clearints;
+@@ -1027,8 +981,7 @@ __ibitmap(hashp, pnum, nbits, ndx)
+ }
+ 
+ static u_int32_t
+-first_free(map)
+-	u_int32_t map;
++first_free(u_int32_t map)
+ {
+ 	u_int32_t i, mask;
+ 
+@@ -1044,8 +997,7 @@ first_free(map)
+  * returns 0 on error
+  */
+ static u_int16_t
+-overflow_page(hashp)
+-	HTAB *hashp;
++overflow_page(HTAB *hashp)
+ {
+ 	u_int32_t *freep;
+ 	u_int32_t bit, first_page, free_bit, free_page, i, in_use_bits, j;
+@@ -1206,9 +1158,7 @@ found:
+ 
+ #ifdef DEBUG
+ int
+-bucket_to_page(hashp, n)
+-	HTAB *hashp;
+-	int n;
++bucket_to_page(HTAB *hashp, int n)
+ {
+ 	int ret_val;
+ 
+@@ -1219,9 +1169,7 @@ bucket_to_page(hashp, n)
+ }
+ 
+ int32_t
+-oaddr_to_page(hashp, n)
+-	HTAB *hashp;
+-	int n;
++oaddr_to_page(HTAB *hashp, int n)
+ {
+ 	int ret_val, temp;
+ 
+@@ -1234,9 +1182,7 @@ oaddr_to_page(hashp, n)
+ #endif /* DEBUG */
+ 
+ static indx_t
+-page_to_oaddr(hashp, pgno)
+-	HTAB *hashp;
+-	db_pgno_t pgno;
++page_to_oaddr(HTAB *hashp, db_pgno_t pgno)
+ {
+ 	int32_t sp, ret_val;
+ 
+@@ -1268,9 +1214,7 @@ page_to_oaddr(hashp, pgno)
+  * Mark this overflow page as free.
+  */
+ extern void
+-__free_ovflpage(hashp, pagep)
+-	HTAB *hashp;
+-	PAGE16 *pagep;
++__free_ovflpage(HTAB *hashp, PAGE16 *pagep)
+ {
+ 	u_int32_t *freep;
+ 	u_int32_t bit_address, free_page, free_bit;
+@@ -1307,9 +1251,7 @@ __free_ovflpage(hashp, pagep)
+ }
+ 
+ static u_int32_t *
+-fetch_bitmap(hashp, ndx)
+-	HTAB *hashp;
+-	int32_t ndx;
++fetch_bitmap(HTAB *hashp, int32_t ndx)
+ {
+ 	if (ndx >= hashp->nmaps)
+ 		return (NULL);
+@@ -1322,10 +1264,7 @@ fetch_bitmap(hashp, ndx)
+ 
+ #ifdef DEBUG_SLOW
+ static void
+-account_page(hashp, pgno, inout)
+-	HTAB *hashp;
+-	db_pgno_t pgno;
+-	int inout;
++account_page(HTAB *hashp, db_pgno_t pgno, int inout)
+ {
+ 	static struct {
+ 		db_pgno_t pgno;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hsearch.c b/src/plugins/kdb/db2/libdb2/hash/hsearch.c
+index 02ff7ef843..ffcdfcf294 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hsearch.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hsearch.c
+@@ -50,8 +50,7 @@ static DB *dbp = NULL;
+ static ENTRY retval;
+ 
+ extern int
+-hcreate(nel)
+-	u_int nel;
++hcreate(u_int nel)
+ {
+ 	HASHINFO info;
+ 
+@@ -66,9 +65,7 @@ hcreate(nel)
+ }
+ 
+ extern ENTRY *
+-hsearch(item, action)
+-	ENTRY item;
+-	ACTION action;
++hsearch(ENTRY item, ACTION action)
+ {
+ 	DBT key, val;
+ 	int status;
+@@ -98,7 +95,7 @@ hsearch(item, action)
+ }
+ 
+ extern void
+-hdestroy()
++hdestroy(void)
+ {
+ 	if (dbp) {
+ 		(void)(dbp->close)(dbp);
+diff --git a/src/plugins/kdb/db2/libdb2/mpool/mpool.c b/src/plugins/kdb/db2/libdb2/mpool/mpool.c
+index 0fcfd4ac2b..028fb180ca 100644
+--- a/src/plugins/kdb/db2/libdb2/mpool/mpool.c
++++ b/src/plugins/kdb/db2/libdb2/mpool/mpool.c
+@@ -56,10 +56,7 @@ static int  mpool_write __P((MPOOL *, BKT *));
+  *	Initialize a memory pool.
+  */
+ MPOOL *
+-mpool_open(key, fd, pagesize, maxcache)
+-	void *key;
+-	int fd;
+-	db_pgno_t pagesize, maxcache;
++mpool_open(void *key, int fd, db_pgno_t pagesize, db_pgno_t maxcache)
+ {
+ 	struct stat sb;
+ 	MPOOL *mp;
+@@ -96,11 +93,8 @@ mpool_open(key, fd, pagesize, maxcache)
+  *	Initialize input/output filters.
+  */
+ void
+-mpool_filter(mp, pgin, pgout, pgcookie)
+-	MPOOL *mp;
+-	void (*pgin) __P((void *, db_pgno_t, void *));
+-	void (*pgout) __P((void *, db_pgno_t, void *));
+-	void *pgcookie;
++mpool_filter(MPOOL *mp, void (*pgin) __P((void *, db_pgno_t, void *)),
++	     void (*pgout) __P((void *, db_pgno_t, void *)), void *pgcookie)
+ {
+ 	mp->pgin = pgin;
+ 	mp->pgout = pgout;
+@@ -112,10 +106,7 @@ mpool_filter(mp, pgin, pgout, pgcookie)
+  *	Get a new page of memory.
+  */
+ void *
+-mpool_new(mp, pgnoaddr, flags)
+-	MPOOL *mp;
+-	db_pgno_t *pgnoaddr;
+-	u_int flags;
++mpool_new(MPOOL *mp, db_pgno_t *pgnoaddr, u_int flags)
+ {
+ 	struct _hqh *head;
+ 	BKT *bp;
+@@ -149,9 +140,7 @@ mpool_new(mp, pgnoaddr, flags)
+ }
+ 
+ int
+-mpool_delete(mp, page)
+-	MPOOL *mp;
+-	void *page;
++mpool_delete(MPOOL *mp, void *page)
+ {
+ 	struct _hqh *head;
+ 	BKT *bp;
+@@ -180,10 +169,7 @@ mpool_delete(mp, page)
+  *	Get a page.
+  */
+ void *
+-mpool_get(mp, pgno, flags)
+-	MPOOL *mp;
+-	db_pgno_t pgno;
+-	u_int flags;				/* XXX not used? */
++mpool_get(MPOOL *mp, db_pgno_t pgno, u_int flags)
+ {
+ 	struct _hqh *head;
+ 	BKT *bp;
+@@ -278,10 +264,7 @@ mpool_get(mp, pgno, flags)
+  *	Return a page.
+  */
+ int
+-mpool_put(mp, page, flags)
+-	MPOOL *mp;
+-	void *page;
+-	u_int flags;
++mpool_put(MPOOL *mp, void *page, u_int flags)
+ {
+ 	BKT *bp;
+ 
+@@ -307,8 +290,7 @@ mpool_put(mp, page, flags)
+  *	Close the buffer pool.
+  */
+ int
+-mpool_close(mp)
+-	MPOOL *mp;
++mpool_close(MPOOL *mp)
+ {
+ 	BKT *bp;
+ 
+@@ -328,8 +310,7 @@ mpool_close(mp)
+  *	Sync the pool to disk.
+  */
+ int
+-mpool_sync(mp)
+-	MPOOL *mp;
++mpool_sync(MPOOL *mp)
+ {
+ 	BKT *bp;
+ 
+@@ -348,8 +329,7 @@ mpool_sync(mp)
+  *	Get a page from the cache (or create one).
+  */
+ static BKT *
+-mpool_bkt(mp)
+-	MPOOL *mp;
++mpool_bkt(MPOOL *mp)
+ {
+ 	struct _hqh *head;
+ 	BKT *bp;
+@@ -407,9 +387,7 @@ new:	if ((bp = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL)
+  *	Write a page to disk.
+  */
+ static int
+-mpool_write(mp, bp)
+-	MPOOL *mp;
+-	BKT *bp;
++mpool_write(MPOOL *mp, BKT *bp)
+ {
+ 	off_t off;
+ 
+@@ -451,9 +429,7 @@ mpool_write(mp, bp)
+  *	Lookup a page in the cache.
+  */
+ static BKT *
+-mpool_look(mp, pgno)
+-	MPOOL *mp;
+-	db_pgno_t pgno;
++mpool_look(MPOOL *mp, db_pgno_t pgno)
+ {
+ 	struct _hqh *head;
+ 	BKT *bp;
+@@ -478,8 +454,7 @@ mpool_look(mp, pgno)
+  *	Print out cache statistics.
+  */
+ void
+-mpool_stat(mp)
+-	MPOOL *mp;
++mpool_stat(MPOOL *mp)
+ {
+ 	BKT *bp;
+ 	int cnt;
+@@ -520,8 +495,7 @@ mpool_stat(mp)
+ }
+ #else
+ void
+-mpool_stat(mp)
+-	MPOOL *mp;
++mpool_stat(MPOOL *mp)
+ {
+ }
+ #endif
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_close.c b/src/plugins/kdb/db2/libdb2/recno/rec_close.c
+index 4ef4dd1bae..b858e5c909 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_close.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_close.c
+@@ -59,8 +59,7 @@ static char sccsid[] = "@(#)rec_close.c	8.9 (Berkeley) 11/18/94";
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_close(dbp)
+-	DB *dbp;
++__rec_close(DB *dbp)
+ {
+ 	BTREE *t;
+ 	int status;
+@@ -108,9 +107,7 @@ __rec_close(dbp)
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__rec_sync(dbp, flags)
+-	const DB *dbp;
+-	u_int flags;
++__rec_sync(const DB *dbp, u_int flags)
+ {
+ 	struct iovec iov[2];
+ 	BTREE *t;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_delete.c b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
+index b69c9ad742..7e574df28e 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
+@@ -61,10 +61,7 @@ static int rec_rdelete __P((BTREE *, recno_t));
+  *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ int
+-__rec_delete(dbp, key, flags)
+-	const DB *dbp;
+-	const DBT *key;
+-	u_int flags;
++__rec_delete(const DB *dbp, const DBT *key, u_int flags)
+ {
+ 	BTREE *t;
+ 	recno_t nrec;
+@@ -117,9 +114,7 @@ einval:		errno = EINVAL;
+  *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ static int
+-rec_rdelete(t, nrec)
+-	BTREE *t;
+-	recno_t nrec;
++rec_rdelete(BTREE *t, recno_t nrec)
+ {
+ 	EPG *e;
+ 	PAGE *h;
+@@ -151,10 +146,7 @@ rec_rdelete(t, nrec)
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__rec_dleaf(t, h, idx)
+-	BTREE *t;
+-	PAGE *h;
+-	u_int32_t idx;
++__rec_dleaf(BTREE *t, PAGE *h, u_int32_t idx)
+ {
+ 	RLEAF *rl;
+ 	indx_t *ip, cnt, offset;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_get.c b/src/plugins/kdb/db2/libdb2/recno/rec_get.c
+index 230b2d4f54..c89cb556fc 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_get.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_get.c
+@@ -60,11 +60,7 @@ static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
+  *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ int
+-__rec_get(dbp, key, data, flags)
+-	const DB *dbp;
+-	const DBT *key;
+-	DBT *data;
+-	u_int flags;
++__rec_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
+ {
+ 	BTREE *t;
+ 	EPG *e;
+@@ -119,9 +115,7 @@ __rec_get(dbp, key, data, flags)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_fpipe(t, top)
+-	BTREE *t;
+-	recno_t top;
++__rec_fpipe(BTREE *t, recno_t top)
+ {
+ 	DBT data;
+ 	recno_t nrec;
+@@ -175,9 +169,7 @@ __rec_fpipe(t, top)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_vpipe(t, top)
+-	BTREE *t;
+-	recno_t top;
++__rec_vpipe(BTREE *t, recno_t top)
+ {
+ 	DBT data;
+ 	recno_t nrec;
+@@ -232,9 +224,7 @@ __rec_vpipe(t, top)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_fmap(t, top)
+-	BTREE *t;
+-	recno_t top;
++__rec_fmap(BTREE *t, recno_t top)
+ {
+ 	DBT data;
+ 	recno_t nrec;
+@@ -282,9 +272,7 @@ __rec_fmap(t, top)
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_vmap(t, top)
+-	BTREE *t;
+-	recno_t top;
++__rec_vmap(BTREE *t, recno_t top)
+ {
+ 	DBT data;
+ 	u_char *sp, *ep;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_open.c b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
+index b0daa7c021..de3fc3f4d0 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_open.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
+@@ -56,10 +56,8 @@ static char sccsid[] = "@(#)rec_open.c	8.12 (Berkeley) 11/18/94";
+ #include "recno.h"
+ 
+ DB *
+-__rec_open(fname, flags, mode, openinfo, dflags)
+-	const char *fname;
+-	int flags, mode, dflags;
+-	const RECNOINFO *openinfo;
++__rec_open(const char *fname, int flags, int mode, const RECNOINFO *openinfo,
++	   int dflags)
+ {
+ 	BTREE *t;
+ 	BTREEINFO btopeninfo;
+@@ -228,8 +226,7 @@ err:	sverrno = errno;
+ }
+ 
+ int
+-__rec_fd(dbp)
+-	const DB *dbp;
++__rec_fd(const DB *dbp)
+ {
+ 	BTREE *t;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_put.c b/src/plugins/kdb/db2/libdb2/recno/rec_put.c
+index c53c9578e5..8456f1dbf6 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_put.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_put.c
+@@ -59,11 +59,7 @@ static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
+  *	already in the tree and R_NOOVERWRITE specified.
+  */
+ int
+-__rec_put(dbp, key, data, flags)
+-	const DB *dbp;
+-	DBT *key;
+-	const DBT *data;
+-	u_int flags;
++__rec_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
+ {
+ 	BTREE *t;
+ 	DBT fdata, tdata;
+@@ -187,11 +183,7 @@ einval:		errno = EINVAL;
+  *	RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_iput(t, nrec, data, flags)
+-	BTREE *t;
+-	recno_t nrec;
+-	const DBT *data;
+-	u_int flags;
++__rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
+ {
+ 	DBT tdata;
+ 	EPG *e;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_search.c b/src/plugins/kdb/db2/libdb2/recno/rec_search.c
+index 244d79f36d..55e5ba879b 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_search.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_search.c
+@@ -61,10 +61,7 @@ static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
+  *	the bt_cur field of the tree.  A pointer to the field is returned.
+  */
+ EPG *
+-__rec_search(t, recno, op)
+-	BTREE *t;
+-	recno_t recno;
+-	enum SRCHOP op;
++__rec_search(BTREE *t, recno_t recno, enum SRCHOP op)
+ {
+ 	indx_t idx;
+ 	PAGE *h;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_seq.c b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
+index 8af1378c34..cf48ea24d7 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
+@@ -58,10 +58,7 @@ static char sccsid[] = "@(#)rec_seq.c	8.3 (Berkeley) 7/14/94";
+  *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ int
+-__rec_seq(dbp, key, data, flags)
+-	const DB *dbp;
+-	DBT *key, *data;
+-	u_int flags;
++__rec_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
+ {
+ 	BTREE *t;
+ 	EPG *e;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_utils.c b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
+index f757a724f5..2eaa39b4a3 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
+@@ -59,11 +59,7 @@ static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
+  *	RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__rec_ret(t, e, nrec, key, data)
+-	BTREE *t;
+-	EPG *e;
+-	recno_t nrec;
+-	DBT *key, *data;
++__rec_ret(BTREE *t, EPG *e, recno_t nrec, DBT *key, DBT *data)
+ {
+ 	RLEAF *rl;
+ 	void *p;
+diff --git a/src/plugins/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c
+index 5d76b1ddf9..04bf34b90d 100644
+--- a/src/plugins/kdb/db2/libdb2/test/dbtest.c
++++ b/src/plugins/kdb/db2/libdb2/test/dbtest.c
+@@ -121,9 +121,7 @@ DB *XXdbp;				/* Global for gdb. */
+ u_long XXlineno;			/* Fast breakpoint for gdb. */
+ 
+ int
+-main(argc, argv)
+-	int argc;
+-	char *argv[];
++main(int argc, char *argv[])
+ {
+ 	extern int optind;
+ 	extern char *optarg;
+@@ -380,8 +378,7 @@ lkey:			switch (command) {
+ #define	NOOVERWRITE	"put failed, would overwrite key\n"
+ 
+ void
+-compare(db1, db2)
+-	DBT *db1, *db2;
++compare(DBT *db1, DBT *db2)
+ {
+ 	size_t len;
+ 	u_char *p1, *p2;
+@@ -402,9 +399,7 @@ compare(db1, db2)
+ }
+ 
+ void
+-get(dbp, kp)
+-	DB *dbp;
+-	DBT *kp;
++get(DB *dbp, DBT *kp)
+ {
+ 	DBT data;
+ 
+@@ -437,9 +432,7 @@ get(dbp, kp)
+ }
+ 
+ void
+-getdata(dbp, kp, dp)
+-	DB *dbp;
+-	DBT *kp, *dp;
++getdata(DB *dbp, DBT *kp, DBT *dp)
+ {
+ 	switch (dbp->get(dbp, kp, dp, flags)) {
+ 	case 0:
+@@ -454,9 +447,7 @@ getdata(dbp, kp, dp)
+ }
+ 
+ void
+-put(dbp, kp, dp)
+-	DB *dbp;
+-	DBT *kp, *dp;
++put(DB *dbp, DBT *kp, DBT *dp)
+ {
+ 	switch (dbp->put(dbp, kp, dp, flags)) {
+ 	case 0:
+@@ -473,9 +464,7 @@ put(dbp, kp, dp)
+ }
+ 
+ void
+-rem(dbp, kp)
+-	DB *dbp;
+-	DBT *kp;
++rem(DB *dbp, DBT *kp)
+ {
+ 	switch (dbp->del(dbp, kp, flags)) {
+ 	case 0:
+@@ -502,8 +491,7 @@ rem(dbp, kp)
+ }
+ 
+ void
+-synk(dbp)
+-	DB *dbp;
++synk(DB *dbp)
+ {
+ 	switch (dbp->sync(dbp, flags)) {
+ 	case 0:
+@@ -515,9 +503,7 @@ synk(dbp)
+ }
+ 
+ void
+-seq(dbp, kp)
+-	DB *dbp;
+-	DBT *kp;
++seq(DB *dbp, DBT *kp)
+ {
+ 	DBT data;
+ 
+@@ -551,10 +537,7 @@ seq(dbp, kp)
+ }
+ 
+ void
+-dump(dbp, rev, recurse)
+-	DB *dbp;
+-	int rev;
+-	int recurse;
++dump(DB *dbp, int rev, int recurse)
+ {
+ 	DBT key, data;
+ 	int lflags, nflags;
+@@ -588,8 +571,7 @@ done:	return;
+ }
+ 
+ void
+-unlinkpg(dbp)
+-	DB *dbp;
++unlinkpg(DB *dbp)
+ {
+ 	BTREE *t = dbp->internal;
+ 	PAGE *h = NULL;
+@@ -623,8 +605,7 @@ cleanup:
+ }
+ 
+ u_int
+-setflags(s)
+-	char *s;
++setflags(char *s)
+ {
+ 	char *p;
+ 
+@@ -648,8 +629,7 @@ setflags(s)
+ }
+ 
+ char *
+-sflags(lflags)
+-	int lflags;
++sflags(int lflags)
+ {
+ 	switch (lflags) {
+ 	case R_CURSOR:		return ("R_CURSOR");
+@@ -667,8 +647,7 @@ sflags(lflags)
+ }
+ 
+ DBTYPE
+-dbtype(s)
+-	char *s;
++dbtype(char *s)
+ {
+ 	if (!strcmp(s, "btree"))
+ 		return (DB_BTREE);
+@@ -681,9 +660,7 @@ dbtype(s)
+ }
+ 
+ void *
+-setinfo(db_type, s)
+-	DBTYPE db_type;
+-	char *s;
++setinfo(DBTYPE db_type, char *s)
+ {
+ 	static BTREEINFO ib;
+ 	static HASHINFO ih;
+@@ -777,9 +754,7 @@ setinfo(db_type, s)
+ }
+ 
+ void *
+-rfile(name, lenp)
+-	char *name;
+-	size_t *lenp;
++rfile(char *name, size_t *lenp)
+ {
+ 	struct stat sb;
+ 	void *p;
+@@ -806,9 +781,7 @@ rfile(name, lenp)
+ }
+ 
+ void *
+-xmalloc(text, len)
+-	char *text;
+-	size_t len;
++xmalloc(char *text, size_t len)
+ {
+ 	void *p;
+ 
+diff --git a/src/plugins/kdb/db2/pol_xdr.c b/src/plugins/kdb/db2/pol_xdr.c
+index e8576337c8..448d4b0f51 100644
+--- a/src/plugins/kdb/db2/pol_xdr.c
++++ b/src/plugins/kdb/db2/pol_xdr.c
+@@ -82,7 +82,7 @@ xdr_osa_policy_ent_rec(XDR *xdrs, osa_policy_ent_t objp)
+         if (!xdr_short(xdrs, &objp->n_tl_data))
+             return (FALSE);
+         if (!xdr_nulltype(xdrs, (void **) &objp->tl_data,
+-                          xdr_krb5_tl_data))
++			  (xdrproc_t)xdr_krb5_tl_data))
+             return FALSE;
+     }
+     return (TRUE);
+diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+index 0b56ba86a7..7ddea923a3 100644
+--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
++++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+@@ -186,8 +186,8 @@ static struct _cmd_table {
+  * The function cmd_lookup returns the structure matching the
+  * command name and returns NULL if nothing matches.
+  */
+-static struct _cmd_table *cmd_lookup(name)
+-    char *name;
++static struct _cmd_table *
++cmd_lookup(const char *name)
+ {
+     int i;
+ 
+diff --git a/src/plugins/kdb/lmdb/kdb_lmdb.c b/src/plugins/kdb/lmdb/kdb_lmdb.c
+index bd288e2236..dbab7967c6 100644
+--- a/src/plugins/kdb/lmdb/kdb_lmdb.c
++++ b/src/plugins/kdb/lmdb/kdb_lmdb.c
+@@ -468,13 +468,13 @@ error:
+ }
+ 
+ static krb5_error_code
+-klmdb_lib_init()
++klmdb_lib_init(void)
+ {
+     return 0;
+ }
+ 
+ static krb5_error_code
+-klmdb_lib_cleanup()
++klmdb_lib_cleanup(void)
+ {
+     return 0;
+ }
+diff --git a/src/plugins/kdb/test/kdb_test.c b/src/plugins/kdb/test/kdb_test.c
+index f4d4380d5b..8d14091f38 100644
+--- a/src/plugins/kdb/test/kdb_test.c
++++ b/src/plugins/kdb/test/kdb_test.c
+@@ -312,13 +312,13 @@ make_strings(char **stringattrs, krb5_db_entry *ent)
+ }
+ 
+ static krb5_error_code
+-test_init()
++test_init(void)
+ {
+     return 0;
+ }
+ 
+ static krb5_error_code
+-test_cleanup()
++test_cleanup(void)
+ {
+     return 0;
+ }
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 8cdc40bfb4..f5aade34cc 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -3471,7 +3471,7 @@ load_pkcs11_module(krb5_context context, const char *modname,
+     CK_RV (*getflist)(CK_FUNCTION_LIST_PTR_PTR);
+     struct errinfo einfo = EMPTY_ERRINFO;
+     const char *errmsg = NULL;
+-    void (*sym)();
++    void (*sym)(void);
+     long err;
+     CK_RV rv;
+ 
+@@ -3490,7 +3490,7 @@ load_pkcs11_module(krb5_context context, const char *modname,
+         goto error;
+     }
+ 
+-    getflist = (CK_RV (*)())sym;
++    getflist = (CK_RV (*)(CK_FUNCTION_LIST_PTR_PTR))sym;
+     rv = (*getflist)(p11p);
+     if (rv != CKR_OK) {
+         TRACE_PKINIT_PKCS11_GETFLIST_FAILED(context, pkcs11err(rv));
+diff --git a/src/plugins/preauth/spake/t_vectors.c b/src/plugins/preauth/spake/t_vectors.c
+index 96b0307d78..ecffd3d7ee 100644
+--- a/src/plugins/preauth/spake/t_vectors.c
++++ b/src/plugins/preauth/spake/t_vectors.c
+@@ -439,7 +439,7 @@ run_test(const struct test *t)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i;
+ 
+diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
+index 926aa94706..2fa6dce8eb 100644
+--- a/src/tests/asn.1/krb5_decode_test.c
++++ b/src/tests/asn.1/krb5_decode_test.c
+@@ -54,9 +54,8 @@ static void ktest_free_reply_key_pack(krb5_context context,
+ static void ktest_free_kkdcp_message(krb5_context context,
+                                      krb5_kkdcp_message *val);
+ 
+-int main(argc, argv)
+-    int argc;
+-    char **argv;
++int
++main(int argc, char **argv)
+ {
+     krb5_data code;
+     krb5_error_code retval;
+diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
+index 26c064e67d..f4e754b1cc 100644
+--- a/src/tests/asn.1/krb5_encode_test.c
++++ b/src/tests/asn.1/krb5_encode_test.c
+@@ -37,7 +37,7 @@ krb5_context test_context;
+ int error_count = 0;
+ int do_trval = 0;
+ int first_trval = 1;
+-int trval2();
++int trval2(FILE *, unsigned char *, int, int, int *);
+ 
+ static void
+ encoder_print_results(krb5_data *code, char *typestring, char *description)
+@@ -51,7 +51,7 @@ encoder_print_results(krb5_data *code, char *typestring, char *description)
+         else
+             printf("\n");
+         printf("encode_krb5_%s%s:\n", typestring, description);
+-        r = trval2(stdout, code->data, code->length, 0, &rlen);
++        r = trval2(stdout, (uint8_t *)code->data, code->length, 0, &rlen);
+         printf("\n");
+         if (rlen < 0 || (unsigned int) rlen != code->length) {
+             printf("Error: length mismatch: was %d, parsed %d\n",
+@@ -72,9 +72,8 @@ encoder_print_results(krb5_data *code, char *typestring, char *description)
+     ktest_destroy_data(&code);
+ }
+ 
+-static void PRS(argc, argv)
+-    int argc;
+-    char        **argv;
++static void
++PRS(int argc, char **argv)
+ {
+     extern char *optarg;
+     int optchar;
+@@ -107,9 +106,7 @@ static void PRS(argc, argv)
+ }
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char        **argv;
++main(int argc, char **argv)
+ {
+     krb5_data *code;
+     krb5_error_code retval;
+diff --git a/src/tests/asn.1/t_trval.c b/src/tests/asn.1/t_trval.c
+index 57d8253880..009ed5bb9e 100644
+--- a/src/tests/asn.1/t_trval.c
++++ b/src/tests/asn.1/t_trval.c
+@@ -36,7 +36,8 @@
+    -DSTANDALONE code.  */
+ #include "trval.c"
+ 
+-static void usage()
++static void
++usage(void)
+ {
+     fprintf(stderr, "Usage: trval [--types] [--krb5] [--krb5decode] [--hex] [-notypebytes] [file]\n");
+     exit(1);
+@@ -46,10 +47,8 @@ static void usage()
+  * Returns true if the option was selected.  Allow "-option" and
+  * "--option" syntax, since we used to accept only "-option"
+  */
+-static
+-int check_option(word, option)
+-    char *word;
+-    char *option;
++static int
++check_option(char *word, char *option)
+ {
+     if (word[0] != '-')
+         return 0;
+@@ -60,9 +59,8 @@ int check_option(word, option)
+     return 1;
+ }
+ 
+-int main(argc, argv)
+-    int argc;
+-    char **argv;
++int
++main(int argc, char **argv)
+ {
+     int optflg = 1;
+     FILE *fp;
+diff --git a/src/tests/asn.1/trval.c b/src/tests/asn.1/trval.c
+index c14bcdeb69..e0e58cc19e 100644
+--- a/src/tests/asn.1/trval.c
++++ b/src/tests/asn.1/trval.c
+@@ -120,7 +120,8 @@ int trval2 (FILE *, unsigned char *, int, int, int *);
+ 
+ /****************************************************************************/
+ 
+-static int convert_nibble(int ch)
++static int
++convert_nibble(int ch)
+ {
+     if (isdigit(ch))
+         return (ch - '0');
+@@ -131,9 +132,8 @@ static int convert_nibble(int ch)
+     return -1;
+ }
+ 
+-int trval(fin, fout)
+-    FILE        *fin;
+-    FILE        *fout;
++int
++trval(FILE *fin, FILE *fout)
+ {
+     unsigned char *p;
+     unsigned int maxlen;
+@@ -169,12 +169,8 @@ int trval(fin, fout)
+     return(r);
+ }
+ 
+-int trval2(fp, enc, len, lev, rlen)
+-    FILE *fp;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
+-    int *rlen;
++int
++trval2(FILE *fp, unsigned char *enc, int len, int lev, int *rlen)
+ {
+     int l, eid, elen, xlen, r, rlen2 = 0;
+     int rlen_ext = 0;
+@@ -248,10 +244,8 @@ context_restart:
+     return(r);
+ }
+ 
+-int decode_len(fp, enc, len)
+-    FILE *fp;
+-    unsigned char *enc;
+-    int len;
++int
++decode_len(FILE *fp, unsigned char *enc, int len)
+ {
+     int rlen;
+     int i;
+@@ -270,12 +264,8 @@ int decode_len(fp, enc, len)
+ /*
+  * This is the printing function for bit strings
+  */
+-int do_prim_bitstring(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim_bitstring(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int i;
+     long        num = 0;
+@@ -297,12 +287,8 @@ int do_prim_bitstring(fp, tag, enc, len, lev)
+ /*
+  * This is the printing function for integers
+  */
+-int do_prim_int(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim_int(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int i;
+     long        num = 0;
+@@ -327,12 +313,8 @@ int do_prim_int(fp, tag, enc, len, lev)
+  * This is the printing function which we use if it's a string or
+  * other other type which is best printed as a string
+  */
+-int do_prim_string(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim_string(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int i;
+ 
+@@ -349,12 +331,8 @@ int do_prim_string(fp, tag, enc, len, lev)
+     return 1;
+ }
+ 
+-int do_prim(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int n;
+     int i;
+@@ -396,12 +374,8 @@ int do_prim(fp, tag, enc, len, lev)
+     return(OK);
+ }
+ 
+-int do_cons(fp, enc, len, lev, rlen)
+-    FILE *fp;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
+-    int *rlen;
++int
++do_cons(FILE *fp, unsigned char *enc, int len, int lev, int *rlen)
+ {
+     int n;
+     int r = 0;
+@@ -430,9 +404,8 @@ struct typestring_table {
+     int new_appl;
+ };
+ 
+-static char *lookup_typestring(table, key1, key2)
+-    struct typestring_table *table;
+-    int key1, key2;
++static char *
++lookup_typestring(struct typestring_table *table, int key1, int key2)
+ {
+     struct typestring_table *ent;
+ 
+@@ -700,10 +673,8 @@ struct typestring_table krb5_fields[] = {
+ };
+ #endif
+ 
+-void print_tag_type(fp, eid, lev)
+-    FILE *fp;
+-    int     eid;
+-    int     lev;
++void
++print_tag_type(FILE *fp, int eid, int lev)
+ {
+     int tag = eid & ID_TAG;
+     int do_space = 1;
+diff --git a/src/tests/conccache.c b/src/tests/conccache.c
+index 7b0ca6300c..9fe5305761 100644
+--- a/src/tests/conccache.c
++++ b/src/tests/conccache.c
+@@ -110,7 +110,7 @@ refresh_cache(krb5_context context)
+ }
+ 
+ static pid_t
+-spawn_cred_subprocess()
++spawn_cred_subprocess(void)
+ {
+     krb5_context context;
+     pid_t pid;
+@@ -133,7 +133,7 @@ spawn_cred_subprocess()
+ }
+ 
+ static pid_t
+-spawn_refresh_subprocess()
++spawn_refresh_subprocess(void)
+ {
+     krb5_context context;
+     pid_t pid;
+diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
+index 7c0666601c..61ca9f67a2 100644
+--- a/src/tests/create/kdb5_mkdums.c
++++ b/src/tests/create/kdb5_mkdums.c
+@@ -56,9 +56,7 @@ struct mblock {
+ int set_dbname_help (char *, char *);
+ 
+ static void
+-usage(who, status)
+-    char *who;
+-    int status;
++usage(char *who, int status)
+ {
+     fprintf(stderr,
+             "usage: %s -p prefix -n num_to_create [-d dbpathname] [-r realmname]\n",
+@@ -83,9 +81,7 @@ static krb5_boolean manual_mkey = FALSE;
+ void add_princ (krb5_context, char *);
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     extern char *optarg;
+     int optchar, i, n;
+@@ -209,9 +205,7 @@ main(argc, argv)
+ }
+ 
+ void
+-add_princ(context, str_newprinc)
+-    krb5_context          context;
+-    char                * str_newprinc;
++add_princ(krb5_context context, char *str_newprinc)
+ {
+     krb5_error_code       retval;
+     krb5_principal        newprinc;
+@@ -317,9 +311,7 @@ error: /* Do cleanup of newentry regardless of error */
+ }
+ 
+ int
+-set_dbname_help(pname, dbname)
+-    char *pname;
+-    char *dbname;
++set_dbname_help(char *pname, char *dbname)
+ {
+     krb5_error_code retval;
+     krb5_data pwd, scratch;
+diff --git a/src/tests/forward.c b/src/tests/forward.c
+index 7327cc9e62..90f359a586 100644
+--- a/src/tests/forward.c
++++ b/src/tests/forward.c
+@@ -51,7 +51,7 @@ check(krb5_error_code code)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_ccache cc;
+     krb5_creds mcred, tgt, *fcred;
+diff --git a/src/tests/gss-threads/gss-client.c b/src/tests/gss-threads/gss-client.c
+index c0cf25ddaa..8c006c2915 100644
+--- a/src/tests/gss-threads/gss-client.c
++++ b/src/tests/gss-threads/gss-client.c
+@@ -68,7 +68,7 @@
+ static int verbose = 1;
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-client [-port port] [-mech mechanism] [-d]\n");
+     fprintf(stderr, "       [-seq] [-noreplay] [-nomutual]");
+@@ -134,7 +134,7 @@ get_server_info(char *host, u_short port)
+  * displayed and -1 is returned.
+  */
+ static int
+-connect_to_server()
++connect_to_server(void)
+ {
+     int s;
+ 
+diff --git a/src/tests/gss-threads/gss-server.c b/src/tests/gss-threads/gss-server.c
+index a9f980edb2..e0a37738e4 100644
+--- a/src/tests/gss-threads/gss-server.c
++++ b/src/tests/gss-threads/gss-server.c
+@@ -74,7 +74,7 @@
+ #endif
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]");
+ #ifdef _WIN32
+diff --git a/src/tests/gssapi/reload.c b/src/tests/gssapi/reload.c
+index 4fe3565406..00bda32330 100644
+--- a/src/tests/gssapi/reload.c
++++ b/src/tests/gssapi/reload.c
+@@ -64,7 +64,7 @@ load_gssapi(void)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     void *support;
+ 
+diff --git a/src/tests/gssapi/t_add_cred.c b/src/tests/gssapi/t_add_cred.c
+index 68b37e3ed9..7ab52d6449 100644
+--- a/src/tests/gssapi/t_add_cred.c
++++ b/src/tests/gssapi/t_add_cred.c
+@@ -43,7 +43,7 @@
+ #include "common.h"
+ 
+ int
+-main()
++main(void)
+ {
+     OM_uint32 minor, major;
+     gss_cred_id_t cred1, cred2;
+diff --git a/src/tests/gssapi/t_enctypes.c b/src/tests/gssapi/t_enctypes.c
+index 3fd31e2f8c..3325db7696 100644
+--- a/src/tests/gssapi/t_enctypes.c
++++ b/src/tests/gssapi/t_enctypes.c
+@@ -47,7 +47,7 @@
+  */
+ 
+ static void
+-usage()
++usage(void)
+ {
+     errout("Usage: t_enctypes [-i initenctypes] [-a accenctypes] "
+            "targetname");
+diff --git a/src/tests/gssapi/t_invalid.c b/src/tests/gssapi/t_invalid.c
+index 8192935099..a052b8ab6e 100644
+--- a/src/tests/gssapi/t_invalid.c
++++ b/src/tests/gssapi/t_invalid.c
+@@ -547,7 +547,7 @@ try_accept(void *value, size_t len)
+ 
+ /* Accept contexts using superficially valid but truncated encapsulations. */
+ static void
+-test_short_encapsulation()
++test_short_encapsulation(void)
+ {
+     /* Include just the initial application tag, to see if we overrun reading
+      * the sequence length. */
+diff --git a/src/tests/gssapi/t_oid.c b/src/tests/gssapi/t_oid.c
+index 1c9d394167..64253133d2 100644
+--- a/src/tests/gssapi/t_oid.c
++++ b/src/tests/gssapi/t_oid.c
+@@ -129,7 +129,7 @@ oid_equal(gss_OID o1, gss_OID o2)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i;
+     OM_uint32 major, minor;
+diff --git a/src/tests/gssapi/t_spnego.c b/src/tests/gssapi/t_spnego.c
+index 2483228b1b..4091739f83 100644
+--- a/src/tests/gssapi/t_spnego.c
++++ b/src/tests/gssapi/t_spnego.c
+@@ -195,7 +195,7 @@ test_mskrb_oid(gss_name_t tname, gss_cred_id_t acred)
+ /* Check that we return a compatibility NegTokenInit2 message containing
+  * NegHints for an empty initiator token. */
+ static void
+-test_neghints()
++test_neghints(void)
+ {
+     OM_uint32 major, minor;
+     gss_buffer_desc itok = GSS_C_EMPTY_BUFFER, atok;
+diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
+index 8220fd97bd..76ef527ccf 100644
+--- a/src/tests/hammer/kdc5_hammer.c
++++ b/src/tests/hammer/kdc5_hammer.c
+@@ -68,9 +68,7 @@ int get_tgt
+ 		   krb5_ccache);
+ 
+ static void
+-usage(who, status)
+-char *who;
+-int status;
++usage(char *who, int status)
+ {
+     fprintf(stderr,
+ 	    "usage: %s -p prefix -n num_to_check [-c cachename] [-r realmname]\n",
+@@ -100,9 +98,7 @@ struct h_timer tgs_req_times = { 0.0, 1000000.0, -1.0, 0 };
+ 				     tstart_time.tv_usec))/1000000.0)))
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char **argv;
++main(int argc, char **argv)
+ {
+     krb5_ccache ccache = NULL;
+     char *cache_name = NULL;		/* -f option */
+@@ -271,11 +267,8 @@ main(argc, argv)
+ 
+ 
+ static krb5_error_code
+-get_server_key(context, server, enctype, key)
+-    krb5_context context;
+-    krb5_principal server;
+-    krb5_enctype enctype;
+-    krb5_keyblock ** key;
++get_server_key(krb5_context context, krb5_principal server,
++	       krb5_enctype enctype, krb5_keyblock **key)
+ {
+     krb5_error_code retval;
+     krb5_encrypt_block eblock;
+@@ -311,15 +304,10 @@ cleanup_salt:
+     return retval;
+ }
+ 
+-int verify_cs_pair(context, p_client_str, p_client, service, hostname,
+-		   p_num, c_depth, s_depth, ccache)
+-    krb5_context context;
+-    char *p_client_str;
+-    krb5_principal p_client;
+-    char * service;
+-    char * hostname;
+-    int p_num, c_depth, s_depth;
+-    krb5_ccache ccache;
++int
++verify_cs_pair(krb5_context context, char *p_client_str,
++	       krb5_principal p_client, char *service, char *hostname,
++	       int p_num, int c_depth, int s_depth, krb5_ccache ccache)
+ {
+     krb5_error_code 	  retval;
+     krb5_creds 	 	  creds;
+@@ -433,11 +421,9 @@ cleanup:
+     return retval;
+ }
+ 
+-int get_tgt (context, p_client_str, p_client, ccache)
+-    krb5_context context;
+-    char *p_client_str;
+-    krb5_principal *p_client;
+-    krb5_ccache ccache;
++int
++get_tgt(krb5_context context, char *p_client_str, krb5_principal *p_client,
++	krb5_ccache ccache)
+ {
+     long lifetime = KRB5_DEFAULT_LIFE;	/* -l option */
+     krb5_error_code code;
+diff --git a/src/tests/kdbtest.c b/src/tests/kdbtest.c
+index 3f61f3e83b..6459c3390f 100644
+--- a/src/tests/kdbtest.c
++++ b/src/tests/kdbtest.c
+@@ -271,7 +271,7 @@ iter_pol_handler(void *data, osa_policy_ent_t pol)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_db_entry *ent;
+     osa_policy_ent_t pol;
+diff --git a/src/tests/misc/test_getpw.c b/src/tests/misc/test_getpw.c
+index 6031e15035..59ff5d3a5d 100644
+--- a/src/tests/misc/test_getpw.c
++++ b/src/tests/misc/test_getpw.c
+@@ -32,7 +32,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ 
+-int main()
++int main(void)
+ {
+     uid_t my_uid;
+     struct passwd *pwd, pwx;
+diff --git a/src/tests/plugorder.c b/src/tests/plugorder.c
+index e1245e4765..a2b7e34eea 100644
+--- a/src/tests/plugorder.c
++++ b/src/tests/plugorder.c
+@@ -77,7 +77,7 @@ blt3(krb5_context context, int maj_ver, int min_ver, krb5_plugin_vtable vtable)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_plugin_initvt_fn *modules = NULL, *mod;
+     struct krb5_pwqual_vtable_st vt;
+diff --git a/src/tests/shlib/t_loader.c b/src/tests/shlib/t_loader.c
+index 29481a7be2..203f023f69 100644
+--- a/src/tests/shlib/t_loader.c
++++ b/src/tests/shlib/t_loader.c
+@@ -180,7 +180,7 @@ static void do_close(void *libhandle)
+ 
+ #endif
+ 
+-int main()
++int main(void)
+ {
+     void *celib, *k5lib, *gsslib, *celib2;
+ 
+diff --git a/src/tests/softpkcs11/main.c b/src/tests/softpkcs11/main.c
+index 82b05ff0da..908f926405 100644
+--- a/src/tests/softpkcs11/main.c
++++ b/src/tests/softpkcs11/main.c
+@@ -860,7 +860,7 @@ func_not_supported(void)
+ }
+ 
+ static char *
+-get_rcfilename()
++get_rcfilename(void)
+ {
+     struct passwd *pw;
+     const char *home = NULL;
+diff --git a/src/tests/t_inetd.c b/src/tests/t_inetd.c
+index d22cf31ffa..3790467c7b 100644
+--- a/src/tests/t_inetd.c
++++ b/src/tests/t_inetd.c
+@@ -59,16 +59,15 @@
+ 
+ char *progname;
+ 
+-static void usage()
++static void
++usage(void)
+ {
+     fprintf(stderr, "%s: port program argv0 argv1 ...\n", progname);
+     exit(1);
+ }
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char **argv;
++main(int argc, char **argv)
+ {
+     unsigned short port;
+     char *path;
+diff --git a/src/tests/test1.c b/src/tests/test1.c
+index aed656ebe3..b213a349bf 100644
+--- a/src/tests/test1.c
++++ b/src/tests/test1.c
+@@ -31,7 +31,7 @@ unsigned char key_two[8] = { 0xea, 0x89, 0x57, 0x76, 0x5b, 0xcd, 0x0d, 0x34 };
+ 
+ extern void dump_data();
+ 
+-tkt_test_1()
++tkt_test_1(void)
+ {
+     krb5_data *data;
+     krb5_ticket tk_in, *tk_out;
+@@ -185,7 +185,7 @@ tkt_test_1()
+ 
+ 
+ 
+-main()
++main(void)
+ {
+     krb5_init_ets();
+     tkt_test_1();
+diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
+index 3b152baed6..d53e92ad45 100644
+--- a/src/tests/verify/kdb5_verify.c
++++ b/src/tests/verify/kdb5_verify.c
+@@ -50,9 +50,7 @@ struct mblock {
+ int set_dbname_help (krb5_context, char *, char *);
+ 
+ static void
+-usage(who, status)
+-    char *who;
+-    int status;
++usage(char *who, int status)
+ {
+     fprintf(stderr,
+             "usage: %s -p prefix -n num_to_check [-d dbpathname] [-r realmname]\n",
+@@ -78,9 +76,7 @@ static krb5_boolean manual_mkey = FALSE;
+ int check_princ (krb5_context, char *);
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     extern char *optarg;
+     int optchar, i, n;
+@@ -221,9 +217,7 @@ main(argc, argv)
+ }
+ 
+ int
+-check_princ(context, str_princ)
+-    krb5_context context;
+-    char * str_princ;
++check_princ(krb5_context context, char *str_princ)
+ {
+     krb5_error_code retval;
+     krb5_db_entry *kdbe = NULL;
+@@ -343,10 +337,7 @@ out:
+ }
+ 
+ int
+-set_dbname_help(context, pname, dbname)
+-    krb5_context context;
+-    char *pname;
+-    char *dbname;
++set_dbname_help(krb5_context context, char *pname, char *dbname)
+ {
+     krb5_error_code retval;
+     krb5_data pwd, scratch;
+diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
+index 7dc02a34ea..13ad3af6a2 100644
+--- a/src/util/et/error_message.c
++++ b/src/util/et/error_message.c
+@@ -82,7 +82,7 @@ void com_err_terminate(void)
+ #endif
+ 
+ static char *
+-get_thread_buffer ()
++get_thread_buffer(void)
+ {
+     char *cp;
+     cp = k5_getspecific(K5_KEY_COM_ERR);
+diff --git a/src/util/et/test_et.c b/src/util/et/test_et.c
+index 9faf10f460..2002e5ff46 100644
+--- a/src/util/et/test_et.c
++++ b/src/util/et/test_et.c
+@@ -17,7 +17,8 @@ extern const char *error_table_name (errcode_t);
+ extern int sys_nerr;
+ #endif
+ 
+-int main()
++int
++main(void)
+ {
+     printf("Before initiating error table:\n\n");
+ #ifndef EXPORT_LIST
+diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c
+index cc92248f42..077c852e49 100644
+--- a/src/util/profile/prof_init.c
++++ b/src/util/profile/prof_init.c
+@@ -103,7 +103,7 @@ init_load_module(const char *modspec, profile_t *ret_profile)
+     struct errinfo einfo = { 0 };
+     prf_lib_handle_t lib_handle = NULL;
+     struct plugin_file_handle *plhandle = NULL;
+-    void *cbdata = NULL, (*fptr)();
++    void *cbdata = NULL, (*fptr)(void);
+     int have_lock = 0, have_cbdata = 0;
+     struct profile_vtable vtable = { 1 };  /* Set minor_ver to 1, rest null. */
+     errcode_t err;
+diff --git a/src/util/profile/t_profile.c b/src/util/profile/t_profile.c
+index b0e715ba02..bffd115618 100644
+--- a/src/util/profile/t_profile.c
++++ b/src/util/profile/t_profile.c
+@@ -72,7 +72,7 @@ write_file(const char *name, int nlines, ...)
+ /* Regression test for #2685 (profile iterator breaks when modifications
+  * made) */
+ static void
+-test_iterate()
++test_iterate(void)
+ {
+     profile_t p;
+     void *iter;
+@@ -129,7 +129,7 @@ test_iterate()
+  * global shared profiles list.
+  */
+ static void
+-test_shared()
++test_shared(void)
+ {
+     profile_t a, b;
+     struct utimbuf times;
+@@ -164,7 +164,7 @@ test_shared()
+ /* Regression test for #2950 (profile_clear_relation not reflected within
+  * handle where deletion is performed) */
+ static void
+-test_clear()
++test_clear(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "quux", NULL };
+@@ -183,7 +183,7 @@ test_clear()
+ }
+ 
+ static void
+-test_include()
++test_include(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "bar", NULL };
+@@ -237,7 +237,7 @@ test_include()
+ 
+ /* Test syntactic independence of included profile files. */
+ static void
+-test_independence()
++test_independence(void)
+ {
+     profile_t p;
+     const char *names1[] = { "sec1", "var", "a", NULL };
+@@ -264,7 +264,7 @@ test_independence()
+ 
+ /* Regression test for #7971 (deleted sections should not be iterable) */
+ static void
+-test_delete_section()
++test_delete_section(void)
+ {
+     profile_t p;
+     const char *sect[] = { "test section 1", NULL };
+@@ -290,7 +290,7 @@ test_delete_section()
+ /* Regression test for #7971 (profile_clear_relation() error with deleted node
+  * at end of value set) */
+ static void
+-test_delete_clear_relation()
++test_delete_clear_relation(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "testkey", NULL };
+@@ -305,7 +305,7 @@ test_delete_clear_relation()
+ 
+ /* Test that order of relations is preserved if some relations are deleted. */
+ static void
+-test_delete_ordering()
++test_delete_ordering(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "testkey", NULL };
+@@ -329,7 +329,7 @@ test_delete_ordering()
+ /* Regression test for #8431 (profile_flush_to_file erroneously changes flag
+  * state on source object) */
+ static void
+-test_flush_to_file()
++test_flush_to_file(void)
+ {
+     profile_t p;
+ 
+@@ -349,7 +349,7 @@ test_flush_to_file()
+ /* Regression test for #7863 (multiply-specified subsections should
+  * be merged) */
+ static void
+-test_merge_subsections()
++test_merge_subsections(void)
+ {
+     profile_t p;
+     const char *n1[] = { "test section 2", "child_section2", "child", NULL };
+@@ -374,7 +374,7 @@ test_merge_subsections()
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     test_iterate();
+     test_shared();
+diff --git a/src/util/profile/test_load.c b/src/util/profile/test_load.c
+index cb870eff93..fe2d1e3e72 100644
+--- a/src/util/profile/test_load.c
++++ b/src/util/profile/test_load.c
+@@ -29,7 +29,7 @@
+ #include "prof_int.h"
+ 
+ int
+-main()
++main(void)
+ {
+     profile_t pr, pr2;
+     const char *files[] = { "./modtest.conf", NULL };
+diff --git a/src/util/profile/test_parse.c b/src/util/profile/test_parse.c
+index 9f2631e949..0532254e8c 100644
+--- a/src/util/profile/test_parse.c
++++ b/src/util/profile/test_parse.c
+@@ -11,9 +11,8 @@
+ 
+ void dump_profile (struct profile_node *root, int level);
+ 
+-int main(argc, argv)
+-    int     argc;
+-    char    **argv;
++int
++main(int argc, char **argv)
+ {
+     struct profile_node *root;
+     unsigned long retval;
+diff --git a/src/util/profile/test_profile.c b/src/util/profile/test_profile.c
+index 6f6fcc7ac5..31b1063951 100644
+--- a/src/util/profile/test_profile.c
++++ b/src/util/profile/test_profile.c
+@@ -19,8 +19,8 @@ const char *program_name = "test_profile";
+ #define PRINT_VALUE     1
+ #define PRINT_VALUES    2
+ 
+-static void do_batchmode(profile)
+-    profile_t       profile;
++static void
++do_batchmode(profile_t profile)
+ {
+     errcode_t       retval;
+     int             argc, ret;
+@@ -108,10 +108,8 @@ static void do_batchmode(profile)
+ 
+ }
+ 
+-
+-int main(argc, argv)
+-    int         argc;
+-    char        **argv;
++int
++main(int argc, char **argv)
+ {
+     profile_t   profile;
+     long        retval;
+diff --git a/src/util/profile/test_vtable.c b/src/util/profile/test_vtable.c
+index 9a0b2278a7..a7b6f54ae9 100644
+--- a/src/util/profile/test_vtable.c
++++ b/src/util/profile/test_vtable.c
+@@ -232,7 +232,8 @@ struct profile_vtable full_vtable = {
+     full_flush
+ };
+ 
+-int main()
++int
++main(void)
+ {
+     profile_t profile;
+     char **values, *str, *name, *value;
+diff --git a/src/util/ss/error.c b/src/util/ss/error.c
+index b5768a62b7..e5cd1b2d12 100644
+--- a/src/util/ss/error.c
++++ b/src/util/ss/error.c
+@@ -33,8 +33,8 @@
+ #include "com_err.h"
+ #include "copyright.h"
+ 
+-char * ss_name(sci_idx)
+-    int sci_idx;
++char *
++ss_name(int sci_idx)
+ {
+     ss_data *infop;
+ 
+@@ -50,7 +50,8 @@ char * ss_name(sci_idx)
+     }
+ }
+ 
+-void ss_error (int sci_idx, long code, const char * fmt, ...)
++void
++ss_error(int sci_idx, long code, const char *fmt, ...)
+ {
+     char *whoami;
+     va_list pvar;
+@@ -61,10 +62,8 @@ void ss_error (int sci_idx, long code, const char * fmt, ...)
+     va_end(pvar);
+ }
+ 
+-void ss_perror (sci_idx, code, msg) /* for compatibility */
+-    int sci_idx;
+-    long code;
+-    char const *msg;
++void
++ss_perror(int sci_idx, long code, char const *msg) /* for compatibility */
+ {
+     ss_error (sci_idx, code, "%s", msg);
+ }
+diff --git a/src/util/ss/execute_cmd.c b/src/util/ss/execute_cmd.c
+index c06ee56547..065c24148b 100644
+--- a/src/util/ss/execute_cmd.c
++++ b/src/util/ss/execute_cmd.c
+@@ -52,11 +52,9 @@
+  * Notes:
+  */
+ 
+-static int check_request_table (rqtbl, argc, argv, sci_idx)
+-    ss_request_table *rqtbl;
+-    int argc;
+-    char *argv[];
+-    int sci_idx;
++static int
++check_request_table(ss_request_table *rqtbl, int argc, char *argv[],
++                    int sci_idx)
+ {
+     ss_request_entry *request;
+     ss_data *info;
+@@ -101,10 +99,8 @@ static int check_request_table (rqtbl, argc, argv, sci_idx)
+  * Notes:
+  */
+ 
+-static int really_execute_command (sci_idx, argc, argv)
+-    int sci_idx;
+-    int argc;
+-    char **argv[];
++static int
++really_execute_command(int sci_idx, int argc, char **argv[])
+ {
+     ss_request_table **rqtbl;
+     ss_data *info;
+@@ -135,9 +131,7 @@ static int really_execute_command (sci_idx, argc, argv)
+  */
+ 
+ int
+-ss_execute_command(sci_idx, argv)
+-    int sci_idx;
+-    char *argv[];
++ss_execute_command(int sci_idx, char *argv[])
+ {
+     unsigned int i, argc;
+     char **argp;
+@@ -172,9 +166,8 @@ ss_execute_command(sci_idx, argv)
+  * Notes:
+  */
+ 
+-int ss_execute_line (sci_idx, line_ptr)
+-    int sci_idx;
+-    char *line_ptr;
++int
++ss_execute_line(int sci_idx, char *line_ptr)
+ {
+     char **argv;
+     int argc, ret;
+diff --git a/src/util/ss/help.c b/src/util/ss/help.c
+index 6d333c9710..747fde5351 100644
+--- a/src/util/ss/help.c
++++ b/src/util/ss/help.c
+@@ -15,11 +15,8 @@
+ #include "copyright.h"
+ 
+ 
+-void ss_help (argc, argv, sci_idx, info_ptr)
+-    int argc;
+-    char const * const *argv;
+-    int sci_idx;
+-    pointer info_ptr;
++void
++ss_help(int argc, char const * const *argv, int sci_idx, pointer info_ptr)
+ {
+     char buffer[MAXPATHLEN];
+     char const *request_name;
+@@ -81,15 +78,11 @@ got_it:
+         ss_page_stdin();
+     default:
+         (void) close(fd); /* what can we do if it fails? */
+-#ifdef WAIT_USES_INT
+-        while (wait((int *)NULL) != child) {
+-#else
+-            while (wait((union wait *)NULL) != child) {
+-#endif
+-                /* do nothing if wrong pid */
+-            };
+-        }
++        while (wait(NULL) != child) {
++            /* do nothing if wrong pid */
++        };
+     }
++}
+ 
+ #ifndef USE_DIRENT_H
+ #include <sys/dir.h>
+@@ -97,60 +90,56 @@ got_it:
+ #include <dirent.h>
+ #endif
+ 
+-    void ss_add_info_dir(sci_idx, info_dir, code_ptr)
+-        int sci_idx;
+-    char *info_dir;
+-    int *code_ptr;
+-    {
+-        ss_data *info;
+-        DIR *d;
+-        int n_dirs;
+-        char **dirs;
++void
++ss_add_info_dir(int sci_idx, char *info_dir, int *code_ptr)
++{
++    ss_data *info;
++    DIR *d;
++    int n_dirs;
++    char **dirs;
+ 
+-        info = ss_info(sci_idx);
+-        if ((info_dir == NULL) || (*info_dir == '\0')) {
+-            *code_ptr = SS_ET_NO_INFO_DIR;
+-            return;
+-        }
+-        if ((d = opendir(info_dir)) == (DIR *)NULL) {
+-            *code_ptr = errno;
+-            return;
+-        }
+-        closedir(d);
+-        dirs = info->info_dirs;
+-        for (n_dirs = 0; dirs[n_dirs] != (char *)NULL; n_dirs++)
+-            ;               /* get number of non-NULL dir entries */
+-        dirs = (char **)realloc((char *)dirs,
+-                                (unsigned)(n_dirs + 2)*sizeof(char *));
+-        if (dirs == (char **)NULL) {
+-            info->info_dirs = (char **)NULL;
+-            *code_ptr = errno;
+-            return;
+-        }
+-        info->info_dirs = dirs;
+-        dirs[n_dirs + 1] = (char *)NULL;
+-        dirs[n_dirs] = strdup(info_dir);
+-        *code_ptr = 0;
++    info = ss_info(sci_idx);
++    if ((info_dir == NULL) || (*info_dir == '\0')) {
++        *code_ptr = SS_ET_NO_INFO_DIR;
++        return;
++    }
++    if ((d = opendir(info_dir)) == (DIR *)NULL) {
++        *code_ptr = errno;
++        return;
+     }
++    closedir(d);
++    dirs = info->info_dirs;
++    for (n_dirs = 0; dirs[n_dirs] != (char *)NULL; n_dirs++)
++        ;               /* get number of non-NULL dir entries */
++    dirs = (char **)realloc((char *)dirs,
++                            (unsigned)(n_dirs + 2)*sizeof(char *));
++    if (dirs == (char **)NULL) {
++        info->info_dirs = (char **)NULL;
++        *code_ptr = errno;
++        return;
++    }
++    info->info_dirs = dirs;
++    dirs[n_dirs + 1] = (char *)NULL;
++    dirs[n_dirs] = strdup(info_dir);
++    *code_ptr = 0;
++}
+ 
+-    void ss_delete_info_dir(sci_idx, info_dir, code_ptr)
+-        int sci_idx;
+-    char *info_dir;
+-    int *code_ptr;
+-    {
+-        char **i_d;
+-        char **info_dirs;
++void
++ss_delete_info_dir(int sci_idx, char *info_dir, int *code_ptr)
++{
++    char **i_d;
++    char **info_dirs;
+ 
+-        info_dirs = ss_info(sci_idx)->info_dirs;
+-        for (i_d = info_dirs; *i_d; i_d++) {
+-            if (!strcmp(*i_d, info_dir)) {
+-                while (*i_d) {
+-                    *i_d = *(i_d+1);
+-                    i_d++;
+-                }
+-                *code_ptr = 0;
+-                return;
++    info_dirs = ss_info(sci_idx)->info_dirs;
++    for (i_d = info_dirs; *i_d; i_d++) {
++        if (!strcmp(*i_d, info_dir)) {
++            while (*i_d) {
++                *i_d = *(i_d+1);
++                i_d++;
+             }
++            *code_ptr = 0;
++            return;
+         }
+-        *code_ptr = SS_ET_NO_INFO_DIR;
+     }
++    *code_ptr = SS_ET_NO_INFO_DIR;
++}
+diff --git a/src/util/ss/invocation.c b/src/util/ss/invocation.c
+index 378bc3e927..7736c957d4 100644
+--- a/src/util/ss/invocation.c
++++ b/src/util/ss/invocation.c
+@@ -36,12 +36,10 @@
+    _ss_table[sci_idx], make sure you change the allocation routine to
+    not assume there are no null pointers in the middle of the
+    array.  */
+-int ss_create_invocation(subsystem_name, version_string, info_ptr,
+-                         request_table_ptr, code_ptr)
+-    char *subsystem_name, *version_string;
+-    char *info_ptr;
+-    ss_request_table *request_table_ptr;
+-    int *code_ptr;
++int
++ss_create_invocation(char *subsystem_name, char *version_string,
++                     char *info_ptr, ss_request_table *request_table_ptr,
++                     int *code_ptr)
+ {
+     int sci_idx;
+     ss_data *new_table;
+@@ -115,8 +113,7 @@ int ss_create_invocation(subsystem_name, version_string, info_ptr,
+ }
+ 
+ void
+-ss_delete_invocation(sci_idx)
+-    int sci_idx;
++ss_delete_invocation(int sci_idx)
+ {
+     ss_data *t;
+     int ignored_code;
+diff --git a/src/util/ss/list_rqs.c b/src/util/ss/list_rqs.c
+index c0882bf908..8376e21be8 100644
+--- a/src/util/ss/list_rqs.c
++++ b/src/util/ss/list_rqs.c
+@@ -21,15 +21,8 @@ static char const twentyfive_spaces[26] =
+ static char const NL[2] = "\n";
+ 
+ void
+-ss_list_requests(argc, argv, sci_idx, info_ptr)
+-    int argc;
+-    const char * const *argv;
+-    int sci_idx;
+-#ifdef __STDC__
+-    void *info_ptr;
+-#else
+-    char *info_ptr;
+-#endif
++ss_list_requests(int argc, const char * const *argv, int sci_idx,
++                 void *info_ptr)
+ {
+     ss_request_entry *entry;
+     char const *const *name;
+diff --git a/src/util/ss/listen.c b/src/util/ss/listen.c
+index fe18475447..79f258fbc4 100644
+--- a/src/util/ss/listen.c
++++ b/src/util/ss/listen.c
+@@ -28,7 +28,8 @@ static jmp_buf listen_jmpb;
+ 
+ #ifdef NO_READLINE
+ /* Dumb replacement for readline when we don't have support for a real one. */
+-static char *readline(const char *prompt)
++static char *
++readline(const char *prompt)
+ {
+     struct termios termbuf;
+     char input[BUFSIZ];
+@@ -49,20 +50,21 @@ static char *readline(const char *prompt)
+ }
+ 
+ /* No-op replacement for add_history() when we have no readline support. */
+-static void add_history(const char *line)
++static void
++add_history(const char *line)
+ {
+ }
+ #endif
+ 
+-static void listen_int_handler(signo)
+-    int signo;
++static void
++listen_int_handler(int signo)
+ {
+     putc('\n', stdout);
+     longjmp(listen_jmpb, 1);
+ }
+ 
+-int ss_listen (sci_idx)
+-    int sci_idx;
++int
++ss_listen(int sci_idx)
+ {
+     char *cp;
+     ss_data *info;
+@@ -83,12 +85,12 @@ int ss_listen (sci_idx)
+     info->abort = 0;
+ 
+ #ifdef POSIX_SIGNALS
+-    csig.sa_handler = (void (*)())0;
++    csig.sa_handler = (void (*)(int))0;
+     sigemptyset(&nmask);
+     sigaddset(&nmask, SIGINT);
+     sigprocmask(SIG_BLOCK, &nmask, &omask);
+ #else
+-    sig_cont = (void (*)())0;
++    sig_cont = (void (*)(int))0;
+     mask = sigblock(sigmask(SIGINT));
+ #endif
+ 
+@@ -115,7 +117,7 @@ int ss_listen (sci_idx)
+         nsig.sa_handler = listen_int_handler;   /* fgets is not signal-safe */
+         osig = csig;
+         sigaction(SIGCONT, &nsig, &csig);
+-        if ((void (*)())csig.sa_handler==(void (*)())listen_int_handler)
++        if ((void (*)(int))csig.sa_handler==(void (*)(int))listen_int_handler)
+             csig = osig;
+ #else
+         old_sig_cont = sig_cont;
+@@ -166,20 +168,16 @@ egress:
+     return code;
+ }
+ 
+-void ss_abort_subsystem(sci_idx, code)
+-    int sci_idx;
+-    int code;
++void
++ss_abort_subsystem(int sci_idx, int code)
+ {
+     ss_info(sci_idx)->abort = 1;
+     ss_info(sci_idx)->exit_status = code;
+ 
+ }
+ 
+-void ss_quit(argc, argv, sci_idx, infop)
+-    int argc;
+-    char const * const *argv;
+-    int sci_idx;
+-    pointer infop;
++void
++ss_quit(int argc, char const * const *argv, int sci_idx, pointer infop)
+ {
+     ss_abort_subsystem(sci_idx, 0);
+ }
+diff --git a/src/util/ss/pager.c b/src/util/ss/pager.c
+index 3e47ed3993..255c721ad1 100644
+--- a/src/util/ss/pager.c
++++ b/src/util/ss/pager.c
+@@ -10,13 +10,13 @@
+ #include "copyright.h"
+ #include <errno.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <signal.h>
+ 
+ static char MORE[] = "more";
+ extern char *_ss_pager_name;
+-extern char *getenv();
+ 
+ /*
+  * this needs a *lot* of work....
+@@ -25,10 +25,10 @@ extern char *getenv();
+  * handle SIGINT sensibly
+  * allow finer control -- put-page-break-here
+  */
+-void ss_page_stdin();
++void ss_page_stdin(void);
+ 
+ #ifndef NO_FORK
+-int ss_pager_create()
++int ss_pager_create(void)
+ {
+     int filedes[2];
+ 
+@@ -56,7 +56,7 @@ int ss_pager_create()
+     }
+ }
+ #else /* don't fork */
+-int ss_pager_create()
++int ss_pager_create(void)
+ {
+     int fd;
+     fd = open("/dev/tty", O_WRONLY, 0);
+@@ -66,7 +66,7 @@ int ss_pager_create()
+ }
+ #endif
+ 
+-void ss_page_stdin()
++void ss_page_stdin(void)
+ {
+     int i;
+ #ifdef POSIX_SIGNALS
+diff --git a/src/util/ss/parse.c b/src/util/ss/parse.c
+index 78a831bf36..6fb031cdcd 100644
+--- a/src/util/ss/parse.c
++++ b/src/util/ss/parse.c
+@@ -53,10 +53,8 @@ enum parse_mode { WHITESPACE, TOKEN, QUOTED_STRING };
+ #define NEW_ARGV(old,n) (char **)realloc((char *)old,                   \
+                                          (unsigned)(n+2)*sizeof(char*))
+ 
+-char **ss_parse (sci_idx, line_ptr, argc_ptr)
+-    int sci_idx;
+-    char *line_ptr;
+-    int *argc_ptr;
++char **
++ss_parse(int sci_idx, char *line_ptr, int *argc_ptr)
+ {
+     char **argv, *cp;
+     char **newargv;
+diff --git a/src/util/ss/prompt.c b/src/util/ss/prompt.c
+index 5aa2ad6140..48e57d6702 100644
+--- a/src/util/ss/prompt.c
++++ b/src/util/ss/prompt.c
+@@ -11,16 +11,13 @@
+ #include "ss_internal.h"
+ 
+ void
+-ss_set_prompt(sci_idx, new_prompt)
+-    int sci_idx;
+-    char *new_prompt;
++ss_set_prompt(int sci_idx, char *new_prompt)
+ {
+     ss_info(sci_idx)->prompt = new_prompt;
+ }
+ 
+ char *
+-ss_get_prompt(sci_idx)
+-    int sci_idx;
++ss_get_prompt(int sci_idx)
+ {
+     return(ss_info(sci_idx)->prompt);
+ }
+diff --git a/src/util/ss/request_tbl.c b/src/util/ss/request_tbl.c
+index 03cde1b7d0..fc4461bb00 100644
+--- a/src/util/ss/request_tbl.c
++++ b/src/util/ss/request_tbl.c
+@@ -11,11 +11,7 @@
+ #define ssrt ss_request_table   /* for some readable code... */
+ 
+ void
+-ss_add_request_table(sci_idx, rqtbl_ptr, position, code_ptr)
+-    int sci_idx;
+-    ssrt *rqtbl_ptr;
+-    int position;           /* 1 -> becomes second... */
+-    int *code_ptr;
++ss_add_request_table(int sci_idx, ssrt *rqtbl_ptr, int position, int *code_ptr)
+ {
+     ss_data *info;
+     int i, size;
+@@ -44,10 +40,7 @@ ss_add_request_table(sci_idx, rqtbl_ptr, position, code_ptr)
+ }
+ 
+ void
+-ss_delete_request_table(sci_idx, rqtbl_ptr, code_ptr)
+-    int sci_idx;
+-    ssrt *rqtbl_ptr;
+-    int *code_ptr;
++ss_delete_request_table(int sci_idx, ssrt *rqtbl_ptr, int *code_ptr)
+ {
+     ss_data *info;
+     ssrt **rt1, **rt2;
+diff --git a/src/util/ss/requests.c b/src/util/ss/requests.c
+index aa6752fa11..651f2201d2 100644
+--- a/src/util/ss/requests.c
++++ b/src/util/ss/requests.c
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include "ss_internal.h"
+ 
+-#define DECLARE(name)   void name(argc,argv,sci_idx,info_ptr)int argc,sci_idx;const char * const *argv; pointer info_ptr;
++#define DECLARE(name)   void name(int argc, const char *const *argv, int sci_idx, pointer info_ptr)
+ 
+ /*
+  * ss_self_identify -- assigned by default to the "." request
+diff --git a/src/util/ss/ss.h b/src/util/ss/ss.h
+index 38d8974e3c..faac0d97c1 100644
+--- a/src/util/ss/ss.h
++++ b/src/util/ss/ss.h
+@@ -48,7 +48,6 @@ typedef struct _ss_rp_options { /* DEFAULT VALUES */
+ void ss_help __SS_PROTO;
+ void ss_list_requests __SS_PROTO;
+ void ss_quit __SS_PROTO;
+-char *ss_current_request();
+ char *ss_name(int);
+ void ss_error (int, long, char const *, ...)
+ #if !defined(__cplusplus) && (__GNUC__ > 2)
+diff --git a/src/util/ss/ss_internal.h b/src/util/ss/ss_internal.h
+index 1f5ddfff91..cdd88af218 100644
+--- a/src/util/ss/ss_internal.h
++++ b/src/util/ss/ss_internal.h
+@@ -84,8 +84,7 @@ typedef struct _ss_data {       /* init values */
+ #define ss_info(sci_idx)        (_ss_table[sci_idx])
+ #define ss_current_request(sci_idx,code_ptr)            \
+     (*code_ptr=0,ss_info(sci_idx)->current_request)
+-void ss_unknown_function();
+-void ss_delete_info_dir();
++void ss_delete_info_dir(int, char *, int *);
+ char **ss_parse (int, char *, int *);
+ ss_abbrev_info *ss_abbrev_initialize (char *, int *);
+ void ss_page_stdin (void);
+diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
+index 0850565687..253b118dcb 100644
+--- a/src/util/support/plugins.c
++++ b/src/util/support/plugins.c
+@@ -240,13 +240,13 @@ krb5int_get_plugin_data(struct plugin_file_handle *h, const char *csymname,
+ 
+ long KRB5_CALLCONV
+ krb5int_get_plugin_func(struct plugin_file_handle *h, const char *csymname,
+-                        void (**sym_out)(), struct errinfo *ep)
++                        void (**sym_out)(void), struct errinfo *ep)
+ {
+     void *dptr = NULL;
+     long ret = get_sym(h, csymname, &dptr, ep);
+ 
+     if (!ret)
+-        *sym_out = (void (*)())dptr;
++        *sym_out = (void (*)(void))dptr;
+     return ret;
+ }
+ 
+@@ -552,7 +552,7 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *dirhandle,
+                              struct errinfo *ep)
+ {
+     long err = 0;
+-    void (**p)() = NULL;
++    void (**p)(void) = NULL;
+     size_t count = 0;
+ 
+     /* XXX Do we need to add a leading "_" to the symbol name on any
+@@ -569,10 +569,10 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *dirhandle,
+         int i = 0;
+ 
+         for (i = 0; !err && (dirhandle->files[i] != NULL); i++) {
+-            void (*sym)() = NULL;
++            void (*sym)(void) = NULL;
+ 
+             if (krb5int_get_plugin_func (dirhandle->files[i], symname, &sym, ep) == 0) {
+-                void (**newp)() = NULL;
++                void (**newp)(void) = NULL;
+ 
+                 count++;
+                 newp = realloc (p, ((count + 1) * sizeof (*p))); /* +1 for NULL */
+diff --git a/src/util/support/t_hashtab.c b/src/util/support/t_hashtab.c
+index f51abc4f19..d90d5d9d02 100644
+--- a/src/util/support/t_hashtab.c
++++ b/src/util/support/t_hashtab.c
+@@ -104,7 +104,7 @@ const uint64_t vectors[64] = {
+ };
+ 
+ static void
+-test_siphash()
++test_siphash(void)
+ {
+     uint8_t seq[64];
+     uint64_t k0, k1, hval;
+@@ -122,7 +122,7 @@ test_siphash()
+ }
+ 
+ static void
+-test_hashtab()
++test_hashtab(void)
+ {
+     int st;
+     struct k5_hashtab *ht;
+@@ -168,7 +168,7 @@ test_hashtab()
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     test_siphash();
+     test_hashtab();
+diff --git a/src/util/support/t_hex.c b/src/util/support/t_hex.c
+index a586a1bc89..40e6aa2327 100644
+--- a/src/util/support/t_hex.c
++++ b/src/util/support/t_hex.c
+@@ -137,7 +137,8 @@ struct {
+     { "F8F9FAFBFCFDFEFF", "\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF", 8, 1 },
+ };
+ 
+-int main()
++int
++main(void)
+ {
+     size_t i;
+     char *hex;
+diff --git a/src/util/support/t_json.c b/src/util/support/t_json.c
+index 1f229247b4..bacca6f8da 100644
+--- a/src/util/support/t_json.c
++++ b/src/util/support/t_json.c
+@@ -86,7 +86,7 @@ check(int pred, const char *str)
+ }
+ 
+ static void
+-test_array()
++test_array(void)
+ {
+     k5_json_string v1;
+     k5_json_number v2;
+diff --git a/src/util/support/t_k5buf.c b/src/util/support/t_k5buf.c
+index 734b2720c0..18e7e9b7be 100644
+--- a/src/util/support/t_k5buf.c
++++ b/src/util/support/t_k5buf.c
+@@ -54,7 +54,7 @@ check_buf(struct k5buf *buf, const char *name)
+ }
+ 
+ static void
+-test_basic()
++test_basic(void)
+ {
+     struct k5buf buf;
+     char storage[1024];
+@@ -76,7 +76,7 @@ test_basic()
+ }
+ 
+ static void
+-test_realloc()
++test_realloc(void)
+ {
+     struct k5buf buf;
+     char data[1024];
+@@ -132,7 +132,7 @@ test_realloc()
+ }
+ 
+ static void
+-test_overflow()
++test_overflow(void)
+ {
+     struct k5buf buf;
+     char storage[10];
+@@ -153,7 +153,7 @@ test_overflow()
+ }
+ 
+ static void
+-test_error()
++test_error(void)
+ {
+     struct k5buf buf;
+     char storage[1];
+@@ -173,7 +173,7 @@ test_error()
+ }
+ 
+ static void
+-test_truncate()
++test_truncate(void)
+ {
+     struct k5buf buf;
+ 
+@@ -188,7 +188,7 @@ test_truncate()
+ }
+ 
+ static void
+-test_binary()
++test_binary(void)
+ {
+     struct k5buf buf;
+     char data[] = { 'a', 0, 'b' }, *s;
+@@ -205,7 +205,7 @@ test_binary()
+ }
+ 
+ static void
+-test_fmt()
++test_fmt(void)
+ {
+     struct k5buf buf;
+     char storage[10], data[1024];
+@@ -246,7 +246,7 @@ test_fmt()
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     test_basic();
+     test_realloc();
+diff --git a/src/util/support/t_unal.c b/src/util/support/t_unal.c
+index f67cd31edf..6d097f0f83 100644
+--- a/src/util/support/t_unal.c
++++ b/src/util/support/t_unal.c
+@@ -2,7 +2,8 @@
+ #undef NDEBUG
+ #include "k5-platform.h"
+ 
+-int main ()
++int
++main(void)
+ {
+     /* Test some low-level assumptions the Kerberos code depends
+        on.  */
+-- 
+2.45.1
+
diff --git a/0017-Fix-two-unlikely-memory-leaks.patch b/0017-Fix-two-unlikely-memory-leaks.patch
new file mode 100644
index 0000000..09fedb7
--- /dev/null
+++ b/0017-Fix-two-unlikely-memory-leaks.patch
@@ -0,0 +1,206 @@
+From ee66c1feedb57ce06ce51aaa823f9a61f564c58e Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Tue, 5 Mar 2024 19:53:07 -0500
+Subject: [PATCH] Fix two unlikely memory leaks
+
+In gss_krb5int_make_seal_token_v3(), one of the bounds checks (which
+could probably never be triggered) leaks plain.data.  Fix this leak
+and use current practices for cleanup throughout the function.
+
+In xmt_rmtcallres() (unused within the tree and likely elsewhere),
+store port_ptr into crp->port_ptr as soon as it is allocated;
+otherwise it could leak if the subsequent xdr_u_int32() operation
+fails.
+
+(cherry picked from commit c5f9c816107f70139de11b38aa02db2f1774ee0d)
+---
+ src/lib/gssapi/krb5/k5sealv3.c | 56 +++++++++++++++-------------------
+ src/lib/rpc/pmap_rmt.c         | 10 +++---
+ 2 files changed, 29 insertions(+), 37 deletions(-)
+
+diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c
+index 1fcbdfbb87..d3210c1107 100644
+--- a/src/lib/gssapi/krb5/k5sealv3.c
++++ b/src/lib/gssapi/krb5/k5sealv3.c
+@@ -65,7 +65,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+                                 int conf_req_flag, int toktype)
+ {
+     size_t bufsize = 16;
+-    unsigned char *outbuf = 0;
++    unsigned char *outbuf = NULL;
+     krb5_error_code err;
+     int key_usage;
+     unsigned char acceptor_flag;
+@@ -75,9 +75,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+ #endif
+     size_t ec;
+     unsigned short tok_id;
+-    krb5_checksum sum;
++    krb5_checksum sum = { 0 };
+     krb5_key key;
+     krb5_cksumtype cksumtype;
++    krb5_data plain = empty_data();
++
++    token->value = NULL;
++    token->length = 0;
+ 
+     acceptor_flag = ctx->initiate ? 0 : FLAG_SENDER_IS_ACCEPTOR;
+     key_usage = (toktype == KG_TOK_WRAP_MSG
+@@ -107,14 +111,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+ #endif
+ 
+     if (toktype == KG_TOK_WRAP_MSG && conf_req_flag) {
+-        krb5_data plain;
+         krb5_enc_data cipher;
+         size_t ec_max;
+         size_t encrypt_size;
+ 
+         /* 300: Adds some slop.  */
+-        if (SIZE_MAX - 300 < message->length)
+-            return ENOMEM;
++        if (SIZE_MAX - 300 < message->length) {
++            err = ENOMEM;
++            goto cleanup;
++        }
+         ec_max = SIZE_MAX - message->length - 300;
+         if (ec_max > 0xffff)
+             ec_max = 0xffff;
+@@ -126,20 +131,20 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+ #endif
+         err = alloc_data(&plain, message->length + 16 + ec);
+         if (err)
+-            return err;
++            goto cleanup;
+ 
+         /* Get size of ciphertext.  */
+         encrypt_size = krb5_encrypt_size(plain.length, key->keyblock.enctype);
+         if (encrypt_size > SIZE_MAX / 2) {
+             err = ENOMEM;
+-            goto error;
++            goto cleanup;
+         }
+         bufsize = 16 + encrypt_size;
+         /* Allocate space for header plus encrypted data.  */
+         outbuf = gssalloc_malloc(bufsize);
+         if (outbuf == NULL) {
+-            free(plain.data);
+-            return ENOMEM;
++            err = ENOMEM;
++            goto cleanup;
+         }
+ 
+         /* TOK_ID */
+@@ -164,11 +169,8 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+         cipher.ciphertext.length = bufsize - 16;
+         cipher.enctype = key->keyblock.enctype;
+         err = krb5_k_encrypt(context, key, key_usage, 0, &plain, &cipher);
+-        zap(plain.data, plain.length);
+-        free(plain.data);
+-        plain.data = 0;
+         if (err)
+-            goto error;
++            goto cleanup;
+ 
+         /* Now that we know we're returning a valid token....  */
+         ctx->seq_send++;
+@@ -181,7 +183,6 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+         /* If the rotate fails, don't worry about it.  */
+ #endif
+     } else if (toktype == KG_TOK_WRAP_MSG && !conf_req_flag) {
+-        krb5_data plain;
+         size_t cksumsize;
+ 
+         /* Here, message is the application-supplied data; message2 is
+@@ -193,21 +194,19 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+     wrap_with_checksum:
+         err = alloc_data(&plain, message->length + 16);
+         if (err)
+-            return err;
++            goto cleanup;
+ 
+         err = krb5_c_checksum_length(context, cksumtype, &cksumsize);
+         if (err)
+-            goto error;
++            goto cleanup;
+ 
+         assert(cksumsize <= 0xffff);
+ 
+         bufsize = 16 + message2->length + cksumsize;
+         outbuf = gssalloc_malloc(bufsize);
+         if (outbuf == NULL) {
+-            free(plain.data);
+-            plain.data = 0;
+             err = ENOMEM;
+-            goto error;
++            goto cleanup;
+         }
+ 
+         /* TOK_ID */
+@@ -239,23 +238,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+         if (message2->length)
+             memcpy(outbuf + 16, message2->value, message2->length);
+ 
+-        sum.contents = outbuf + 16 + message2->length;
+-        sum.length = cksumsize;
+-
+         err = krb5_k_make_checksum(context, cksumtype, key,
+                                    key_usage, &plain, &sum);
+-        zap(plain.data, plain.length);
+-        free(plain.data);
+-        plain.data = 0;
+         if (err) {
+             zap(outbuf,bufsize);
+-            goto error;
++            goto cleanup;
+         }
+         if (sum.length != cksumsize)
+             abort();
+         memcpy(outbuf + 16 + message2->length, sum.contents, cksumsize);
+-        krb5_free_checksum_contents(context, &sum);
+-        sum.contents = 0;
+         /* Now that we know we're actually generating the token...  */
+         ctx->seq_send++;
+ 
+@@ -285,12 +276,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+ 
+     token->value = outbuf;
+     token->length = bufsize;
+-    return 0;
++    outbuf = NULL;
++    err = 0;
+ 
+-error:
++cleanup:
++    krb5_free_checksum_contents(context, &sum);
++    zapfree(plain.data, plain.length);
+     gssalloc_free(outbuf);
+-    token->value = NULL;
+-    token->length = 0;
+     return err;
+ }
+ 
+diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c
+index 434e4eea65..f55ca46c60 100644
+--- a/src/lib/rpc/pmap_rmt.c
++++ b/src/lib/rpc/pmap_rmt.c
+@@ -161,12 +161,12 @@ xdr_rmtcallres(
+ 	caddr_t port_ptr;
+ 
+ 	port_ptr = (caddr_t)(void *)crp->port_ptr;
+-	if (xdr_reference(xdrs, &port_ptr, sizeof (uint32_t),
+-			  (xdrproc_t)xdr_u_int32) &&
+-	    xdr_u_int32(xdrs, &crp->resultslen)) {
+-		crp->port_ptr = (uint32_t *)(void *)port_ptr;
++	if (!xdr_reference(xdrs, &port_ptr, sizeof (uint32_t),
++			   (xdrproc_t)xdr_u_int32))
++		return (FALSE);
++	crp->port_ptr = (uint32_t *)(void *)port_ptr;
++	if (xdr_u_int32(xdrs, &crp->resultslen))
+ 		return ((*(crp->xdr_results))(xdrs, crp->results_ptr));
+-	}
+ 	return (FALSE);
+ }
+ 
+-- 
+2.45.1
+
diff --git a/0018-Fix-unimportant-memory-leaks.patch b/0018-Fix-unimportant-memory-leaks.patch
new file mode 100644
index 0000000..0697f06
--- /dev/null
+++ b/0018-Fix-unimportant-memory-leaks.patch
@@ -0,0 +1,2316 @@
+From c8d8cab52172a934bdad1041448b43bc15acf441 Mon Sep 17 00:00:00 2001
+From: Steve Grubb <sgrubb@redhat.com>
+Date: Thu, 13 Jul 2023 16:22:30 -0400
+Subject: [PATCH] Fix unimportant memory leaks
+
+Eliminate memory leaks detected through static analysis and manual
+review.  These leaks are unlikely to happen repeatedly in long-running
+processes.
+
+[jrische@redhat.com: fixed many additional leaks]
+[ghudson@mit.edu: fixed additional leaks; edited for style; removed
+some unused ksu functions; rewrote commit message]
+
+(cherry picked from commit 6c5471176f5266564fbc8a7e02f03b4b042202f8)
+---
+ src/appl/gss-sample/gss-client.c              | 367 ++++++++----------
+ src/appl/gss-sample/gss-server.c              |   3 +-
+ src/clients/klist/klist.c                     |  59 +--
+ src/clients/ksu/authorization.c               | 134 +++----
+ src/clients/ksu/ccache.c                      | 283 +++++---------
+ src/clients/ksu/heuristic.c                   | 128 +++---
+ src/clients/ksu/krb_auth_su.c                 | 134 ++-----
+ src/clients/ksu/ksu.h                         |   6 -
+ src/clients/ksu/main.c                        |   3 +-
+ src/kadmin/cli/keytab.c                       |   6 +-
+ src/kadmin/ktutil/ktutil.c                    |   1 +
+ src/kprop/kpropd.c                            |  21 +-
+ src/lib/gssapi/krb5/export_cred.c             |   4 +-
+ src/lib/gssapi/krb5/val_cred.c                |   6 +-
+ src/lib/kadm5/srv/server_kdb.c                |   7 +-
+ src/lib/krb5/ccache/cc_kcm.c                  |   4 +
+ src/lib/krb5/ccache/ccfns.c                   |  12 +-
+ src/lib/krb5/keytab/kt_file.c                 |   3 +-
+ src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c |   8 +-
+ 19 files changed, 517 insertions(+), 672 deletions(-)
+
+diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c
+index 0722ae196f..2cfcfc6cc5 100644
+--- a/src/appl/gss-sample/gss-client.c
++++ b/src/appl/gss-sample/gss-client.c
+@@ -182,180 +182,148 @@ client_establish_context(int s, char *service_name, OM_uint32 gss_flags,
+                          char *username, char *password,
+                          gss_ctx_id_t *gss_context, OM_uint32 *ret_flags)
+ {
+-    if (auth_flag) {
+-        gss_buffer_desc send_tok, recv_tok, *token_ptr;
+-        gss_name_t target_name;
+-        OM_uint32 maj_stat, min_stat, init_sec_min_stat;
+-        int token_flags;
+-        gss_cred_id_t cred = GSS_C_NO_CREDENTIAL;
+-        gss_name_t gss_username = GSS_C_NO_NAME;
+-        gss_OID_set_desc mechs, *mechsp = GSS_C_NO_OID_SET;
+-
+-        if (spnego) {
+-            mechs.elements = &gss_spnego_mechanism_oid_desc;
+-            mechs.count = 1;
+-            mechsp = &mechs;
+-        } else if (oid != GSS_C_NO_OID) {
+-            mechs.elements = oid;
+-            mechs.count = 1;
+-            mechsp = &mechs;
+-        } else {
+-            mechs.elements = NULL;
+-            mechs.count = 0;
+-        }
++    int result = -1, st;
++    gss_buffer_desc send_tok, recv_tok, pwbuf, *token_ptr;
++    gss_name_t target_name = GSS_C_NO_NAME, gss_username = GSS_C_NO_NAME;
++    OM_uint32 maj_stat, min_stat, init_sec_min_stat;
++    int token_flags;
++    gss_cred_id_t cred = GSS_C_NO_CREDENTIAL;
++    gss_OID_set_desc mechs, neg_mechs, *mechsp = GSS_C_NO_OID_SET;
++
++    if (!auth_flag)
++        return send_token(s, TOKEN_NOOP, empty_token);
++
++    if (spnego) {
++        mechs.elements = &gss_spnego_mechanism_oid_desc;
++        mechs.count = 1;
++        mechsp = &mechs;
++    } else if (oid != GSS_C_NO_OID) {
++        mechs.elements = oid;
++        mechs.count = 1;
++        mechsp = &mechs;
++    } else {
++        mechs.elements = NULL;
++        mechs.count = 0;
++    }
+ 
+-        if (username != NULL) {
+-            send_tok.value = username;
+-            send_tok.length = strlen(username);
++    if (username != NULL) {
++        send_tok.value = username;
++        send_tok.length = strlen(username);
+ 
+-            maj_stat = gss_import_name(&min_stat, &send_tok,
+-                                       (gss_OID) gss_nt_user_name,
+-                                       &gss_username);
+-            if (maj_stat != GSS_S_COMPLETE) {
+-                display_status("parsing client name", maj_stat, min_stat);
+-                return -1;
+-            }
+-        }
+-
+-        if (password != NULL) {
+-            gss_buffer_desc pwbuf;
+-
+-            pwbuf.value = password;
+-            pwbuf.length = strlen(password);
+-
+-            maj_stat = gss_acquire_cred_with_password(&min_stat,
+-                                                      gss_username,
+-                                                      &pwbuf, 0,
+-                                                      mechsp, GSS_C_INITIATE,
+-                                                      &cred, NULL, NULL);
+-        } else if (gss_username != GSS_C_NO_NAME) {
+-            maj_stat = gss_acquire_cred(&min_stat,
+-                                        gss_username, 0,
+-                                        mechsp, GSS_C_INITIATE,
+-                                        &cred, NULL, NULL);
+-        } else
+-            maj_stat = GSS_S_COMPLETE;
++        maj_stat = gss_import_name(&min_stat, &send_tok,
++                                   (gss_OID) gss_nt_user_name, &gss_username);
+         if (maj_stat != GSS_S_COMPLETE) {
+-            display_status("acquiring creds", maj_stat, min_stat);
+-            gss_release_name(&min_stat, &gss_username);
+-            return -1;
++            display_status("parsing client name", maj_stat, min_stat);
++            goto cleanup;
+         }
+-        if (spnego && oid != GSS_C_NO_OID) {
+-            gss_OID_set_desc neg_mechs;
+-
+-            neg_mechs.elements = oid;
+-            neg_mechs.count = 1;
++    }
+ 
+-            maj_stat = gss_set_neg_mechs(&min_stat, cred, &neg_mechs);
+-            if (maj_stat != GSS_S_COMPLETE) {
+-                display_status("setting neg mechs", maj_stat, min_stat);
+-                gss_release_name(&min_stat, &gss_username);
+-                gss_release_cred(&min_stat, &cred);
+-                return -1;
+-            }
+-        }
+-        gss_release_name(&min_stat, &gss_username);
+-
+-        /*
+-         * Import the name into target_name.  Use send_tok to save
+-         * local variable space.
+-         */
+-        send_tok.value = service_name;
+-        send_tok.length = strlen(service_name);
+-        maj_stat = gss_import_name(&min_stat, &send_tok,
+-                                   (gss_OID) gss_nt_service_name,
+-                                   &target_name);
++    if (password != NULL) {
++        pwbuf.value = password;
++        pwbuf.length = strlen(password);
++
++        maj_stat = gss_acquire_cred_with_password(&min_stat, gss_username,
++                                                  &pwbuf, 0, mechsp,
++                                                  GSS_C_INITIATE, &cred, NULL,
++                                                  NULL);
++    } else if (gss_username != GSS_C_NO_NAME) {
++        maj_stat = gss_acquire_cred(&min_stat, gss_username, 0, mechsp,
++                                    GSS_C_INITIATE, &cred, NULL, NULL);
++    } else {
++        maj_stat = GSS_S_COMPLETE;
++    }
++    if (maj_stat != GSS_S_COMPLETE) {
++        display_status("acquiring creds", maj_stat, min_stat);
++        goto cleanup;
++    }
++    if (spnego && oid != GSS_C_NO_OID) {
++        neg_mechs.elements = oid;
++        neg_mechs.count = 1;
++        maj_stat = gss_set_neg_mechs(&min_stat, cred, &neg_mechs);
+         if (maj_stat != GSS_S_COMPLETE) {
+-            display_status("parsing name", maj_stat, min_stat);
+-            return -1;
++            display_status("setting neg mechs", maj_stat, min_stat);
++            goto cleanup;
+         }
++    }
+ 
+-        if (!v1_format) {
+-            if (send_token(s, TOKEN_NOOP | TOKEN_CONTEXT_NEXT, empty_token) <
+-                0) {
+-                (void) gss_release_name(&min_stat, &target_name);
+-                return -1;
+-            }
+-        }
++    /* Import the name into target_name.  Use send_tok to save local variable
++     * space. */
++    send_tok.value = service_name;
++    send_tok.length = strlen(service_name);
++    maj_stat = gss_import_name(&min_stat, &send_tok,
++                               (gss_OID) gss_nt_service_name, &target_name);
++    if (maj_stat != GSS_S_COMPLETE) {
++        display_status("parsing name", maj_stat, min_stat);
++        goto cleanup;
++    }
+ 
+-        /*
+-         * Perform the context-establishement loop.
+-         *
+-         * On each pass through the loop, token_ptr points to the token
+-         * to send to the server (or GSS_C_NO_BUFFER on the first pass).
+-         * Every generated token is stored in send_tok which is then
+-         * transmitted to the server; every received token is stored in
+-         * recv_tok, which token_ptr is then set to, to be processed by
+-         * the next call to gss_init_sec_context.
+-         *
+-         * GSS-API guarantees that send_tok's length will be non-zero
+-         * if and only if the server is expecting another token from us,
+-         * and that gss_init_sec_context returns GSS_S_CONTINUE_NEEDED if
+-         * and only if the server has another token to send us.
+-         */
+-
+-        token_ptr = GSS_C_NO_BUFFER;
+-        *gss_context = GSS_C_NO_CONTEXT;
+-
+-        do {
+-            maj_stat = gss_init_sec_context(&init_sec_min_stat,
+-                                            cred, gss_context,
+-                                            target_name, mechs.elements,
+-                                            gss_flags, 0,
+-                                            NULL, /* channel bindings */
+-                                            token_ptr, NULL, /* mech type */
+-                                            &send_tok, ret_flags,
+-                                            NULL);  /* time_rec */
+-
+-            if (token_ptr != GSS_C_NO_BUFFER)
+-                free(recv_tok.value);
+-
+-            if (send_tok.length != 0) {
+-                if (verbose)
+-                    printf("Sending init_sec_context token (size=%d)...",
+-                           (int) send_tok.length);
+-                if (send_token(s, v1_format ? 0 : TOKEN_CONTEXT, &send_tok) <
+-                    0) {
+-                    (void) gss_release_buffer(&min_stat, &send_tok);
+-                    (void) gss_release_name(&min_stat, &target_name);
+-                    return -1;
+-                }
++    if (!v1_format) {
++        if (send_token(s, TOKEN_NOOP | TOKEN_CONTEXT_NEXT, empty_token) < 0)
++            goto cleanup;
++    }
++
++    /*
++     * Perform the context-establishment loop.
++     *
++     * On each pass through the loop, token_ptr points to the token to send to
++     * the server (or GSS_C_NO_BUFFER on the first pass).  Every generated
++     * token is stored in send_tok which is then transmitted to the server;
++     * every received token is stored in recv_tok, which token_ptr is then set
++     * to, to be processed by the next call to gss_init_sec_context.
++     *
++     * GSS-API guarantees that send_tok's length will be non-zero if and only
++     * if the server is expecting another token from us, and that
++     * gss_init_sec_context returns GSS_S_CONTINUE_NEEDED if and only if the
++     * server has another token to send us.
++     */
++
++    token_ptr = GSS_C_NO_BUFFER;
++    *gss_context = GSS_C_NO_CONTEXT;
++
++    do {
++        maj_stat = gss_init_sec_context(&init_sec_min_stat, cred, gss_context,
++                                        target_name, mechs.elements, gss_flags,
++                                        0, NULL, token_ptr, NULL, &send_tok,
++                                        ret_flags, NULL);
++
++        if (token_ptr != GSS_C_NO_BUFFER)
++            free(recv_tok.value);
++
++        if (send_tok.length > 0) {
++            if (verbose) {
++                printf("Sending init_sec_context token (size=%d)...",
++                       (int) send_tok.length);
+             }
++            st = send_token(s, v1_format ? 0 : TOKEN_CONTEXT, &send_tok);
+             (void) gss_release_buffer(&min_stat, &send_tok);
++            if (st < 0)
++                goto cleanup;
++        }
+ 
+-            if (maj_stat != GSS_S_COMPLETE
+-                && maj_stat != GSS_S_CONTINUE_NEEDED) {
+-                display_status("initializing context", maj_stat,
+-                               init_sec_min_stat);
+-                (void) gss_release_name(&min_stat, &target_name);
+-                (void) gss_release_cred(&min_stat, &cred);
+-                if (*gss_context != GSS_C_NO_CONTEXT)
+-                    gss_delete_sec_context(&min_stat, gss_context,
+-                                           GSS_C_NO_BUFFER);
+-                return -1;
+-            }
++        if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) {
++            display_status("initializing context", maj_stat,
++                           init_sec_min_stat);
++            goto cleanup;
++        }
+ 
+-            if (maj_stat == GSS_S_CONTINUE_NEEDED) {
+-                if (verbose)
+-                    printf("continue needed...");
+-                if (recv_token(s, &token_flags, &recv_tok) < 0) {
+-                    (void) gss_release_name(&min_stat, &target_name);
+-                    return -1;
+-                }
+-                token_ptr = &recv_tok;
+-            }
++        if (maj_stat == GSS_S_CONTINUE_NEEDED) {
+             if (verbose)
+-                printf("\n");
+-        } while (maj_stat == GSS_S_CONTINUE_NEEDED);
++                printf("continue needed...");
++            if (recv_token(s, &token_flags, &recv_tok) < 0)
++                goto cleanup;
++            token_ptr = &recv_tok;
++        }
++        if (verbose)
++            printf("\n");
++    } while (maj_stat == GSS_S_CONTINUE_NEEDED);
+ 
+-        (void) gss_release_cred(&min_stat, &cred);
+-        (void) gss_release_name(&min_stat, &target_name);
+-    } else {
+-        if (send_token(s, TOKEN_NOOP, empty_token) < 0)
+-            return -1;
+-    }
++    result = 0;
+ 
+-    return 0;
++cleanup:
++    (void) gss_release_name(&min_stat, &gss_username);
++    (void) gss_release_cred(&min_stat, &cred);
++    (void) gss_release_name(&min_stat, &target_name);
++    return result;
+ }
+ 
+ static void
+@@ -436,11 +404,11 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+ {
+     gss_ctx_id_t context = GSS_C_NO_CONTEXT;
+     gss_buffer_desc in_buf, out_buf;
+-    int     s, state;
++    int     s = -1, result = -1, state;
+     OM_uint32 ret_flags;
+     OM_uint32 maj_stat, min_stat;
+-    gss_name_t src_name, targ_name;
+-    gss_buffer_desc sname, tname;
++    gss_name_t src_name = GSS_C_NO_NAME, targ_name = GSS_C_NO_NAME;
++    gss_buffer_desc sname = GSS_C_EMPTY_BUFFER, tname = GSS_C_EMPTY_BUFFER;
+     OM_uint32 lifetime;
+     gss_OID mechanism, name_type;
+     int     is_local;
+@@ -454,14 +422,13 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+ 
+     /* Open connection */
+     if ((s = connect_to_server(host, port)) < 0)
+-        return -1;
++        goto cleanup;
+ 
+     /* Establish context */
+     if (client_establish_context(s, service_name, gss_flags, auth_flag,
+                                  v1_format, oid, username, password,
+                                  &context, &ret_flags) < 0) {
+-        (void) closesocket(s);
+-        return -1;
++        goto cleanup;
+     }
+ 
+     if (auth_flag && verbose) {
+@@ -475,19 +442,19 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+                                        &is_local, &is_open);
+         if (maj_stat != GSS_S_COMPLETE) {
+             display_status("inquiring context", maj_stat, min_stat);
+-            return -1;
++            goto cleanup;
+         }
+ 
+         maj_stat = gss_display_name(&min_stat, src_name, &sname, &name_type);
+         if (maj_stat != GSS_S_COMPLETE) {
+             display_status("displaying source name", maj_stat, min_stat);
+-            return -1;
++            goto cleanup;
+         }
+         maj_stat = gss_display_name(&min_stat, targ_name, &tname,
+                                     (gss_OID *) NULL);
+         if (maj_stat != GSS_S_COMPLETE) {
+             display_status("displaying target name", maj_stat, min_stat);
+-            return -1;
++            goto cleanup;
+         }
+         printf("\"%.*s\" to \"%.*s\", lifetime %d, flags %x, %s, %s\n",
+                (int) sname.length, (char *) sname.value,
+@@ -496,15 +463,10 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+                (is_local) ? "locally initiated" : "remotely initiated",
+                (is_open) ? "open" : "closed");
+ 
+-        (void) gss_release_name(&min_stat, &src_name);
+-        (void) gss_release_name(&min_stat, &targ_name);
+-        (void) gss_release_buffer(&min_stat, &sname);
+-        (void) gss_release_buffer(&min_stat, &tname);
+-
+         maj_stat = gss_oid_to_str(&min_stat, name_type, &oid_name);
+         if (maj_stat != GSS_S_COMPLETE) {
+             display_status("converting oid->string", maj_stat, min_stat);
+-            return -1;
++            goto cleanup;
+         }
+         printf("Name type of source name is %.*s.\n",
+                (int) oid_name.length, (char *) oid_name.value);
+@@ -515,13 +477,13 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+                                               mechanism, &mech_names);
+         if (maj_stat != GSS_S_COMPLETE) {
+             display_status("inquiring mech names", maj_stat, min_stat);
+-            return -1;
++            goto cleanup;
+         }
+ 
+         maj_stat = gss_oid_to_str(&min_stat, mechanism, &oid_name);
+         if (maj_stat != GSS_S_COMPLETE) {
+             display_status("converting oid->string", maj_stat, min_stat);
+-            return -1;
++            goto cleanup;
+         }
+         printf("Mechanism %.*s supports %d names\n",
+                (int) oid_name.length, (char *) oid_name.value,
+@@ -533,7 +495,7 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+                                       &mech_names->elements[i], &oid_name);
+             if (maj_stat != GSS_S_COMPLETE) {
+                 display_status("converting oid->string", maj_stat, min_stat);
+-                return -1;
++                goto cleanup;
+             }
+             printf("  %d: %.*s\n", (int) i,
+                    (int) oid_name.length, (char *) oid_name.value);
+@@ -558,10 +520,7 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+                          &in_buf, &state, &out_buf);
+             if (maj_stat != GSS_S_COMPLETE) {
+                 display_status("wrapping message", maj_stat, min_stat);
+-                (void) closesocket(s);
+-                (void) gss_delete_sec_context(&min_stat, &context,
+-                                              GSS_C_NO_BUFFER);
+-                return -1;
++                goto cleanup;
+             } else if (encrypt_flag && !state) {
+                 fprintf(stderr, "Warning!  Message not encrypted.\n");
+             }
+@@ -575,22 +534,15 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+                               (wrap_flag ? TOKEN_WRAPPED : 0) |
+                               (encrypt_flag ? TOKEN_ENCRYPTED : 0) |
+                               (mic_flag ? TOKEN_SEND_MIC : 0))),
+-                       &out_buf) < 0) {
+-            (void) closesocket(s);
+-            (void) gss_delete_sec_context(&min_stat, &context,
+-                                          GSS_C_NO_BUFFER);
+-            return -1;
+-        }
++                       &out_buf) < 0)
++            goto cleanup;
++
+         if (out_buf.value != in_buf.value)
+             (void) gss_release_buffer(&min_stat, &out_buf);
+ 
+         /* Read signature block into out_buf */
+-        if (recv_token(s, &token_flags, &out_buf) < 0) {
+-            (void) closesocket(s);
+-            (void) gss_delete_sec_context(&min_stat, &context,
+-                                          GSS_C_NO_BUFFER);
+-            return -1;
+-        }
++        if (recv_token(s, &token_flags, &out_buf) < 0)
++            goto cleanup;
+ 
+         if (mic_flag) {
+             /* Verify signature block */
+@@ -598,10 +550,7 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+                                       &out_buf, &qop_state);
+             if (maj_stat != GSS_S_COMPLETE) {
+                 display_status("verifying signature", maj_stat, min_stat);
+-                (void) closesocket(s);
+-                (void) gss_delete_sec_context(&min_stat, &context,
+-                                              GSS_C_NO_BUFFER);
+-                return -1;
++                goto cleanup;
+             }
+ 
+             if (verbose)
+@@ -621,23 +570,17 @@ call_server(char *host, u_short port, gss_OID oid, char *service_name,
+     if (!v1_format)
+         (void) send_token(s, TOKEN_NOOP, empty_token);
+ 
+-    if (auth_flag) {
+-        /* Delete context */
+-        maj_stat = gss_delete_sec_context(&min_stat, &context, &out_buf);
+-        if (maj_stat != GSS_S_COMPLETE) {
+-            display_status("deleting context", maj_stat, min_stat);
+-            (void) closesocket(s);
+-            (void) gss_delete_sec_context(&min_stat, &context,
+-                                          GSS_C_NO_BUFFER);
+-            return -1;
+-        }
+-
+-        (void) gss_release_buffer(&min_stat, &out_buf);
+-    }
+-
+-    (void) closesocket(s);
++    result = 0;
+ 
+-    return 0;
++cleanup:
++    (void) gss_release_name(&min_stat, &src_name);
++    (void) gss_release_name(&min_stat, &targ_name);
++    (void) gss_release_buffer(&min_stat, &sname);
++    (void) gss_release_buffer(&min_stat, &tname);
++    (void) gss_delete_sec_context(&min_stat, &context, GSS_C_NO_BUFFER);
++    if (s >= 0)
++        (void) closesocket(s);
++    return result;
+ }
+ 
+ static void
+diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c
+index 0e9c857e56..4ba864d9fb 100644
+--- a/src/appl/gss-sample/gss-server.c
++++ b/src/appl/gss-sample/gss-server.c
+@@ -138,13 +138,12 @@ server_acquire_creds(char *service_name, gss_OID mech,
+     }
+     maj_stat = gss_acquire_cred(&min_stat, server_name, 0, mechs, GSS_C_ACCEPT,
+                                 server_creds, NULL, NULL);
++    (void) gss_release_name(&min_stat, &server_name);
+     if (maj_stat != GSS_S_COMPLETE) {
+         display_status("acquiring credentials", maj_stat, min_stat);
+         return -1;
+     }
+ 
+-    (void) gss_release_name(&min_stat, &server_name);
+-
+     return 0;
+ }
+ 
+diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
+index c797b1698f..b5ae96a843 100644
+--- a/src/clients/klist/klist.c
++++ b/src/clients/klist/klist.c
+@@ -469,20 +469,21 @@ do_ccache()
+ static int
+ show_ccache(krb5_ccache cache)
+ {
+-    krb5_cc_cursor cur;
++    krb5_cc_cursor cur = NULL;
+     krb5_creds creds;
+-    krb5_principal princ;
++    krb5_principal princ = NULL;
+     krb5_error_code ret;
++    int status = 1;
+ 
+     ret = krb5_cc_get_principal(context, cache, &princ);
+     if (ret) {
+         com_err(progname, ret, "");
+-        return 1;
++        goto cleanup;
+     }
+     ret = krb5_unparse_name(context, princ, &defname);
+     if (ret) {
+         com_err(progname, ret, _("while unparsing principal name"));
+-        return 1;
++        goto cleanup;
+     }
+ 
+     printf(_("Ticket cache: %s:%s\nDefault principal: %s\n\n"),
+@@ -498,27 +499,33 @@ show_ccache(krb5_ccache cache)
+     ret = krb5_cc_start_seq_get(context, cache, &cur);
+     if (ret) {
+         com_err(progname, ret, _("while starting to retrieve tickets"));
+-        return 1;
++        goto cleanup;
+     }
+     while ((ret = krb5_cc_next_cred(context, cache, &cur, &creds)) == 0) {
+         if (show_config || !krb5_is_config_principal(context, creds.server))
+             show_credential(&creds);
+         krb5_free_cred_contents(context, &creds);
+     }
+-    krb5_free_principal(context, princ);
+-    krb5_free_unparsed_name(context, defname);
+-    defname = NULL;
+     if (ret == KRB5_CC_END) {
+         ret = krb5_cc_end_seq_get(context, cache, &cur);
++        cur = NULL;
+         if (ret) {
+             com_err(progname, ret, _("while finishing ticket retrieval"));
+-            return 1;
++            goto cleanup;
+         }
+-        return 0;
+     } else {
+         com_err(progname, ret, _("while retrieving a ticket"));
+-        return 1;
++        goto cleanup;
+     }
++
++    status = 0;
++
++cleanup:
++    if (cur != NULL)
++        (void)krb5_cc_end_seq_get(context, cache, &cur);
++    krb5_free_principal(context, princ);
++    krb5_free_unparsed_name(context, defname);
++    return status;
+ }
+ 
+ /* Return 0 if cache is accessible, present, and unexpired; return 1 if not. */
+@@ -526,15 +533,18 @@ static int
+ check_ccache(krb5_ccache cache)
+ {
+     krb5_error_code ret;
+-    krb5_cc_cursor cur;
++    krb5_cc_cursor cur = NULL;
+     krb5_creds creds;
+-    krb5_principal princ;
+-    krb5_boolean found_tgt, found_current_tgt, found_current_cred;
++    krb5_principal princ = NULL;
++    krb5_boolean found_tgt = FALSE, found_current_tgt = FALSE;
++    krb5_boolean found_current_cred = FALSE;
+ 
+-    if (krb5_cc_get_principal(context, cache, &princ) != 0)
+-        return 1;
+-    if (krb5_cc_start_seq_get(context, cache, &cur) != 0)
+-        return 1;
++    ret = krb5_cc_get_principal(context, cache, &princ);
++    if (ret)
++        goto cleanup;
++    ret = krb5_cc_start_seq_get(context, cache, &cur);
++    if (ret)
++        goto cleanup;
+     found_tgt = found_current_tgt = found_current_cred = FALSE;
+     while ((ret = krb5_cc_next_cred(context, cache, &cur, &creds)) == 0) {
+         if (is_local_tgt(creds.server, &princ->realm)) {
+@@ -547,12 +557,17 @@ check_ccache(krb5_ccache cache)
+         }
+         krb5_free_cred_contents(context, &creds);
+     }
+-    krb5_free_principal(context, princ);
+     if (ret != KRB5_CC_END)
+-        return 1;
+-    if (krb5_cc_end_seq_get(context, cache, &cur) != 0)
+-        return 1;
++        goto cleanup;
++    ret = krb5_cc_end_seq_get(context, cache, &cur);
++    cur = NULL;
+ 
++cleanup:
++    if (cur != NULL)
++        (void)krb5_cc_end_seq_get(context, cache, &cur);
++    krb5_free_principal(context, princ);
++    if (ret)
++        return 1;
+     /* If the cache contains at least one local TGT, require that it be
+      * current.  Otherwise accept any current cred. */
+     if (found_tgt)
+diff --git a/src/clients/ksu/authorization.c b/src/clients/ksu/authorization.c
+index 17a8a8f2f0..1f2650c2ab 100644
+--- a/src/clients/ksu/authorization.c
++++ b/src/clients/ksu/authorization.c
+@@ -28,7 +28,17 @@
+ 
+ #include "ksu.h"
+ 
+-static void auth_cleanup (FILE *, FILE *, char *);
++static void
++free_fcmd_list(char **list)
++{
++    size_t i;
++
++    if (list == NULL)
++        return;
++    for (i = 0; i < MAX_CMD && list[i] != NULL; i++)
++        free(list[i]);
++    free(list);
++}
+ 
+ krb5_boolean
+ fowner(FILE *fp, uid_t uid)
+@@ -52,10 +62,10 @@ fowner(FILE *fp, uid_t uid)
+ 
+ /*
+  * Given a Kerberos principal "principal", and a local username "luser",
+- * determine whether user is authorized to login according to the
+- * authorization files ~luser/.k5login" and ~luser/.k5users.  Returns TRUE
+- * if authorized, FALSE if not authorized.
+- *
++ * determine whether user is authorized to login according to the authorization
++ * files ~luser/.k5login" and ~luser/.k5users.  Set *ok to TRUE if authorized,
++ * FALSE if not authorized.  Return 0 if the authorization check succeeded
++ * (regardless of its result), non-zero if it encountered an error.
+  */
+ 
+ krb5_error_code
+@@ -64,7 +74,7 @@ krb5_authorization(krb5_context context, krb5_principal principal,
+                    char **out_fcmd)
+ {
+     struct passwd *pwd;
+-    char *princname;
++    char *princname = NULL;
+     int k5login_flag =0;
+     int k5users_flag =0;
+     krb5_boolean retbool =FALSE;
+@@ -76,7 +86,7 @@ krb5_authorization(krb5_context context, krb5_principal principal,
+ 
+     /* no account => no access */
+     if ((pwd = getpwnam(luser)) == NULL)
+-        return 0;
++        goto cleanup;
+ 
+     retval = krb5_unparse_name(context, principal, &princname);
+     if (retval)
+@@ -93,22 +103,19 @@ krb5_authorization(krb5_context context, krb5_principal principal,
+ 
+     /* k5login and k5users must be owned by target user or root */
+     if (!k5login_flag){
+-        if ((login_fp = fopen(k5login_path, "r")) == NULL)
+-            return 0;
+-        if ( fowner(login_fp, pwd->pw_uid) == FALSE) {
+-            fclose(login_fp);
+-            return 0;
+-        }
++        login_fp = fopen(k5login_path, "r");
++        if (login_fp == NULL)
++            goto cleanup;
++        if (fowner(login_fp, pwd->pw_uid) == FALSE)
++            goto cleanup;
+     }
+ 
+     if (!k5users_flag){
+-        if ((users_fp = fopen(k5users_path, "r")) == NULL) {
+-            return 0;
+-        }
+-        if ( fowner(users_fp, pwd->pw_uid) == FALSE){
+-            fclose(users_fp);
+-            return 0;
+-        }
++        users_fp = fopen(k5users_path, "r");
++        if (users_fp == NULL)
++            goto cleanup;
++        if (fowner(users_fp, pwd->pw_uid) == FALSE)
++            goto cleanup;
+     }
+ 
+     if (auth_debug){
+@@ -127,10 +134,8 @@ krb5_authorization(krb5_context context, krb5_principal principal,
+                     princname);
+ 
+         retval = k5login_lookup(login_fp,  princname, &retbool);
+-        if (retval) {
+-            auth_cleanup(users_fp, login_fp, princname);
+-            return retval;
+-        }
++        if (retval)
++            goto cleanup;
+         if (retbool) {
+             if (cmd)
+                 *out_fcmd = xstrdup(cmd);
+@@ -140,10 +145,8 @@ krb5_authorization(krb5_context context, krb5_principal principal,
+     if ((!k5users_flag) && (retbool == FALSE) ){
+         retval = k5users_lookup (users_fp, princname,
+                                  cmd, &retbool, out_fcmd);
+-        if(retval) {
+-            auth_cleanup(users_fp, login_fp, princname);
+-            return retval;
+-        }
++        if (retval)
++            goto cleanup;
+     }
+ 
+     if (k5login_flag && k5users_flag){
+@@ -159,8 +162,14 @@ krb5_authorization(krb5_context context, krb5_principal principal,
+     }
+ 
+     *ok =retbool;
+-    auth_cleanup(users_fp, login_fp, princname);
+-    return 0;
++
++cleanup:
++    if (users_fp != NULL)
++        fclose(users_fp);
++    if (login_fp != NULL)
++        fclose(login_fp);
++    free(princname);
++    return retval;
+ }
+ 
+ /***********************************************************
+@@ -320,10 +329,11 @@ krb5_boolean
+ fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+ {
+     char * err;
+-    char ** tmp_fcmd;
++    char ** tmp_fcmd = NULL;
+     char * path_ptr, *path;
+     char * lp, * tc;
+     int i=0;
++    krb5_boolean ok = FALSE;
+ 
+     tmp_fcmd = (char **) xcalloc (MAX_CMD, sizeof(char *));
+ 
+@@ -331,7 +341,7 @@ fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+         tmp_fcmd[0] = xstrdup(fcmd);
+         tmp_fcmd[1] = NULL;
+         *out_fcmd = tmp_fcmd;
+-        return TRUE;
++        tmp_fcmd = NULL;
+     }else{
+         /* must be either full path or just the cmd name */
+         if (strchr(fcmd, '/')){
+@@ -339,7 +349,7 @@ fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+                              "either full path or just the cmd name\n"),
+                      fcmd, KRB5_USERS_NAME);
+             *out_err = err;
+-            return FALSE;
++            goto cleanup;
+         }
+ 
+ #ifndef CMD_PATH
+@@ -347,7 +357,7 @@ fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+                          "the cmd name, CMD_PATH must be defined \n"),
+                  fcmd, KRB5_USERS_NAME, fcmd);
+         *out_err = err;
+-        return FALSE;
++        goto cleanup;
+ #else
+ 
+         path = xstrdup (CMD_PATH);
+@@ -361,7 +371,7 @@ fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+             asprintf(&err, _("Error: bad entry - %s in %s file, CMD_PATH "
+                              "contains no paths \n"), fcmd, KRB5_USERS_NAME);
+             *out_err = err;
+-            return FALSE;
++            goto cleanup;
+         }
+ 
+         i=0;
+@@ -370,7 +380,7 @@ fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+                 asprintf(&err, _("Error: bad path %s in CMD_PATH for %s must "
+                                  "start with '/' \n"), tc, KRB5_USERS_NAME );
+                 *out_err = err;
+-                return FALSE;
++                goto cleanup;
+             }
+ 
+             tmp_fcmd[i] = xasprintf("%s/%s", tc, fcmd);
+@@ -381,10 +391,15 @@ fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+ 
+         tmp_fcmd[i] = NULL;
+         *out_fcmd = tmp_fcmd;
+-        return TRUE;
+-
++        tmp_fcmd = NULL;
+ #endif /* CMD_PATH */
+     }
++
++    ok = TRUE;
++
++cleanup:
++    free_fcmd_list(tmp_fcmd);
++    return ok;
+ }
+ 
+ /********************************************
+@@ -503,41 +518,42 @@ int
+ match_commands(char *fcmd, char *cmd, krb5_boolean *match,
+                char **cmd_out, char **err_out)
+ {
+-    char ** fcmd_arr;
++    char ** fcmd_arr = NULL;
+     char * err;
+     char * cmd_temp;
++    int result = 1;
+ 
+     if(fcmd_resolve(fcmd, &fcmd_arr, &err )== FALSE ){
+         *err_out = err;
+-        return 1;
++        goto cleanup;
+     }
+ 
+     if (cmd_single( cmd ) == TRUE){
+         if (!cmd_arr_cmp_postfix(fcmd_arr, cmd)){ /* found */
+-
+-            if(find_first_cmd_that_exists( fcmd_arr,&cmd_temp,&err)== TRUE){
+-                *match = TRUE;
+-                *cmd_out = cmd_temp;
+-                return 0;
+-            }else{
++            if (!find_first_cmd_that_exists(fcmd_arr, &cmd_temp, &err)) {
+                 *err_out = err;
+-                return 1;
++                goto cleanup;
+             }
+-        }else{
++
++            *match = TRUE;
++            *cmd_out = cmd_temp;
++        } else {
+             *match = FALSE;
+-            return 0;
+         }
+     }else{
+         if (!cmd_arr_cmp(fcmd_arr, cmd)){  /* found */
+             *match = TRUE;
+             *cmd_out = xstrdup(cmd);
+-            return 0;
+         } else{
+             *match = FALSE;
+-            return 0;
+         }
+     }
+ 
++    result = 0;
++
++cleanup:
++    free_fcmd_list(fcmd_arr);
++    return result;
+ }
+ 
+ /*********************************************************
+@@ -563,10 +579,7 @@ get_line(FILE *fp, char **out_line)
+         }
+         else {
+             chunk_count ++;
+-            if(!( line = (char *) realloc( line,
+-                                           chunk_count * sizeof(char) * BUFSIZ))){
+-                return  ENOMEM;
+-            }
++            line = xrealloc(line, chunk_count * BUFSIZ);
+ 
+             line_ptr = line + (BUFSIZ -1) *( chunk_count -1) ;
+         }
+@@ -652,17 +665,6 @@ get_next_token (char **lnext)
+     return out_ptr;
+ }
+ 
+-static void
+-auth_cleanup(FILE *users_fp, FILE *login_fp, char *princname)
+-{
+-
+-    free (princname);
+-    if (users_fp)
+-        fclose(users_fp);
+-    if (login_fp)
+-        fclose(login_fp);
+-}
+-
+ void
+ init_auth_names(char *pw_dir)
+ {
+diff --git a/src/clients/ksu/ccache.c b/src/clients/ksu/ccache.c
+index cca9ce2dfc..76cb1d6aa4 100644
+--- a/src/clients/ksu/ccache.c
++++ b/src/clients/ksu/ccache.c
+@@ -40,6 +40,18 @@ copies the default cache into the secondary cache,
+ 
+ ************************************************************************/
+ 
++static void
++free_creds_list(krb5_context context, krb5_creds **list)
++{
++    size_t i;
++
++    if (list == NULL)
++        return;
++    for (i = 0; list[i]; i++)
++        krb5_free_creds(context, list[i]);
++    free(list);
++}
++
+ void show_credential(krb5_context, krb5_creds *, krb5_ccache);
+ 
+ /* modifies only the cc_other, the algorithm may look a bit funny,
+@@ -53,20 +65,19 @@ krb5_ccache_copy(krb5_context context, krb5_ccache cc_def,
+                  krb5_boolean restrict_creds, krb5_principal primary_principal,
+                  krb5_boolean *stored)
+ {
+-    int i=0;
+     krb5_error_code retval=0;
+     krb5_creds ** cc_def_creds_arr = NULL;
+     krb5_creds ** cc_other_creds_arr = NULL;
+ 
+     if (ks_ccache_is_initialized(context, cc_def)) {
+-        if((retval = krb5_get_nonexp_tkts(context,cc_def,&cc_def_creds_arr))){
+-            return retval;
+-        }
++        retval = krb5_get_nonexp_tkts(context, cc_def, &cc_def_creds_arr);
++        if (retval)
++            goto cleanup;
+     }
+ 
+     retval = krb5_cc_initialize(context, cc_target, target_principal);
+     if (retval)
+-        return retval;
++        goto cleanup;
+ 
+     if (restrict_creds) {
+         retval = krb5_store_some_creds(context, cc_target, cc_def_creds_arr,
+@@ -79,22 +90,9 @@ krb5_ccache_copy(krb5_context context, krb5_ccache cc_def,
+                                       cc_other_creds_arr);
+     }
+ 
+-    if (cc_def_creds_arr){
+-        while (cc_def_creds_arr[i]){
+-            krb5_free_creds(context, cc_def_creds_arr[i]);
+-            i++;
+-        }
+-    }
+-
+-    i=0;
+-
+-    if(cc_other_creds_arr){
+-        while (cc_other_creds_arr[i]){
+-            krb5_free_creds(context, cc_other_creds_arr[i]);
+-            i++;
+-        }
+-    }
+-
++cleanup:
++    free_creds_list(context, cc_def_creds_arr);
++    free_creds_list(context, cc_other_creds_arr);
+     return retval;
+ }
+ 
+@@ -184,32 +182,29 @@ krb5_get_nonexp_tkts(krb5_context context, krb5_ccache cc,
+ {
+ 
+     krb5_creds creds, temp_tktq, temp_tkt;
+-    krb5_creds **temp_creds;
++    krb5_creds **temp_creds = NULL;
+     krb5_error_code retval=0;
+     krb5_cc_cursor cur;
+     int count = 0;
+     int chunk_count = 1;
+ 
+-    if ( ! ( temp_creds = (krb5_creds **) malloc( CHUNK * sizeof(krb5_creds *)))){
+-        return ENOMEM;
+-    }
+-
+-
++    temp_creds = xcalloc(CHUNK, sizeof(*temp_creds));
+     memset(&temp_tktq, 0, sizeof(temp_tktq));
+     memset(&temp_tkt, 0, sizeof(temp_tkt));
+     memset(&creds, 0, sizeof(creds));
+ 
+     /* initialize the cursor */
+-    if ((retval = krb5_cc_start_seq_get(context, cc, &cur))) {
+-        return retval;
+-    }
++    retval = krb5_cc_start_seq_get(context, cc, &cur);
++    if (retval)
++        goto cleanup;
+ 
+     while (!(retval = krb5_cc_next_cred(context, cc, &cur, &creds))){
+ 
+         if (!krb5_is_config_principal(context, creds.server) &&
+             (retval = krb5_check_exp(context, creds.times))){
++            krb5_free_cred_contents(context, &creds);
+             if (retval != KRB5KRB_AP_ERR_TKT_EXPIRED){
+-                return retval;
++                goto cleanup;
+             }
+             if (auth_debug){
+                 fprintf(stderr,"krb5_ccache_copy: CREDS EXPIRED:\n");
+@@ -219,19 +214,19 @@ krb5_get_nonexp_tkts(krb5_context context, krb5_ccache cc,
+             }
+         }
+         else {   /* these credentials didn't expire */
+-
+-            if ((retval = krb5_copy_creds(context, &creds,
+-                                          &temp_creds[count]))){
+-                return retval;
+-            }
++            retval = krb5_copy_creds(context, &creds, &temp_creds[count]);
++            krb5_free_cred_contents(context, &creds);
++            temp_creds[count+1] = NULL;
++            if (retval)
++                goto cleanup;
+             count ++;
+ 
+             if (count == (chunk_count * CHUNK -1)){
+                 chunk_count ++;
+-                if (!(temp_creds = (krb5_creds **) realloc(temp_creds,
+-                                                           chunk_count * CHUNK * sizeof(krb5_creds *)))){
+-                    return ENOMEM;
+-                }
++
++                temp_creds = xrealloc(temp_creds,
++                                      chunk_count * CHUNK *
++                                      sizeof(*temp_creds));
+             }
+         }
+ 
+@@ -239,13 +234,15 @@ krb5_get_nonexp_tkts(krb5_context context, krb5_ccache cc,
+ 
+     temp_creds[count] = NULL;
+     *creds_array   = temp_creds;
++    temp_creds = NULL;
+ 
+     if (retval == KRB5_CC_END) {
+         retval = krb5_cc_end_seq_get(context, cc, &cur);
+     }
+ 
++cleanup:
++    free_creds_list(context, temp_creds);
+     return retval;
+-
+ }
+ 
+ krb5_error_code
+@@ -315,122 +312,33 @@ printtime(krb5_timestamp ts)
+         printf("%s", fmtbuf);
+ }
+ 
+-
+-krb5_error_code
+-krb5_get_login_princ(const char *luser, char ***princ_list)
+-{
+-    struct stat sbuf;
+-    struct passwd *pwd;
+-    char pbuf[MAXPATHLEN];
+-    FILE *fp;
+-    char * linebuf;
+-    char *newline;
+-    int gobble, result;
+-    char ** buf_out;
+-    struct stat st_temp;
+-    int count = 0, chunk_count = 1;
+-
+-    /* no account => no access */
+-
+-    if ((pwd = getpwnam(luser)) == NULL) {
+-        return 0;
+-    }
+-    result = snprintf(pbuf, sizeof(pbuf), "%s/.k5login", pwd->pw_dir);
+-    if (SNPRINTF_OVERFLOW(result, sizeof(pbuf))) {
+-        fprintf(stderr, _("home directory path for %s too long\n"), luser);
+-        exit (1);
+-    }
+-
+-    if (stat(pbuf, &st_temp)) {  /* not accessible */
+-        return 0;
+-    }
+-
+-
+-    /* open ~/.k5login */
+-    if ((fp = fopen(pbuf, "r")) == NULL) {
+-        return 0;
+-    }
+-    /*
+-     * For security reasons, the .k5login file must be owned either by
+-     * the user himself, or by root.  Otherwise, don't grant access.
+-     */
+-    if (fstat(fileno(fp), &sbuf)) {
+-        fclose(fp);
+-        return 0;
+-    }
+-    if ((sbuf.st_uid != pwd->pw_uid) && sbuf.st_uid) {
+-        fclose(fp);
+-        return 0;
+-    }
+-
+-    /* check each line */
+-
+-
+-    if( !(linebuf = (char *) calloc (BUFSIZ, sizeof(char)))) return ENOMEM;
+-
+-    if (!(buf_out = (char **) malloc( CHUNK * sizeof(char *)))) return ENOMEM;
+-
+-    while ( fgets(linebuf, BUFSIZ, fp) != NULL) {
+-        /* null-terminate the input string */
+-        linebuf[BUFSIZ-1] = '\0';
+-        newline = NULL;
+-        /* nuke the newline if it exists */
+-        if ((newline = strchr(linebuf, '\n')))
+-            *newline = '\0';
+-
+-        buf_out[count] = linebuf;
+-        count ++;
+-
+-        if (count == (chunk_count * CHUNK -1)){
+-            chunk_count ++;
+-            if (!(buf_out = (char **) realloc(buf_out,
+-                                              chunk_count * CHUNK * sizeof(char *)))){
+-                return ENOMEM;
+-            }
+-        }
+-
+-        /* clean up the rest of the line if necessary */
+-        if (!newline)
+-            while (((gobble = getc(fp)) != EOF) && gobble != '\n');
+-
+-        if( !(linebuf = (char *) calloc (BUFSIZ, sizeof(char)))) return ENOMEM;
+-    }
+-
+-    buf_out[count] = NULL;
+-    *princ_list = buf_out;
+-    fclose(fp);
+-    return 0;
+-}
+-
+ void
+ show_credential(krb5_context context, krb5_creds *cred, krb5_ccache cc)
+ {
+     krb5_error_code retval;
+-    char *name, *sname, *flags;
++    char *name = NULL, *sname = NULL, *defname = NULL, *flags;
+     int first = 1;
+-    krb5_principal princ;
+-    char * defname;
++    krb5_principal princ = NULL;
+     int show_flags =1;
+ 
+     retval = krb5_unparse_name(context, cred->client, &name);
+     if (retval) {
+         com_err(prog_name, retval, _("while unparsing client name"));
+-        return;
++        goto cleanup;
+     }
+     retval = krb5_unparse_name(context, cred->server, &sname);
+     if (retval) {
+         com_err(prog_name, retval, _("while unparsing server name"));
+-        free(name);
+-        return;
++        goto cleanup;
+     }
+ 
+     if ((retval = krb5_cc_get_principal(context, cc, &princ))) {
+         com_err(prog_name, retval, _("while retrieving principal name"));
+-        return;
++        goto cleanup;
+     }
+     if ((retval = krb5_unparse_name(context, princ, &defname))) {
+         com_err(prog_name, retval, _("while unparsing principal name"));
+-        return;
++        goto cleanup;
+     }
+ 
+     if (!cred->times.starttime)
+@@ -468,8 +376,12 @@ show_credential(krb5_context context, krb5_creds *cred, krb5_ccache cc)
+         }
+     }
+     putchar('\n');
++
++cleanup:
+     free(name);
+     free(sname);
++    free(defname);
++    krb5_free_principal(context, princ);
+ }
+ 
+ /* Create a random string suitable for a filename extension. */
+@@ -501,37 +413,26 @@ krb5_ccache_overwrite(krb5_context context, krb5_ccache ccs, krb5_ccache cct,
+                       krb5_principal primary_principal)
+ {
+     krb5_error_code retval=0;
+-    krb5_principal temp_principal;
++    krb5_principal defprinc = NULL, princ;
+     krb5_creds ** ccs_creds_arr = NULL;
+-    int i=0;
+ 
+     if (ks_ccache_is_initialized(context, ccs)) {
+-        if ((retval = krb5_get_nonexp_tkts(context,  ccs, &ccs_creds_arr))){
+-            return retval;
+-        }
++        retval = krb5_get_nonexp_tkts(context,  ccs, &ccs_creds_arr);
++        if (retval)
++            goto cleanup;
+     }
+ 
+-    if (ks_ccache_is_initialized(context, cct)) {
+-        if ((retval = krb5_cc_get_principal(context, cct, &temp_principal))){
+-            return retval;
+-        }
+-    }else{
+-        temp_principal = primary_principal;
+-    }
+-
+-    if ((retval = krb5_cc_initialize(context, cct, temp_principal))){
+-        return retval;
+-    }
++    retval = krb5_cc_get_principal(context, cct, &defprinc);
++    princ = (retval == 0) ? defprinc : primary_principal;
++    retval = krb5_cc_initialize(context, cct, princ);
++    if (retval)
++        goto cleanup;
+ 
+     retval = krb5_store_all_creds(context, cct, ccs_creds_arr, NULL);
+ 
+-    if (ccs_creds_arr){
+-        while (ccs_creds_arr[i]){
+-            krb5_free_creds(context, ccs_creds_arr[i]);
+-            i++;
+-        }
+-    }
+-
++cleanup:
++    free_creds_list(context, ccs_creds_arr);
++    krb5_free_principal(context, defprinc);
+     return retval;
+ }
+ 
+@@ -585,45 +486,40 @@ krb5_error_code
+ krb5_ccache_filter(krb5_context context, krb5_ccache cc, krb5_principal prst)
+ {
+ 
+-    int i=0;
+     krb5_error_code retval=0;
+-    krb5_principal temp_principal;
++    krb5_principal temp_principal = NULL;
+     krb5_creds ** cc_creds_arr = NULL;
+     const char * cc_name;
+     krb5_boolean stored;
+ 
+-    cc_name = krb5_cc_get_name(context, cc);
++    if (!ks_ccache_is_initialized(context, cc))
++        return 0;
+ 
+-    if (ks_ccache_is_initialized(context, cc)) {
+-        if (auth_debug) {
+-            fprintf(stderr,"putting cache %s through a filter for -z option\n",                     cc_name);
+-        }
++    if (auth_debug) {
++        cc_name = krb5_cc_get_name(context, cc);
++        fprintf(stderr, "putting cache %s through a filter for -z option\n",
++                cc_name);
++    }
+ 
+-        if ((retval = krb5_get_nonexp_tkts(context, cc, &cc_creds_arr))){
+-            return retval;
+-        }
++    retval = krb5_get_nonexp_tkts(context, cc, &cc_creds_arr);
++    if (retval)
++        goto cleanup;
+ 
+-        if ((retval = krb5_cc_get_principal(context, cc, &temp_principal))){
+-            return retval;
+-        }
++    retval = krb5_cc_get_principal(context, cc, &temp_principal);
++    if (retval)
++        goto cleanup;
+ 
+-        if ((retval = krb5_cc_initialize(context, cc, temp_principal))){
+-            return retval;
+-        }
++    retval = krb5_cc_initialize(context, cc, temp_principal);
++    if (retval)
++        goto cleanup;
+ 
+-        if ((retval = krb5_store_some_creds(context, cc, cc_creds_arr,
+-                                            NULL, prst, &stored))){
+-            return retval;
+-        }
++    retval = krb5_store_some_creds(context, cc, cc_creds_arr, NULL, prst,
++                                   &stored);
+ 
+-        if (cc_creds_arr){
+-            while (cc_creds_arr[i]){
+-                krb5_free_creds(context, cc_creds_arr[i]);
+-                i++;
+-            }
+-        }
+-    }
+-    return 0;
++cleanup:
++    free_creds_list(context, cc_creds_arr);
++    krb5_free_principal(context, temp_principal);
++    return retval;
+ }
+ 
+ krb5_boolean
+@@ -654,17 +550,20 @@ krb5_error_code
+ krb5_find_princ_in_cache(krb5_context context, krb5_ccache cc,
+                          krb5_principal princ, krb5_boolean *found)
+ {
+-    krb5_error_code retval;
++    krb5_error_code retval = 0;
+     krb5_creds ** creds_list = NULL;
+ 
+     if (ks_ccache_is_initialized(context, cc)) {
+-        if ((retval = krb5_get_nonexp_tkts(context, cc, &creds_list))){
+-            return retval;
+-        }
++        retval = krb5_get_nonexp_tkts(context, cc, &creds_list);
++        if (retval)
++            goto cleanup;
+     }
+ 
+     *found = krb5_find_princ_in_cred_list(context, creds_list, princ);
+-    return 0;
++
++cleanup:
++    free_creds_list(context, creds_list);
++    return retval;
+ }
+ 
+ krb5_boolean
+diff --git a/src/clients/ksu/heuristic.c b/src/clients/ksu/heuristic.c
+index e906de8ef0..6ed94eb887 100644
+--- a/src/clients/ksu/heuristic.c
++++ b/src/clients/ksu/heuristic.c
+@@ -149,28 +149,31 @@ filter(FILE *fp, char *cmd, char **k5users_list, char ***k5users_filt_list)
+ 
+     *k5users_filt_list = NULL;
+ 
+-    if (! k5users_list){
++    if (k5users_list == NULL)
+         return 0;
+-    }
+ 
+     while(k5users_list[i]){
++        free(out_cmd);
++        out_cmd = NULL;
+ 
+         retval= k5users_lookup(fp, k5users_list[i], cmd, &found, &out_cmd);
+         if (retval)
+-            return retval;
++            goto cleanup;
+ 
+         if (found == FALSE){
+             free (k5users_list[i]);
+             k5users_list[i] = NULL;
+-            if (out_cmd) gb_err = out_cmd;
++            if (out_cmd) {
++                gb_err = out_cmd;
++                out_cmd = NULL;
++            }
+         } else
+             found_count ++;
+ 
+         i++;
+     }
+ 
+-    if (! (temp_filt_list = (char **) calloc(found_count +1, sizeof (char*))))
+-        return ENOMEM;
++    temp_filt_list = xcalloc(found_count + 1, sizeof(*temp_filt_list));
+ 
+     for(j= 0, k=0; j < i; j++ ) {
+         if (k5users_list[j]){
+@@ -184,7 +187,10 @@ filter(FILE *fp, char *cmd, char **k5users_list, char ***k5users_filt_list)
+     free (k5users_list);
+ 
+     *k5users_filt_list = temp_filt_list;
+-    return 0;
++
++cleanup:
++    free(out_cmd);
++    return retval;
+ }
+ 
+ krb5_error_code
+@@ -318,7 +324,7 @@ get_closest_principal(krb5_context context, char **plist,
+ 
+         retval = krb5_parse_name(context, plist[i], &temp_client);
+         if (retval)
+-            return retval;
++            goto cleanup;
+ 
+         pnelem = krb5_princ_size(context, temp_client);
+ 
+@@ -346,6 +352,7 @@ get_closest_principal(krb5_context context, char **plist,
+                 if(best_client){
+                     if(krb5_princ_size(context, best_client) >
+                        krb5_princ_size(context, temp_client)){
++                        krb5_free_principal(context, best_client);
+                         best_client = temp_client;
+                     }
+                 }else
+@@ -358,9 +365,12 @@ get_closest_principal(krb5_context context, char **plist,
+     if (best_client) {
+         *found = TRUE;
+         *client = best_client;
++        best_client = NULL;
+     }
+ 
+-    return 0;
++cleanup:
++    krb5_free_principal(context, best_client);
++    return retval;
+ }
+ 
+ /****************************************************************
+@@ -471,6 +481,7 @@ find_princ_in_list(krb5_context context, krb5_principal princ, char **plist,
+         i++;
+     }
+ 
++    free(princname);
+     return 0;
+ 
+ }
+@@ -498,11 +509,9 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+ {
+ 
+     princ_info princ_trials[10];
+-    krb5_principal cc_def_princ = NULL;
+-    krb5_principal temp_client;
+-    krb5_principal target_client;
+-    krb5_principal source_client;
+-    krb5_principal end_server;
++    krb5_principal cc_def_princ = NULL, temp_client = NULL;
++    krb5_principal target_client = NULL, source_client = NULL;
++    krb5_principal end_server = NULL;
+     krb5_error_code retval;
+     char ** aplist =NULL;
+     krb5_boolean found = FALSE;
+@@ -519,54 +528,59 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+     if (ks_ccache_is_initialized(context, cc_source)) {
+         retval = krb5_cc_get_principal(context, cc_source, &cc_def_princ);
+         if (retval)
+-            return retval;
++            goto cleanup;
+     }
+ 
+     retval=krb5_parse_name(context, target_user, &target_client);
+     if (retval)
+-        return retval;
++        goto cleanup;
+ 
+     retval=krb5_parse_name(context, source_user, &source_client);
+     if (retval)
+-        return retval;
++        goto cleanup;
+ 
+-    if (source_uid == 0){
+-        if (target_uid != 0)
+-            *client = target_client; /* this will be used to restrict
+-                                        the cache copty */
+-        else {
+-            if(cc_def_princ)
+-                *client = cc_def_princ;
+-            else
+-                *client = target_client;
++    if (source_uid == 0) {
++        if (target_uid != 0) {
++            /* This will be used to restrict the cache copy. */
++            *client = target_client;
++            target_client = NULL;
++        } else if (cc_def_princ != NULL) {
++            *client = cc_def_princ;
++            cc_def_princ = NULL;
++        } else {
++            *client = target_client;
++            target_client = NULL;
+         }
+-
+         if (auth_debug)
+             printf(" GET_best_princ_for_target: via source_uid == 0\n");
+-
+-        return 0;
++        goto cleanup;
+     }
+ 
+     /* from here on, the code is for source_uid !=  0 */
+ 
+     if (source_uid && (source_uid == target_uid)){
+-        if(cc_def_princ)
++        if (cc_def_princ != NULL) {
+             *client = cc_def_princ;
+-        else
++            cc_def_princ = NULL;
++        } else {
+             *client = target_client;
++            target_client = NULL;
++        }
+         if (auth_debug)
+             printf("GET_best_princ_for_target: via source_uid == target_uid\n");
+-        return 0;
++        goto cleanup;
+     }
+ 
+     /* Become root, then target for looking at .k5login.*/
+     if (krb5_seteuid(0) || krb5_seteuid(target_uid) ) {
+-        return errno;
++        retval = errno;
++        goto cleanup;
+     }
+ 
+     /* if .k5users and .k5login do not exist */
+     if (stat(k5login_path, &tb) && stat(k5users_path, &tb) ){
+         *client = target_client;
++        target_client = NULL;
+ 
+         if (cmd)
+             *path_out = NOT_AUTHORIZED;
+@@ -574,26 +588,25 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+         if (auth_debug)
+             printf(" GET_best_princ_for_target: via no auth files path\n");
+ 
+-        return 0;
++        goto cleanup;
+     }else{
+         retval = get_authorized_princ_names(target_user, cmd, &aplist);
+         if (retval)
+-            return retval;
++            goto cleanup;
+ 
+         /* .k5users or .k5login exist, but no authorization */
+         if ((!aplist) || (!aplist[0])) {
+             *path_out = NOT_AUTHORIZED;
+             if (auth_debug)
+                 printf("GET_best_princ_for_target: via empty auth files path\n");
+-            return 0;
++            goto cleanup;
+         }
+     }
+ 
+     retval = krb5_sname_to_principal(context, hostname, NULL,
+                                      KRB5_NT_SRV_HST, &end_server);
+     if (retval)
+-        return retval;
+-
++        goto cleanup;
+ 
+     /* first see if default principal of the source cache
+      * can get us in, then the target_user@realm, then the
+@@ -616,7 +629,7 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+             retval= find_princ_in_list(context, princ_trials[i].p, aplist,
+                                        &found);
+             if (retval)
+-                return retval;
++                goto cleanup;
+ 
+             if (found == TRUE){
+                 princ_trials[i].found = TRUE;
+@@ -625,12 +638,13 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+                                              princ_trials[i].p,
+                                              end_server, &found);
+                 if (retval)
+-                    return retval;
++                    goto cleanup;
+                 if (found == TRUE){
+-                    *client = princ_trials[i].p;
++                    retval = krb5_copy_principal(context, princ_trials[i].p,
++                                                 client);
+                     if (auth_debug)
+                         printf("GET_best_princ_for_target: via ticket file, choice #%d\n", i);
+-                    return 0;
++                    goto cleanup;
+                 }
+             }
+         }
+@@ -643,21 +657,23 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+     while (aplist[i]){
+         retval = krb5_parse_name(context, aplist[i], &temp_client);
+         if (retval)
+-            return retval;
++            goto cleanup;
+ 
+         retval = find_either_ticket (context, cc_source, temp_client,
+                                      end_server, &found);
+         if (retval)
+-            return retval;
++            goto cleanup;
+ 
+         if (found == TRUE){
+             if (auth_debug)
+                 printf("GET_best_princ_for_target: via ticket file, choice: any ok ticket \n" );
+             *client = temp_client;
+-            return 0;
++            temp_client = NULL;
++            goto cleanup;
+         }
+ 
+         krb5_free_principal(context, temp_client);
++        temp_client = NULL;
+ 
+         i++;
+     }
+@@ -668,11 +684,11 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+ 
+     for (i=0; i < count; i ++){
+         if (princ_trials[i].found == TRUE){
+-            *client = princ_trials[i].p;
++            retval = krb5_copy_principal(context, princ_trials[i].p, client);
+ 
+             if (auth_debug)
+                 printf("GET_best_princ_for_target: via prompt passwd list choice #%d \n",i);
+-            return  0;
++            goto cleanup;
+         }
+     }
+ 
+@@ -682,7 +698,7 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+             retval=krb5_copy_principal(context, princ_trials[i].p,
+                                        &temp_client);
+             if(retval)
+-                return retval;
++                goto cleanup;
+ 
+             /* get the client name that is the closest
+                to the three princ in trials */
+@@ -690,15 +706,15 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+             retval=get_closest_principal(context, aplist, &temp_client,
+                                          &found);
+             if(retval)
+-                return retval;
++                goto cleanup;
+ 
+             if (found == TRUE){
+                 *client = temp_client;
++                temp_client = NULL;
+                 if (auth_debug)
+                     printf("GET_best_princ_for_target: via prompt passwd list choice: approximation of princ in trials # %d \n",i);
+-                return 0;
++                goto cleanup;
+             }
+-            krb5_free_principal(context, temp_client);
+         }
+     }
+ 
+@@ -709,5 +725,13 @@ get_best_princ_for_target(krb5_context context, uid_t source_uid,
+         printf( "GET_best_princ_for_target: out of luck, can't get appropriate default principal\n");
+ 
+     *path_out = NOT_AUTHORIZED;
+-    return 0;
++    retval = 0;
++
++cleanup:
++    krb5_free_principal(context, cc_def_princ);
++    krb5_free_principal(context, target_client);
++    krb5_free_principal(context, source_client);
++    krb5_free_principal(context, temp_client);
++    krb5_free_principal(context, end_server);
++    return retval;
+ }
+diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c
+index db10251f95..68cfe6b0ed 100644
+--- a/src/clients/ksu/krb_auth_su.c
++++ b/src/clients/ksu/krb_auth_su.c
+@@ -37,33 +37,31 @@ krb5_auth_check(krb5_context context, krb5_principal client_pname,
+                 char *target_user, krb5_ccache cc, int *path_passwd,
+                 uid_t target_uid)
+ {
+-    krb5_principal client;
++    krb5_principal client = NULL;
+     krb5_verify_init_creds_opt vfy_opts;
+-    krb5_creds tgt, tgtq;
++    krb5_creds tgt = { 0 }, tgtq = { 0 };
+     krb5_error_code retval =0;
+     int got_it = 0;
+     krb5_boolean zero_password;
++    krb5_boolean ok = FALSE;
+ 
+     *path_passwd = 0;
+-    memset(&tgtq, 0, sizeof(tgtq));
+-    memset(&tgt, 0, sizeof(tgt));
+ 
+     if ((retval= krb5_copy_principal(context,  client_pname, &client))){
+         com_err(prog_name, retval, _("while copying client principal"));
+-        return (FALSE) ;
++        goto cleanup;
+     }
+ 
+     if ((retval= krb5_copy_principal(context,  client, &tgtq.client))){
+         com_err(prog_name, retval, _("while copying client principal"));
+-        return (FALSE) ;
++        goto cleanup;
+     }
+ 
+     if ((retval = ksu_tgtname(context,  krb5_princ_realm(context, client),
+                               krb5_princ_realm(context, client),
+                               &tgtq.server))){
+         com_err(prog_name, retval, _("while creating tgt for local realm"));
+-        krb5_free_principal(context, client);
+-        return (FALSE) ;
++        goto cleanup;
+     }
+ 
+     if (auth_debug){ dump_principal(context, "local tgt principal name", tgtq.server ); }
+@@ -77,7 +75,7 @@ krb5_auth_check(krb5_context context, krb5_principal client_pname,
+         if ((retval != KRB5_CC_NOTFOUND) &&
+             (retval != KRB5KRB_AP_ERR_TKT_EXPIRED)){
+             com_err(prog_name, retval, _("while retrieving creds from cache"));
+-            return (FALSE) ;
++            goto cleanup;
+         }
+     } else{
+         got_it = 1;
+@@ -88,7 +86,7 @@ krb5_auth_check(krb5_context context, krb5_principal client_pname,
+ #ifdef GET_TGT_VIA_PASSWD
+         if (krb5_seteuid(0)||krb5_seteuid(target_uid)) {
+             com_err("ksu", errno, _("while switching to target uid"));
+-            return FALSE;
++            goto cleanup;
+         }
+ 
+ 
+@@ -102,19 +100,19 @@ krb5_auth_check(krb5_context context, krb5_principal client_pname,
+                                    &tgt) == FALSE) {
+             krb5_seteuid(0);
+ 
+-            return FALSE;
++            goto cleanup;
+         }
+         *path_passwd = 1;
+         if (krb5_seteuid(0)) {
+             com_err("ksu", errno, _("while reclaiming root uid"));
+-            return FALSE;
++            goto cleanup;
+         }
+ 
+ #else
+         plain_dump_principal (context, client);
+         fprintf(stderr,
+                 _("does not have any appropriate tickets in the cache.\n"));
+-        return FALSE;
++        goto cleanup;
+ 
+ #endif /* GET_TGT_VIA_PASSWD */
+ 
+@@ -126,10 +124,16 @@ krb5_auth_check(krb5_context context, krb5_principal client_pname,
+                                     &vfy_opts);
+     if (retval) {
+         com_err(prog_name, retval, _("while verifying ticket for server"));
+-        return (FALSE);
++        goto cleanup;
+     }
+ 
+-    return (TRUE);
++    ok = TRUE;
++
++cleanup:
++    krb5_free_principal(context, client);
++    krb5_free_cred_contents(context, &tgt);
++    krb5_free_cred_contents(context, &tgtq);
++    return ok;
+ }
+ 
+ krb5_boolean
+@@ -137,11 +141,12 @@ ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client,
+                        krb5_get_init_creds_opt *options,
+                        krb5_boolean *zero_password, krb5_creds *creds_out)
+ {
++    krb5_boolean ok = FALSE;
+     krb5_error_code code;
+-    krb5_creds creds;
++    krb5_creds creds = { 0 };
+     krb5_timestamp now;
+     unsigned int pwsize;
+-    char password[255], *client_name, prompt[255];
++    char password[255], prompt[255], *client_name = NULL;
+     int result;
+ 
+     *zero_password = FALSE;
+@@ -150,14 +155,14 @@ ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client,
+ 
+     if ((code = krb5_unparse_name(context, client, &client_name))) {
+         com_err (prog_name, code, _("when unparsing name"));
+-        return (FALSE);
++        goto cleanup;
+     }
+ 
+     memset(&creds, 0, sizeof(creds));
+ 
+     if ((code = krb5_timeofday(context, &now))) {
+         com_err(prog_name, code, _("while getting time of day"));
+-        return (FALSE);
++        goto cleanup;
+     }
+ 
+     result = snprintf(prompt, sizeof(prompt), _("Kerberos password for %s: "),
+@@ -166,7 +171,7 @@ ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client,
+         fprintf(stderr,
+                 _("principal name %s too long for internal buffer space\n"),
+                 client_name);
+-        return FALSE;
++        goto cleanup;
+     }
+ 
+     pwsize = sizeof(password);
+@@ -175,13 +180,13 @@ ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client,
+     if (code ) {
+         com_err(prog_name, code, _("while reading password for '%s'\n"),
+                 client_name);
+-        return (FALSE);
++        goto cleanup;
+     }
+ 
+     if ( pwsize == 0) {
+         fprintf(stderr, _("No password given\n"));
+         *zero_password = TRUE;
+-        return (FALSE);
++        goto cleanup;
+     }
+ 
+     code = krb5_get_init_creds_password(context, &creds, client, password,
+@@ -195,13 +200,19 @@ ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client,
+             fprintf(stderr, _("%s: Password incorrect\n"), prog_name);
+         else
+             com_err(prog_name, code, _("while getting initial credentials"));
+-        return (FALSE);
++        goto cleanup;
+     }
+-    if (creds_out != NULL)
++    if (creds_out != NULL) {
+         *creds_out = creds;
+-    else
+-        krb5_free_cred_contents(context, &creds);
+-    return (TRUE);
++        memset(&creds, 0, sizeof(creds));
++    }
++
++    ok = TRUE;
++
++cleanup:
++    krb5_free_cred_contents(context, &creds);
++    free(client_name);
++    return ok;
+ }
+ 
+ void
+@@ -213,8 +224,10 @@ dump_principal(krb5_context context, char *str, krb5_principal p)
+     if ((retval = krb5_unparse_name(context, p, &stname))) {
+         fprintf(stderr, _(" %s while unparsing name\n"),
+                 error_message(retval));
++        return;
+     }
+     fprintf(stderr, " %s: %s\n", str, stname);
++    free(stname);
+ }
+ 
+ void
+@@ -226,71 +239,8 @@ plain_dump_principal (krb5_context context, krb5_principal p)
+     if ((retval = krb5_unparse_name(context, p, &stname))) {
+         fprintf(stderr, _(" %s while unparsing name\n"),
+                 error_message(retval));
++        return;
+     }
+     fprintf(stderr, "%s ", stname);
+-}
+-
+-
+-/**********************************************************************
+-returns the principal that is closest to client. plist contains
+-a principal list obtained from .k5login and parhaps .k5users file.
+-This routine gets called before getting the password for a tgt.
+-A principal is picked that has the best chance of getting in.
+-
+-**********************************************************************/
+-
+-krb5_error_code
+-get_best_principal(krb5_context context, char **plist, krb5_principal *client)
+-{
+-    krb5_error_code retval =0;
+-    krb5_principal temp_client, best_client = NULL;
+-
+-    int i = 0, nelem;
+-
+-    if (! plist ) return 0;
+-
+-    nelem = krb5_princ_size(context, *client);
+-
+-    while(plist[i]){
+-
+-        if ((retval = krb5_parse_name(context, plist[i], &temp_client))){
+-            return retval;
+-        }
+-
+-        if (data_eq(*krb5_princ_realm(context, *client),
+-                    *krb5_princ_realm(context, temp_client))) {
+-
+-            if (nelem &&
+-                krb5_princ_size(context, *client) > 0 &&
+-                krb5_princ_size(context, temp_client) > 0) {
+-                krb5_data *p1 =
+-                    krb5_princ_component(context, *client, 0);
+-                krb5_data *p2 =
+-                    krb5_princ_component(context, temp_client, 0);
+-
+-                if (data_eq(*p1, *p2)) {
+-
+-                    if (auth_debug){
+-                        fprintf(stderr,
+-                                "get_best_principal: compare with %s\n",
+-                                plist[i]);
+-                    }
+-
+-                    if(best_client){
+-                        if(krb5_princ_size(context, best_client) >
+-                           krb5_princ_size(context, temp_client)){
+-                            best_client = temp_client;
+-                        }
+-                    }else{
+-                        best_client = temp_client;
+-                    }
+-                }
+-            }
+-
+-        }
+-        i++;
+-    }
+-
+-    if (best_client) *client = best_client;
+-    return 0;
++    free(stname);
+ }
+diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h
+index 66fb4bcc6a..32ce11cb85 100644
+--- a/src/clients/ksu/ksu.h
++++ b/src/clients/ksu/ksu.h
+@@ -92,9 +92,6 @@ extern void plain_dump_principal
+ extern krb5_error_code krb5_parse_lifetime
+ (char *, long *);
+ 
+-extern krb5_error_code get_best_principal
+-(krb5_context, char **, krb5_principal *);
+-
+ /* ccache.c */
+ extern krb5_error_code krb5_ccache_copy
+ (krb5_context, krb5_ccache, krb5_principal, krb5_ccache,
+@@ -117,9 +114,6 @@ extern krb5_error_code krb5_check_exp
+ 
+ extern char *flags_string (krb5_creds *);
+ 
+-extern krb5_error_code krb5_get_login_princ
+-(const char *, char ***);
+-
+ extern void show_credential
+ (krb5_context, krb5_creds *, krb5_ccache);
+ 
+diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
+index 2a351662c8..77703a6a2b 100644
+--- a/src/clients/ksu/main.c
++++ b/src/clients/ksu/main.c
+@@ -1002,7 +1002,7 @@ resolve_target_cache(krb5_context context, krb5_principal princ,
+             if (retval) {
+                 com_err(prog_name, retval,
+                         _("while generating part of the target ccache name"));
+-                return retval;
++                goto cleanup;
+             }
+             if (asprintf(&ccname, "%s.%s", target, sym) < 0) {
+                 retval = ENOMEM;
+@@ -1014,6 +1014,7 @@ resolve_target_cache(krb5_context context, krb5_principal princ,
+             free(sym);
+         } while (ks_ccache_name_is_initialized(context, ccname));
+         retval = krb5_cc_resolve(context, ccname, &ccache);
++        free(ccname);
+     } else {
+         /* Look for a cache in the collection that we can reuse. */
+         retval = krb5_cc_cache_match(context, princ, &ccache);
+diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
+index 26f340af31..976c8969e8 100644
+--- a/src/kadmin/cli/keytab.c
++++ b/src/kadmin/cli/keytab.c
+@@ -363,7 +363,7 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
+ {
+     krb5_principal princ = NULL;
+     krb5_keytab_entry entry;
+-    krb5_kt_cursor cursor;
++    krb5_kt_cursor cursor = NULL;
+     enum { UNDEF, SPEC, HIGH, ALL, OLD } mode;
+     int code, did_something;
+     krb5_kvno kvno;
+@@ -443,6 +443,7 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
+                         _("while temporarily ending keytab scan"));
+                 goto cleanup;
+             }
++            cursor = NULL;
+             code = krb5_kt_remove_entry(context, keytab, &entry);
+             if (code != 0) {
+                 com_err(whoami, code, _("while deleting entry from keytab"));
+@@ -471,6 +472,7 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
+         com_err(whoami, code, _("while ending keytab scan"));
+         goto cleanup;
+     }
++    cursor = NULL;
+ 
+     /*
+      * If !did_someting then mode must be OLD or we would have
+@@ -483,6 +485,8 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
+     }
+ 
+ cleanup:
++    if (cursor != NULL)
++        (void)krb5_kt_end_seq_get(context, keytab, &cursor);
+     krb5_free_principal(context, princ);
+ }
+ 
+diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
+index 87a69ca145..a1c17d154d 100644
+--- a/src/kadmin/ktutil/ktutil.c
++++ b/src/kadmin/ktutil/ktutil.c
+@@ -254,6 +254,7 @@ ktutil_list(int argc, char *argv[])
+                                                buf, sizeof(buf)))) {
+                 com_err(argv[0], retval,
+                         _("While converting enctype to string"));
++                free(pname);
+                 return;
+             }
+             printf(" (%s) ", buf);
+diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c
+index f883ae2df8..9a4826e441 100644
+--- a/src/kprop/kpropd.c
++++ b/src/kprop/kpropd.c
+@@ -1300,19 +1300,20 @@ static krb5_boolean
+ authorized_principal(krb5_context context, krb5_principal p,
+                      krb5_enctype auth_etype)
+ {
+-    char *name, *ptr, buf[1024];
++    krb5_boolean ok = FALSE;
++    char *name = NULL, *ptr, buf[1024];
+     krb5_error_code retval;
+-    FILE *acl_file;
++    FILE *acl_file = NULL;
+     int end;
+     krb5_enctype acl_etype;
+ 
+     retval = krb5_unparse_name(context, p, &name);
+     if (retval)
+-        return FALSE;
++        goto cleanup;
+ 
+     acl_file = fopen(acl_file_name, "r");
+     if (acl_file == NULL)
+-        return FALSE;
++        goto cleanup;
+ 
+     while (!feof(acl_file)) {
+         if (!fgets(buf, sizeof(buf), acl_file))
+@@ -1342,14 +1343,16 @@ authorized_principal(krb5_context context, krb5_principal p,
+                  (acl_etype != auth_etype)))
+                 continue;
+ 
+-            free(name);
+-            fclose(acl_file);
+-            return TRUE;
++            ok = TRUE;
++            goto cleanup;
+         }
+     }
++
++cleanup:
+     free(name);
+-    fclose(acl_file);
+-    return FALSE;
++    if (acl_file != NULL)
++        fclose(acl_file);
++    return ok;
+ }
+ 
+ static void
+diff --git a/src/lib/gssapi/krb5/export_cred.c b/src/lib/gssapi/krb5/export_cred.c
+index 96a408c237..bf5cede54a 100644
+--- a/src/lib/gssapi/krb5/export_cred.c
++++ b/src/lib/gssapi/krb5/export_cred.c
+@@ -447,8 +447,10 @@ krb5_gss_export_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
+ 
+     /* Validate and lock cred_handle. */
+     status = krb5_gss_validate_cred_1(minor_status, cred_handle, context);
+-    if (status != GSS_S_COMPLETE)
++    if (status != GSS_S_COMPLETE) {
++        krb5_free_context(context);
+         return status;
++    }
+     cred = (krb5_gss_cred_id_t)cred_handle;
+ 
+     if (json_kgcred(context, cred, &jcred))
+diff --git a/src/lib/gssapi/krb5/val_cred.c b/src/lib/gssapi/krb5/val_cred.c
+index 83e7634106..d4b070f8c0 100644
+--- a/src/lib/gssapi/krb5/val_cred.c
++++ b/src/lib/gssapi/krb5/val_cred.c
+@@ -35,6 +35,7 @@ krb5_gss_validate_cred_1(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
+     krb5_gss_cred_id_t cred;
+     krb5_error_code code;
+     krb5_principal princ;
++    krb5_boolean same;
+ 
+     cred = (krb5_gss_cred_id_t) cred_handle;
+     k5_mutex_lock(&cred->lock);
+@@ -45,12 +46,13 @@ krb5_gss_validate_cred_1(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
+             *minor_status = code;
+             return(GSS_S_DEFECTIVE_CREDENTIAL);
+         }
+-        if (!krb5_principal_compare(context, princ, cred->name->princ)) {
++        same = krb5_principal_compare(context, princ, cred->name->princ);
++        (void)krb5_free_principal(context, princ);
++        if (!same) {
+             k5_mutex_unlock(&cred->lock);
+             *minor_status = KG_CCACHE_NOMATCH;
+             return(GSS_S_DEFECTIVE_CREDENTIAL);
+         }
+-        (void)krb5_free_principal(context, princ);
+     }
+     *minor_status = 0;
+     return GSS_S_COMPLETE;
+diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c
+index 2ec80a0f2b..4efcaf9941 100644
+--- a/src/lib/kadm5/srv/server_kdb.c
++++ b/src/lib/kadm5/srv/server_kdb.c
+@@ -67,11 +67,10 @@ krb5_error_code kdb_init_master(kadm5_server_handle_t handle,
+     if (ret)
+         goto done;
+ 
+-    if ((ret = krb5_db_fetch_mkey_list(handle->context, master_princ,
+-                                       &master_keyblock))) {
++    ret = krb5_db_fetch_mkey_list(handle->context, master_princ,
++                                  &master_keyblock);
++    if (ret)
+         krb5_db_fini(handle->context);
+-        return (ret);
+-    }
+ 
+ done:
+     if (r == NULL)
+diff --git a/src/lib/krb5/ccache/cc_kcm.c b/src/lib/krb5/ccache/cc_kcm.c
+index c93e7c78e5..1f917d49bb 100644
+--- a/src/lib/krb5/ccache/cc_kcm.c
++++ b/src/lib/krb5/ccache/cc_kcm.c
+@@ -992,10 +992,14 @@ kcm_start_seq_get(krb5_context context, krb5_ccache cache,
+     if (cursor == NULL)
+         goto cleanup;
+     cursor->uuids = uuids;
++    uuids = NULL;
+     cursor->creds = creds;
++    creds = NULL;
+     *cursor_out = (krb5_cc_cursor)cursor;
+ 
+ cleanup:
++    free_cred_list(creds);
++    free_uuid_list(uuids);
+     kcmreq_free(&req);
+     return ret;
+ }
+diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c
+index e0eb39a612..9b755f0e36 100644
+--- a/src/lib/krb5/ccache/ccfns.c
++++ b/src/lib/krb5/ccache/ccfns.c
+@@ -198,18 +198,18 @@ k5_build_conf_principals(krb5_context context, krb5_ccache id,
+     if (principal) {
+         ret = krb5_unparse_name(context, principal, &pname);
+         if (ret)
+-            return ret;
++            goto cleanup;
+     }
+ 
+     ret = krb5_build_principal(context, &cred->server,
+                                sizeof(conf_realm) - 1, conf_realm,
+                                conf_name, name, pname, (char *)NULL);
+-    krb5_free_unparsed_name(context, pname);
+-    if (ret) {
+-        krb5_free_principal(context, client);
+-        return ret;
+-    }
++    if (ret)
++        goto cleanup;
+     ret = krb5_copy_principal(context, client, &cred->client);
++
++cleanup:
++    krb5_free_unparsed_name(context, pname);
+     krb5_free_principal(context, client);
+     return ret;
+ }
+diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
+index f3ea28c8ec..8fd1505115 100644
+--- a/src/lib/krb5/keytab/kt_file.c
++++ b/src/lib/krb5/keytab/kt_file.c
+@@ -456,15 +456,16 @@ krb5_ktfile_start_seq_get(krb5_context context, krb5_keytab id, krb5_kt_cursor *
+         return ENOMEM;
+     }
+     *fileoff = KTSTARTOFF(id);
+-    *cursorp = (krb5_kt_cursor)fileoff;
+     KTITERS(id)++;
+     if (KTITERS(id) == 0) {
+         /* Wrapped?!  */
+         KTITERS(id)--;
+         KTUNLOCK(id);
++        free(fileoff);
+         k5_setmsg(context, KRB5_KT_IOERR, "Too many keytab iterators active");
+         return KRB5_KT_IOERR;   /* XXX */
+     }
++    *cursorp = (krb5_kt_cursor)fileoff;
+     KTUNLOCK(id);
+ 
+     return 0;
+diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c
+index 753929b06d..f7fad27867 100644
+--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c
++++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c
+@@ -271,16 +271,18 @@ krb5_ldap_delete_realm (krb5_context context, char *lrealm)
+         for (ent = ldap_first_entry (ld, result); ent != NULL;
+              ent = ldap_next_entry (ld, ent)) {
+             if ((values = ldap_get_values(ld, ent, "krbPrincipalName")) != NULL) {
+-                for (i = 0; values[i] != NULL; ++i) {
++                for (i = 0; values[i] != NULL && !st; ++i) {
+                     krb5_parse_name(context, values[i], &principal);
+                     if (principal_in_realm_2(principal, lrealm) == 0) {
+                         st=krb5_ldap_delete_principal(context, principal);
+-                        if (st && st != KRB5_KDB_NOENTRY)
+-                            goto cleanup;
++                        if (st == KRB5_KDB_NOENTRY)
++                            st = 0;
+                     }
+                     krb5_free_principal(context, principal);
+                 }
+                 ldap_value_free(values);
++                if (st)
++                    goto cleanup;
+             }
+         }
+     }
+-- 
+2.45.1
+
diff --git a/0019-Remove-klist-s-defname-global-variable.patch b/0019-Remove-klist-s-defname-global-variable.patch
new file mode 100644
index 0000000..1cf7d80
--- /dev/null
+++ b/0019-Remove-klist-s-defname-global-variable.patch
@@ -0,0 +1,71 @@
+From 05bb6d9c729a3c6a4ba35270368bc0f6e1875ad0 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Mon, 8 Jan 2024 16:52:27 +0100
+Subject: [PATCH] Remove klist's defname global variable
+
+Addition of a "cleanup" section in kinit's show_ccache() function as
+part of commit 6c5471176f5266564fbc8a7e02f03b4b042202f8 introduced a
+double-free bug, because defname is a global variable.  After the
+first call, successive calls may take place with a dangling pointer in
+defname, which will be freed if krb5_cc_get_principal() fails.
+
+Convert "defname" to a local variable initialized at the beginning of
+show_ccache().
+
+[ghudson@mit.edu: edited commit message]
+
+(cherry picked from commit 5b00197227231943bd2305328c8260dd0b0dbcf0)
+---
+ src/clients/klist/klist.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
+index b5ae96a843..b5808e5c93 100644
+--- a/src/clients/klist/klist.c
++++ b/src/clients/klist/klist.c
+@@ -53,7 +53,6 @@ int show_flags = 0, show_time = 0, status_only = 0, show_keys = 0;
+ int show_etype = 0, show_addresses = 0, no_resolve = 0, print_version = 0;
+ int show_adtype = 0, show_all = 0, list_all = 0, use_client_keytab = 0;
+ int show_config = 0;
+-char *defname;
+ char *progname;
+ krb5_timestamp now;
+ unsigned int timestamp_width;
+@@ -62,7 +61,7 @@ krb5_context context;
+ 
+ static krb5_boolean is_local_tgt(krb5_principal princ, krb5_data *realm);
+ static char *etype_string(krb5_enctype );
+-static void show_credential(krb5_creds *);
++static void show_credential(krb5_creds *, const char *);
+ 
+ static void list_all_ccaches(void);
+ static int list_ccache(krb5_ccache);
+@@ -473,6 +472,7 @@ show_ccache(krb5_ccache cache)
+     krb5_creds creds;
+     krb5_principal princ = NULL;
+     krb5_error_code ret;
++    char *defname = NULL;
+     int status = 1;
+ 
+     ret = krb5_cc_get_principal(context, cache, &princ);
+@@ -503,7 +503,7 @@ show_ccache(krb5_ccache cache)
+     }
+     while ((ret = krb5_cc_next_cred(context, cache, &cur, &creds)) == 0) {
+         if (show_config || !krb5_is_config_principal(context, creds.server))
+-            show_credential(&creds);
++            show_credential(&creds, defname);
+         krb5_free_cred_contents(context, &creds);
+     }
+     if (ret == KRB5_CC_END) {
+@@ -676,7 +676,7 @@ print_config_data(int col, krb5_data *data)
+ }
+ 
+ static void
+-show_credential(krb5_creds *cred)
++show_credential(krb5_creds *cred, const char *defname)
+ {
+     krb5_error_code ret;
+     krb5_ticket *tkt = NULL;
+-- 
+2.45.1
+
diff --git a/0020-End-connection-on-KDC_ERR_SVC_UNAVAILABLE.patch b/0020-End-connection-on-KDC_ERR_SVC_UNAVAILABLE.patch
new file mode 100644
index 0000000..1674fd6
--- /dev/null
+++ b/0020-End-connection-on-KDC_ERR_SVC_UNAVAILABLE.patch
@@ -0,0 +1,34 @@
+From d7bcca2a215de880f4419afc450a96a747d48560 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Fri, 27 Oct 2023 00:44:53 -0400
+Subject: [PATCH] End connection on KDC_ERR_SVC_UNAVAILABLE
+
+In sendto_kdc.c:service_fds(), if a message handler indicates that a
+message should be discarded, kill the connection so we don't continue
+waiting on it for more data.
+
+ticket: 7899
+(cherry picked from commit ca80f64c786341d5871ae1de18142e62af64f7b9)
+---
+ src/lib/krb5/os/sendto_kdc.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
+index 0f4bf23a95..262edf09b4 100644
+--- a/src/lib/krb5/os/sendto_kdc.c
++++ b/src/lib/krb5/os/sendto_kdc.c
+@@ -1440,7 +1440,10 @@ service_fds(krb5_context context, struct select_state *selstate,
+                 if (msg_handler != NULL) {
+                     krb5_data reply = make_data(state->in.buf, state->in.pos);
+ 
+-                    stop = (msg_handler(context, &reply, msg_handler_data) != 0);
++                    if (!msg_handler(context, &reply, msg_handler_data)) {
++                        kill_conn(context, state, selstate);
++                        stop = 0;
++                    }
+                 }
+ 
+                 if (stop) {
+-- 
+2.46.0
+
diff --git a/0021-Add-request_timeout-configuration-parameter.patch b/0021-Add-request_timeout-configuration-parameter.patch
new file mode 100644
index 0000000..5b84513
--- /dev/null
+++ b/0021-Add-request_timeout-configuration-parameter.patch
@@ -0,0 +1,226 @@
+From a07b3ae29fd972c40e30b95f6bcc8fb3ed4d9991 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Thu, 26 Oct 2023 14:20:34 -0400
+Subject: [PATCH] Add request_timeout configuration parameter
+
+Add a parameter to limit the total amount of time taken for a KDC or
+password change request.
+
+ticket: 9106 (new)
+(cherry picked from commit 802318cda963456b3ed7856c836e89da891483be)
+---
+ doc/admin/conf_files/krb5_conf.rst |  9 ++++++
+ src/include/k5-int.h               |  2 ++
+ src/lib/krb5/krb/init_ctx.c        | 14 +++++++-
+ src/lib/krb5/os/sendto_kdc.c       | 51 ++++++++++++++++++++----------
+ 4 files changed, 58 insertions(+), 18 deletions(-)
+
+diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
+index a33711d918..65fb592d98 100644
+--- a/doc/admin/conf_files/krb5_conf.rst
++++ b/doc/admin/conf_files/krb5_conf.rst
+@@ -356,6 +356,15 @@ The libdefaults section may contain any of the following relations:
+     (:ref:`duration` string.)  Sets the default renewable lifetime
+     for initial ticket requests.  The default value is 0.
+ 
++**request_timeout**
++    (:ref:`duration` string.)  Sets the maximum total time for KDC or
++    password change requests.  This timeout does not affect the
++    intervals between requests, so setting a low timeout may result in
++    fewer requests being attempted and/or some servers not being
++    contacted.  A value of 0 indicates no specific maximum, in which
++    case requests will time out if no server responds after several
++    tries.  The default value is 0.  (New in release 1.22.)
++
+ **spake_preauth_groups**
+     A whitespace or comma-separated list of words which specifies the
+     groups allowed for SPAKE preauthentication.  The possible values
+diff --git a/src/include/k5-int.h b/src/include/k5-int.h
+index b3e07945c1..69d6a6f569 100644
+--- a/src/include/k5-int.h
++++ b/src/include/k5-int.h
+@@ -296,6 +296,7 @@ typedef unsigned char   u_char;
+ #define KRB5_CONF_SPAKE_PREAUTH_INDICATOR      "spake_preauth_indicator"
+ #define KRB5_CONF_SPAKE_PREAUTH_KDC_CHALLENGE  "spake_preauth_kdc_challenge"
+ #define KRB5_CONF_SPAKE_PREAUTH_GROUPS         "spake_preauth_groups"
++#define KRB5_CONF_REQUEST_TIMEOUT              "request_timeout"
+ #define KRB5_CONF_TICKET_LIFETIME              "ticket_lifetime"
+ #define KRB5_CONF_UDP_PREFERENCE_LIMIT         "udp_preference_limit"
+ #define KRB5_CONF_UNLOCKITER                   "unlockiter"
+@@ -1200,6 +1201,7 @@ struct _krb5_context {
+     kdb5_dal_handle *dal_handle;
+     /* allowable clock skew */
+     krb5_deltat     clockskew;
++    krb5_deltat     req_timeout;
+     krb5_flags      kdc_default_options;
+     krb5_flags      library_options;
+     krb5_boolean    profile_secure;
+diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
+index 2b5abcd817..582a2945ff 100644
+--- a/src/lib/krb5/krb/init_ctx.c
++++ b/src/lib/krb5/krb/init_ctx.c
+@@ -157,7 +157,7 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
+     krb5_context ctx = 0;
+     krb5_error_code retval;
+     int tmp;
+-    char *plugin_dir = NULL;
++    char *plugin_dir = NULL, *timeout_str = NULL;
+ 
+     /* Verify some assumptions.  If the assumptions hold and the
+        compiler is optimizing, this should result in no code being
+@@ -240,6 +240,17 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
+     get_integer(ctx, KRB5_CONF_CLOCKSKEW, DEFAULT_CLOCKSKEW, &tmp);
+     ctx->clockskew = tmp;
+ 
++    retval = profile_get_string(ctx->profile, KRB5_CONF_LIBDEFAULTS,
++                                KRB5_CONF_REQUEST_TIMEOUT, NULL, NULL,
++                                &timeout_str);
++    if (retval)
++        goto cleanup;
++    if (timeout_str != NULL) {
++        retval = krb5_string_to_deltat(timeout_str, &ctx->req_timeout);
++        if (retval)
++            goto cleanup;
++    }
++
+     get_integer(ctx, KRB5_CONF_KDC_DEFAULT_OPTIONS, KDC_OPT_RENEWABLE_OK,
+                 &tmp);
+     ctx->kdc_default_options = tmp;
+@@ -281,6 +292,7 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
+ 
+ cleanup:
+     profile_release_string(plugin_dir);
++    profile_release_string(timeout_str);
+     krb5_free_context(ctx);
+     return retval;
+ }
+diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
+index 262edf09b4..98247a1089 100644
+--- a/src/lib/krb5/os/sendto_kdc.c
++++ b/src/lib/krb5/os/sendto_kdc.c
+@@ -1395,34 +1395,41 @@ get_endtime(time_ms endtime, struct conn_state *conns)
+ 
+ static krb5_boolean
+ service_fds(krb5_context context, struct select_state *selstate,
+-            time_ms interval, struct conn_state *conns,
++            time_ms interval, time_ms timeout, struct conn_state *conns,
+             struct select_state *seltemp, const krb5_data *realm,
+             int (*msg_handler)(krb5_context, const krb5_data *, void *),
+             void *msg_handler_data, struct conn_state **winner_out)
+ {
+     int e, selret = 0;
+-    time_ms endtime;
++    time_ms curtime, interval_end, endtime;
+     struct conn_state *state;
+ 
+     *winner_out = NULL;
+ 
+-    e = get_curtime_ms(&endtime);
++    e = get_curtime_ms(&curtime);
+     if (e)
+         return TRUE;
+-    endtime += interval;
++    interval_end = curtime + interval;
+ 
+     e = 0;
+     while (selstate->nfds > 0) {
+-        e = cm_select_or_poll(selstate, get_endtime(endtime, conns),
+-                              seltemp, &selret);
++        endtime = get_endtime(interval_end, conns);
++        /* Don't wait longer than the whole request should last. */
++        if (timeout && endtime > timeout)
++            endtime = timeout;
++        e = cm_select_or_poll(selstate, endtime, seltemp, &selret);
+         if (e == EINTR)
+             continue;
+         if (e != 0)
+             break;
+ 
+-        if (selret == 0)
+-            /* Timeout, return to caller.  */
++        if (selret == 0) {
++            /* We timed out.  Stop if we hit the overall request timeout. */
++            if (timeout && (get_curtime_ms(&curtime) || curtime >= timeout))
++                return TRUE;
++            /* Otherwise return to the caller to send the next request. */
+             return FALSE;
++        }
+ 
+         /* Got something on a socket, process it.  */
+         for (state = conns; state != NULL; state = state->next) {
+@@ -1495,7 +1502,7 @@ k5_sendto(krb5_context context, const krb5_data *message,
+           void *msg_handler_data)
+ {
+     int pass;
+-    time_ms delay;
++    time_ms delay, timeout = 0;
+     krb5_error_code retval;
+     struct conn_state *conns = NULL, *state, **tailptr, *next, *winner;
+     size_t s;
+@@ -1505,6 +1512,13 @@ k5_sendto(krb5_context context, const krb5_data *message,
+ 
+     *reply = empty_data();
+ 
++    if (context->req_timeout) {
++        retval = get_curtime_ms(&timeout);
++        if (retval)
++            return retval;
++        timeout += 1000 * context->req_timeout;
++    }
++
+     /* One for use here, listing all our fds in use, and one for
+      * temporary use in service_fds, for the fds of interest.  */
+     sel_state = malloc(2 * sizeof(*sel_state));
+@@ -1532,8 +1546,9 @@ k5_sendto(krb5_context context, const krb5_data *message,
+             if (maybe_send(context, state, message, sel_state, realm,
+                            callback_info))
+                 continue;
+-            done = service_fds(context, sel_state, 1000, conns, seltemp,
+-                               realm, msg_handler, msg_handler_data, &winner);
++            done = service_fds(context, sel_state, 1000, timeout, conns,
++                               seltemp, realm, msg_handler, msg_handler_data,
++                               &winner);
+         }
+     }
+ 
+@@ -1545,13 +1560,13 @@ k5_sendto(krb5_context context, const krb5_data *message,
+         if (maybe_send(context, state, message, sel_state, realm,
+                        callback_info))
+             continue;
+-        done = service_fds(context, sel_state, 1000, conns, seltemp,
++        done = service_fds(context, sel_state, 1000, timeout, conns, seltemp,
+                            realm, msg_handler, msg_handler_data, &winner);
+     }
+ 
+     /* Wait for two seconds at the end of the first pass. */
+     if (!done) {
+-        done = service_fds(context, sel_state, 2000, conns, seltemp,
++        done = service_fds(context, sel_state, 2000, timeout, conns, seltemp,
+                            realm, msg_handler, msg_handler_data, &winner);
+     }
+ 
+@@ -1562,15 +1577,17 @@ k5_sendto(krb5_context context, const krb5_data *message,
+             if (maybe_send(context, state, message, sel_state, realm,
+                            callback_info))
+                 continue;
+-            done = service_fds(context, sel_state, 1000, conns, seltemp,
+-                               realm, msg_handler, msg_handler_data, &winner);
++            done = service_fds(context, sel_state, 1000, timeout, conns,
++                               seltemp, realm, msg_handler, msg_handler_data,
++                               &winner);
+             if (sel_state->nfds == 0)
+                 break;
+         }
+         /* Wait for the delay backoff at the end of this pass. */
+         if (!done) {
+-            done = service_fds(context, sel_state, delay, conns, seltemp,
+-                               realm, msg_handler, msg_handler_data, &winner);
++            done = service_fds(context, sel_state, delay, timeout, conns,
++                               seltemp, realm, msg_handler, msg_handler_data,
++                               &winner);
+         }
+         if (sel_state->nfds == 0)
+             break;
+-- 
+2.46.0
+
diff --git a/0022-Wait-indefinitely-on-KDC-TCP-connections.patch b/0022-Wait-indefinitely-on-KDC-TCP-connections.patch
new file mode 100644
index 0000000..26b884b
--- /dev/null
+++ b/0022-Wait-indefinitely-on-KDC-TCP-connections.patch
@@ -0,0 +1,138 @@
+From 1da153d97d7fb30a44fca35f9b71b8f4ed5385b9 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Thu, 26 Oct 2023 16:26:42 -0400
+Subject: [PATCH] Wait indefinitely on KDC TCP connections
+
+When making a KDC or password change request, wait indefinitely
+(limited only by request_timeout if set) once a KDC has accepted a TCP
+connection.
+
+ticket: 9105 (new)
+(cherry picked from commit 6436a3808061da787a43c6810f5f0370cdfb6e36)
+---
+ doc/admin/conf_files/krb5_conf.rst |  2 +-
+ src/lib/krb5/os/sendto_kdc.c       | 50 ++++++++++++++++--------------
+ 2 files changed, 27 insertions(+), 25 deletions(-)
+
+diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
+index 65fb592d98..b7284c47df 100644
+--- a/doc/admin/conf_files/krb5_conf.rst
++++ b/doc/admin/conf_files/krb5_conf.rst
+@@ -357,7 +357,7 @@ The libdefaults section may contain any of the following relations:
+     for initial ticket requests.  The default value is 0.
+ 
+ **request_timeout**
+-    (:ref:`duration` string.)  Sets the maximum total time for KDC or
++    (:ref:`duration` string.)  Sets the maximum total time for KDC and
+     password change requests.  This timeout does not affect the
+     intervals between requests, so setting a low timeout may result in
+     fewer requests being attempted and/or some servers not being
+diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
+index 98247a1089..924f5b2d26 100644
+--- a/src/lib/krb5/os/sendto_kdc.c
++++ b/src/lib/krb5/os/sendto_kdc.c
+@@ -134,7 +134,6 @@ struct conn_state {
+     krb5_data callback_buffer;
+     size_t server_index;
+     struct conn_state *next;
+-    time_ms endtime;
+     krb5_boolean defer;
+     struct {
+         const char *uri_path;
+@@ -344,15 +343,19 @@ cm_select_or_poll(const struct select_state *in, time_ms endtime,
+                   struct select_state *out, int *sret)
+ {
+ #ifndef USE_POLL
+-    struct timeval tv;
++    struct timeval tv, *tvp;
+ #endif
+     krb5_error_code retval;
+     time_ms curtime, interval;
+ 
+-    retval = get_curtime_ms(&curtime);
+-    if (retval != 0)
+-        return retval;
+-    interval = (curtime < endtime) ? endtime - curtime : 0;
++    if (endtime != 0) {
++        retval = get_curtime_ms(&curtime);
++        if (retval != 0)
++            return retval;
++        interval = (curtime < endtime) ? endtime - curtime : 0;
++    } else {
++        interval = -1;
++    }
+ 
+     /* We don't need a separate copy of the selstate for poll, but use one for
+      * consistency with how we use select. */
+@@ -361,9 +364,14 @@ cm_select_or_poll(const struct select_state *in, time_ms endtime,
+ #ifdef USE_POLL
+     *sret = poll(out->fds, out->nfds, interval);
+ #else
+-    tv.tv_sec = interval / 1000;
+-    tv.tv_usec = interval % 1000 * 1000;
+-    *sret = select(out->max, &out->rfds, &out->wfds, &out->xfds, &tv);
++    if (interval != -1) {
++        tv.tv_sec = interval / 1000;
++        tv.tv_usec = interval % 1000 * 1000;
++        tvp = &tv;
++    } else {
++        tvp = NULL;
++    }
++    *sret = select(out->max, &out->rfds, &out->wfds, &out->xfds, tvp);
+ #endif
+ 
+     return (*sret < 0) ? SOCKET_ERRNO : 0;
+@@ -1099,11 +1107,6 @@ service_tcp_connect(krb5_context context, const krb5_data *realm,
+     }
+ 
+     conn->state = WRITING;
+-
+-    /* Record this connection's timeout for service_fds. */
+-    if (get_curtime_ms(&conn->endtime) == 0)
+-        conn->endtime += 10000;
+-
+     return conn->service_write(context, realm, conn, selstate);
+ }
+ 
+@@ -1378,19 +1381,18 @@ kill_conn:
+     return FALSE;
+ }
+ 
+-/* Return the maximum of endtime and the endtime fields of all currently active
+- * TCP connections. */
+-static time_ms
+-get_endtime(time_ms endtime, struct conn_state *conns)
++/* Return true if conns contains any states with connected TCP sockets. */
++static krb5_boolean
++any_tcp_connections(struct conn_state *conns)
+ {
+     struct conn_state *state;
+ 
+     for (state = conns; state != NULL; state = state->next) {
+-        if ((state->state == READING || state->state == WRITING) &&
+-            state->endtime > endtime)
+-            endtime = state->endtime;
++        if (state->addr.transport != UDP &&
++            (state->state == READING || state->state == WRITING))
++            return TRUE;
+     }
+-    return endtime;
++    return FALSE;
+ }
+ 
+ static krb5_boolean
+@@ -1413,9 +1415,9 @@ service_fds(krb5_context context, struct select_state *selstate,
+ 
+     e = 0;
+     while (selstate->nfds > 0) {
+-        endtime = get_endtime(interval_end, conns);
++        endtime = any_tcp_connections(conns) ? 0 : interval_end;
+         /* Don't wait longer than the whole request should last. */
+-        if (timeout && endtime > timeout)
++        if (timeout && (!endtime || endtime > timeout))
+             endtime = timeout;
+         e = cm_select_or_poll(selstate, endtime, seltemp, &selret);
+         if (e == EINTR)
+-- 
+2.46.0
+
diff --git a/0023-Remove-PKINIT-RSA-support.patch b/0023-Remove-PKINIT-RSA-support.patch
new file mode 100644
index 0000000..7672f02
--- /dev/null
+++ b/0023-Remove-PKINIT-RSA-support.patch
@@ -0,0 +1,1297 @@
+From 4f008362334dc2d66d67453448061e19feda889d Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Sun, 26 Nov 2023 17:42:34 -0500
+Subject: [PATCH] Remove PKINIT RSA support
+
+RSA mode is no longer needed for interoperability.  Reduce the attack
+surface of clients and KDCs by removing support for it.
+
+ticket: 9108 (new)
+(cherry picked from commit 401f584526e501b68e7516c17d8e467883f8f210)
+---
+ doc/user/user_commands/kinit.rst              |   4 -
+ src/plugins/preauth/pkinit/pkinit.h           |   2 -
+ src/plugins/preauth/pkinit/pkinit_clnt.c      | 235 +++-----
+ src/plugins/preauth/pkinit/pkinit_crypto.h    |  39 --
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 504 ------------------
+ src/plugins/preauth/pkinit/pkinit_lib.c       |   2 -
+ src/plugins/preauth/pkinit/pkinit_srv.c       | 208 +++-----
+ src/plugins/preauth/pkinit/pkinit_trace.h     |   9 -
+ src/tests/t_pkinit.py                         |   7 -
+ src/windows/leash/htmlhelp/html/KINIT.htm     |   3 -
+ 10 files changed, 131 insertions(+), 882 deletions(-)
+
+diff --git a/doc/user/user_commands/kinit.rst b/doc/user/user_commands/kinit.rst
+index 5b105e35a5..d947e83cc6 100644
+--- a/doc/user/user_commands/kinit.rst
++++ b/doc/user/user_commands/kinit.rst
+@@ -193,10 +193,6 @@ OPTIONS
+     **X509_anchors**\ =\ *value*
+         specify where to find trusted X509 anchor information
+ 
+-    **flag_RSA_PROTOCOL**\ [**=yes**]
+-        specify use of RSA, rather than the default Diffie-Hellman
+-        protocol
+-
+     **disable_freshness**\ [**=yes**]
+         disable sending freshness tokens (for testing purposes only)
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h
+index 66f92d8f03..5ab0f4bc28 100644
+--- a/src/plugins/preauth/pkinit/pkinit.h
++++ b/src/plugins/preauth/pkinit/pkinit.h
+@@ -146,7 +146,6 @@ typedef struct _pkinit_plg_opts {
+     int require_eku;	    /* require EKU checking (default is true) */
+     int accept_secondary_eku;/* accept secondary EKU (default is false) */
+     int allow_upn;	    /* allow UPN-SAN instead of pkinit-SAN */
+-    int dh_or_rsa;	    /* selects DH or RSA based pkinit */
+     int require_crl_checking; /* require CRL for a CA (default is false) */
+     int require_freshness;  /* require freshness token (default is false) */
+     int disable_freshness;  /* disable freshness token on client for testing */
+@@ -160,7 +159,6 @@ typedef struct _pkinit_req_opts {
+     int require_eku;
+     int accept_secondary_eku;
+     int allow_upn;
+-    int dh_or_rsa;
+     int require_crl_checking;
+     int dh_size;	    /* initial request DH modulus size (default=1024) */
+     int require_hostname_match;
+diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
+index ea9ba454df..54e7537600 100644
+--- a/src/plugins/preauth/pkinit/pkinit_clnt.c
++++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
+@@ -191,7 +191,6 @@ pkinit_as_req_create(krb5_context context,
+     krb5_auth_pack auth_pack;
+     krb5_pa_pk_as_req *req = NULL;
+     krb5_algorithm_identifier **cmstypes = NULL;
+-    int protocol = reqctx->opts->dh_or_rsa;
+ 
+     pkiDebug("pkinit_as_req_create pa_type = %d\n", reqctx->pa_type);
+ 
+@@ -214,29 +213,14 @@ pkinit_as_req_create(krb5_context context,
+     if (retval)
+         goto cleanup;
+ 
+-    switch(protocol) {
+-    case DH_PROTOCOL:
+-        TRACE_PKINIT_CLIENT_REQ_DH(context);
+-        pkiDebug("as_req: DH key transport algorithm\n");
++    TRACE_PKINIT_CLIENT_REQ_DH(context);
+ 
+-        /* create client-side DH keys */
+-        retval = client_create_dh(context, plgctx->cryptoctx,
+-                                  reqctx->cryptoctx, reqctx->idctx,
+-                                  reqctx->opts->dh_size, &spki);
+-        auth_pack.clientPublicValue = spki;
+-        if (retval != 0) {
+-            pkiDebug("failed to create dh parameters\n");
+-            goto cleanup;
+-        }
+-        break;
+-    case RSA_PROTOCOL:
+-        TRACE_PKINIT_CLIENT_REQ_RSA(context);
+-        pkiDebug("as_req: RSA key transport algorithm\n");
+-        break;
+-    default:
+-        pkiDebug("as_req: unknown key transport protocol %d\n",
+-                 protocol);
+-        retval = -1;
++    /* create client-side DH keys */
++    retval = client_create_dh(context, plgctx->cryptoctx, reqctx->cryptoctx,
++                              reqctx->idctx, reqctx->opts->dh_size, &spki);
++    auth_pack.clientPublicValue = spki;
++    if (retval != 0) {
++        pkiDebug("failed to create dh parameters\n");
+         goto cleanup;
+     }
+ 
+@@ -553,49 +537,34 @@ pkinit_as_rep_parse(krb5_context context,
+         return retval;
+     }
+ 
+-    switch(kdc_reply->choice) {
+-    case choice_pa_pk_as_rep_dhInfo:
+-        pkiDebug("as_rep: DH key transport algorithm\n");
++    if (kdc_reply->choice != choice_pa_pk_as_rep_dhInfo) {
++        pkiDebug("unknown as_rep type %d\n", kdc_reply->choice);
++        retval = KRB5KDC_ERR_PREAUTH_FAILED;
++        goto cleanup;
++    }
++
+ #ifdef DEBUG_ASN1
+-        print_buffer_bin(kdc_reply->u.dh_Info.dhSignedData.data,
+-                         kdc_reply->u.dh_Info.dhSignedData.length, "/tmp/client_kdc_signeddata");
++    print_buffer_bin(kdc_reply->u.dh_Info.dhSignedData.data,
++                     kdc_reply->u.dh_Info.dhSignedData.length,
++                     "/tmp/client_kdc_signeddata");
+ #endif
+-        if ((retval = cms_signeddata_verify(context, plgctx->cryptoctx,
+-                                            reqctx->cryptoctx, reqctx->idctx, CMS_SIGN_SERVER,
+-                                            reqctx->opts->require_crl_checking,
+-                                            (unsigned char *)
+-                                            kdc_reply->u.dh_Info.dhSignedData.data,
+-                                            kdc_reply->u.dh_Info.dhSignedData.length,
+-                                            (unsigned char **)&dh_data.data,
+-                                            &dh_data.length,
+-                                            NULL, NULL, NULL)) != 0) {
+-            pkiDebug("failed to verify pkcs7 signed data\n");
+-            TRACE_PKINIT_CLIENT_REP_DH_FAIL(context);
+-            goto cleanup;
+-        }
+-        TRACE_PKINIT_CLIENT_REP_DH(context);
+-        break;
+-    case choice_pa_pk_as_rep_encKeyPack:
+-        pkiDebug("as_rep: RSA key transport algorithm\n");
+-        if ((retval = cms_envelopeddata_verify(context, plgctx->cryptoctx,
+-                                               reqctx->cryptoctx, reqctx->idctx, pa_type,
+-                                               reqctx->opts->require_crl_checking,
+-                                               (unsigned char *)
+-                                               kdc_reply->u.encKeyPack.data,
+-                                               kdc_reply->u.encKeyPack.length,
+-                                               (unsigned char **)&dh_data.data,
+-                                               &dh_data.length)) != 0) {
+-            pkiDebug("failed to verify pkcs7 enveloped data\n");
+-            TRACE_PKINIT_CLIENT_REP_RSA_FAIL(context);
+-            goto cleanup;
+-        }
+-        TRACE_PKINIT_CLIENT_REP_RSA(context);
+-        break;
+-    default:
+-        pkiDebug("unknown as_rep type %d\n", kdc_reply->choice);
+-        retval = -1;
++    retval = cms_signeddata_verify(context, plgctx->cryptoctx,
++                                   reqctx->cryptoctx, reqctx->idctx,
++                                   CMS_SIGN_SERVER,
++                                   reqctx->opts->require_crl_checking,
++                                   (unsigned char *)
++                                   kdc_reply->u.dh_Info.dhSignedData.data,
++                                   kdc_reply->u.dh_Info.dhSignedData.length,
++                                   (unsigned char **)&dh_data.data,
++                                   &dh_data.length,
++                                   NULL, NULL, NULL);
++    if (retval) {
++        pkiDebug("failed to verify pkcs7 signed data\n");
++        TRACE_PKINIT_CLIENT_REP_DH_FAIL(context);
+         goto cleanup;
+     }
++    TRACE_PKINIT_CLIENT_REP_DH(context);
++
+     retval = krb5_build_principal_ext(context, &kdc_princ,
+                                       request->server->realm.length,
+                                       request->server->realm.data,
+@@ -632,116 +601,54 @@ pkinit_as_rep_parse(krb5_context context,
+ 
+     OCTETDATA_TO_KRB5DATA(&dh_data, &k5data);
+ 
+-    switch(kdc_reply->choice) {
+-    case choice_pa_pk_as_rep_dhInfo:
+ #ifdef DEBUG_ASN1
+-        print_buffer_bin(dh_data.data, dh_data.length,
+-                         "/tmp/client_dh_key");
++    print_buffer_bin(dh_data.data, dh_data.length, "/tmp/client_dh_key");
+ #endif
+-        if ((retval = k5int_decode_krb5_kdc_dh_key_info(&k5data,
+-                                                        &kdc_dh)) != 0) {
+-            pkiDebug("failed to decode kdc_dh_key_info\n");
+-            goto cleanup;
+-        }
+-
+-        /* client after KDC reply */
+-        if ((retval = client_process_dh(context, plgctx->cryptoctx,
+-                                        reqctx->cryptoctx, reqctx->idctx,
+-                                        (unsigned char *)
+-                                        kdc_dh->subjectPublicKey.data,
+-                                        kdc_dh->subjectPublicKey.length,
+-                                        &client_key, &client_key_len)) != 0) {
+-            pkiDebug("failed to process dh params\n");
+-            goto cleanup;
+-        }
+-
+-        /* If we have a KDF algorithm ID, call the algorithm agility KDF... */
+-        if (kdc_reply->u.dh_Info.kdfID) {
+-            secret.length = client_key_len;
+-            secret.data = (char *)client_key;
+-
+-            retval = pkinit_alg_agility_kdf(context, &secret,
+-                                            kdc_reply->u.dh_Info.kdfID,
+-                                            request->client, request->server,
+-                                            etype, encoded_request,
+-                                            (krb5_data *)as_rep, key_block);
+-
+-            if (retval) {
+-                pkiDebug("failed to create key pkinit_alg_agility_kdf %s\n",
+-                         error_message(retval));
+-                goto cleanup;
+-            }
+-            TRACE_PKINIT_CLIENT_KDF_ALG(context, kdc_reply->u.dh_Info.kdfID,
+-                                        key_block);
++    retval = k5int_decode_krb5_kdc_dh_key_info(&k5data, &kdc_dh);
++    if (retval) {
++        pkiDebug("failed to decode kdc_dh_key_info\n");
++        goto cleanup;
++    }
+ 
+-            /* ...otherwise, use the older octetstring2key function. */
+-        } else {
++    /* client after KDC reply */
++    retval = client_process_dh(context, plgctx->cryptoctx, reqctx->cryptoctx,
++                               reqctx->idctx,
++                               (unsigned char *)kdc_dh->subjectPublicKey.data,
++                               kdc_dh->subjectPublicKey.length, &client_key,
++                               &client_key_len);
++    if (retval) {
++        pkiDebug("failed to process dh params\n");
++        goto cleanup;
++    }
+ 
+-            retval = pkinit_octetstring2key(context, etype, client_key,
+-                                            client_key_len, key_block);
+-            if (retval) {
+-                pkiDebug("failed to create key pkinit_octetstring2key %s\n",
+-                         error_message(retval));
+-                goto cleanup;
+-            }
+-            TRACE_PKINIT_CLIENT_KDF_OS2K(context, key_block);
+-        }
++    /* If we have a KDF algorithm ID, call the algorithm agility KDF. */
++    if (kdc_reply->u.dh_Info.kdfID) {
++        secret.length = client_key_len;
++        secret.data = (char *)client_key;
+ 
+-        break;
+-    case choice_pa_pk_as_rep_encKeyPack:
+-#ifdef DEBUG_ASN1
+-        print_buffer_bin(dh_data.data, dh_data.length,
+-                         "/tmp/client_key_pack");
+-#endif
+-        retval = k5int_decode_krb5_reply_key_pack(&k5data, &key_pack);
++        retval = pkinit_alg_agility_kdf(context, &secret,
++                                        kdc_reply->u.dh_Info.kdfID,
++                                        request->client, request->server,
++                                        etype, encoded_request,
++                                        (krb5_data *)as_rep, key_block);
+         if (retval) {
+-            pkiDebug("failed to decode reply_key_pack\n");
++            pkiDebug("failed to create key pkinit_alg_agility_kdf %s\n",
++                     error_message(retval));
+             goto cleanup;
+         }
+-        retval = krb5_c_make_checksum(context,
+-                                      key_pack->asChecksum.checksum_type,
+-                                      &key_pack->replyKey,
+-                                      KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM,
+-                                      encoded_request, &cksum);
++        TRACE_PKINIT_CLIENT_KDF_ALG(context, kdc_reply->u.dh_Info.kdfID,
++                                    key_block);
++
++    } else {
++        /* Otherwise, use the older octetstring2key function. */
++        retval = pkinit_octetstring2key(context, etype, client_key,
++                                        client_key_len, key_block);
+         if (retval) {
+-            pkiDebug("failed to make a checksum\n");
++            pkiDebug("failed to create key pkinit_octetstring2key %s\n",
++                     error_message(retval));
+             goto cleanup;
+         }
+-
+-        if ((cksum.length != key_pack->asChecksum.length) ||
+-            k5_bcmp(cksum.contents, key_pack->asChecksum.contents,
+-                    cksum.length) != 0) {
+-            TRACE_PKINIT_CLIENT_REP_CHECKSUM_FAIL(context, &cksum,
+-                                                  &key_pack->asChecksum);
+-            pkiDebug("failed to match the checksums\n");
+-#ifdef DEBUG_CKSUM
+-            pkiDebug("calculating checksum on buf size (%d)\n",
+-                     encoded_request->length);
+-            print_buffer(encoded_request->data, encoded_request->length);
+-            pkiDebug("encrypting key (%d)\n", key_pack->replyKey.length);
+-            print_buffer(key_pack->replyKey.contents,
+-                         key_pack->replyKey.length);
+-            pkiDebug("received checksum type=%d size=%d ",
+-                     key_pack->asChecksum.checksum_type,
+-                     key_pack->asChecksum.length);
+-            print_buffer(key_pack->asChecksum.contents,
+-                         key_pack->asChecksum.length);
+-            pkiDebug("expected checksum type=%d size=%d ",
+-                     cksum.checksum_type, cksum.length);
+-            print_buffer(cksum.contents, cksum.length);
+-#endif
+-            goto cleanup;
+-        } else
+-            pkiDebug("checksums match\n");
+-
+-        krb5_copy_keyblock_contents(context, &key_pack->replyKey,
+-                                    key_block);
+-        TRACE_PKINIT_CLIENT_REP_RSA_KEY(context, key_block, &cksum);
+-
+-        break;
+-    default:
+-        pkiDebug("unknown as_rep type %d\n", kdc_reply->choice);
+-        goto cleanup;
++        TRACE_PKINIT_CLIENT_KDF_OS2K(context, key_block);
+     }
+ 
+     retval = 0;
+@@ -1286,7 +1193,6 @@ pkinit_client_req_init(krb5_context context,
+ 
+     reqctx->opts->require_eku = plgctx->opts->require_eku;
+     reqctx->opts->accept_secondary_eku = plgctx->opts->accept_secondary_eku;
+-    reqctx->opts->dh_or_rsa = plgctx->opts->dh_or_rsa;
+     reqctx->opts->allow_upn = plgctx->opts->allow_upn;
+     reqctx->opts->require_crl_checking = plgctx->opts->require_crl_checking;
+     reqctx->opts->disable_freshness = plgctx->opts->disable_freshness;
+@@ -1457,11 +1363,6 @@ handle_gic_opt(krb5_context context,
+         retval = add_string_to_array(context, &plgctx->idopts->anchors, value);
+         if (retval)
+             return retval;
+-    } else if (strcmp(attr, "flag_RSA_PROTOCOL") == 0) {
+-        if (strcmp(value, "yes") == 0) {
+-            pkiDebug("Setting flag to use RSA_PROTOCOL\n");
+-            plgctx->opts->dh_or_rsa = RSA_PROTOCOL;
+-        }
+     } else if (strcmp(attr, "disable_freshness") == 0) {
+         if (strcmp(value, "yes") == 0)
+             plgctx->opts->disable_freshness = 1;
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h
+index 8bdbea8e95..04199b45a4 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto.h
++++ b/src/plugins/preauth/pkinit/pkinit_crypto.h
+@@ -181,45 +181,6 @@ krb5_error_code cms_signeddata_verify
+ 	int *is_signed);                                /* OUT
+ 		    receives whether message is signed */
+ 
+-/*
+- * this function creates a CMS message where eContentType is EnvelopedData
+- */
+-krb5_error_code cms_envelopeddata_create
+-	(krb5_context context,				/* IN */
+-	pkinit_plg_crypto_context plg_cryptoctx,	/* IN */
+-	pkinit_req_crypto_context req_cryptoctx,	/* IN */
+-	pkinit_identity_crypto_context id_cryptoctx,	/* IN */
+-	krb5_preauthtype pa_type,			/* IN */
+-	unsigned char *key_pack,			/* IN
+-		    contains DER encoded ReplyKeyPack */
+-	unsigned int key_pack_len,			/* IN
+-		    contains length of key_pack */
+-	unsigned char **envel_data,			/* OUT
+-		    receives DER encoded encKeyPack */
+-	unsigned int *envel_data_len);			/* OUT
+-		    receives length of envel_data */
+-
+-/*
+- * this function creates a CMS message where eContentType is EnvelopedData
+- */
+-krb5_error_code cms_envelopeddata_verify
+-	(krb5_context context,				/* IN */
+-	pkinit_plg_crypto_context plg_cryptoctx,	/* IN */
+-	pkinit_req_crypto_context req_cryptoctx,	/* IN */
+-	pkinit_identity_crypto_context id_cryptoctx,	/* IN */
+-	krb5_preauthtype pa_type,			/* IN */
+-	int require_crl_checking,			/* IN
+-		    specifies whether CRL checking should be
+-		    strictly enforced */
+-	unsigned char *envel_data,			/* IN
+-		    contains DER encoded encKeyPack */
+-	unsigned int envel_data_len,			/* IN
+-		    contains length of envel_data */
+-	unsigned char **signed_data,			/* OUT
+-		    receives ReplyKeyPack */
+-	unsigned int *signed_data_len);			/* OUT
+-		    receives length of signed_data */
+-
+ /*
+  * This function retrieves the signer's identity, in a form that could
+  * be passed back in to a future invocation of this module as a candidate
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index f5aade34cc..26fa9184b3 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -66,26 +66,14 @@ static krb5_error_code create_signature
+ (unsigned char **, unsigned int *, unsigned char *, unsigned int,
+  EVP_PKEY *pkey);
+ 
+-static krb5_error_code pkinit_decode_data
+-(krb5_context context, pkinit_identity_crypto_context cryptoctx,
+- const uint8_t *data, unsigned int data_len, uint8_t **decoded,
+- unsigned int *decoded_len);
+-
+ #ifdef DEBUG_DH
+ static void print_dh(DH *, char *);
+ static void print_pubkey(BIGNUM *, char *);
+ #endif
+ 
+-static int prepare_enc_data
+-(const uint8_t *indata, int indata_len, uint8_t **outdata, int *outdata_len);
+-
+ static int openssl_callback (int, X509_STORE_CTX *);
+ static int openssl_callback_ignore_crls (int, X509_STORE_CTX *);
+ 
+-static int pkcs7_decrypt
+-(krb5_context context, pkinit_identity_crypto_context id_cryptoctx, PKCS7 *p7,
+- unsigned char **data_out, unsigned int *len_out);
+-
+ static ASN1_OBJECT * pkinit_pkcs7type2oid
+ (pkinit_plg_crypto_context plg_cryptoctx, int pkcs7_type);
+ 
+@@ -115,20 +103,12 @@ static krb5_error_code pkinit_sign_data_pkcs11
+ (krb5_context context, pkinit_identity_crypto_context id_cryptoctx,
+  unsigned char *data, unsigned int data_len,
+  unsigned char **sig, unsigned int *sig_len);
+-static krb5_error_code pkinit_decode_data_pkcs11
+-(krb5_context context, pkinit_identity_crypto_context id_cryptoctx,
+- const uint8_t *data, unsigned int data_len, uint8_t **decoded_data,
+- unsigned int *decoded_data_len);
+ #endif  /* WITHOUT_PKCS11 */
+ 
+ static krb5_error_code pkinit_sign_data_fs
+ (krb5_context context, pkinit_identity_crypto_context id_cryptoctx,
+  unsigned char *data, unsigned int data_len,
+  unsigned char **sig, unsigned int *sig_len);
+-static krb5_error_code pkinit_decode_data_fs
+-(krb5_context context, pkinit_identity_crypto_context id_cryptoctx,
+- const uint8_t *data, unsigned int data_len, uint8_t **decoded_data,
+- unsigned int *decoded_data_len);
+ 
+ static krb5_error_code
+ create_krb5_invalidCertificates(krb5_context context,
+@@ -140,10 +120,6 @@ create_krb5_invalidCertificates(krb5_context context,
+ static krb5_error_code
+ create_identifiers_from_stack(STACK_OF(X509) *sk,
+                               krb5_external_principal_identifier *** ids);
+-static int
+-wrap_signeddata(unsigned char *data, unsigned int data_len,
+-                unsigned char **out, unsigned int *out_len);
+-
+ static const char *
+ pkcs11err(int err);
+ 
+@@ -2177,177 +2153,6 @@ cleanup:
+     return retval;
+ }
+ 
+-krb5_error_code
+-cms_envelopeddata_create(krb5_context context,
+-                         pkinit_plg_crypto_context plgctx,
+-                         pkinit_req_crypto_context reqctx,
+-                         pkinit_identity_crypto_context idctx,
+-                         krb5_preauthtype pa_type,
+-                         unsigned char *key_pack,
+-                         unsigned int key_pack_len,
+-                         unsigned char **out,
+-                         unsigned int *out_len)
+-{
+-
+-    krb5_error_code retval = ENOMEM;
+-    PKCS7 *p7 = NULL;
+-    BIO *in = NULL;
+-    unsigned char *p = NULL, *signed_data = NULL, *enc_data = NULL;
+-    int signed_data_len = 0, enc_data_len = 0, flags = PKCS7_BINARY;
+-    STACK_OF(X509) *encerts = NULL;
+-    const EVP_CIPHER *cipher = NULL;
+-
+-    retval = cms_signeddata_create(context, plgctx, reqctx, idctx,
+-                                   CMS_ENVEL_SERVER, key_pack, key_pack_len,
+-                                   &signed_data,
+-                                   (unsigned int *)&signed_data_len);
+-    if (retval) {
+-        pkiDebug("failed to create pkcs7 signed data\n");
+-        goto cleanup;
+-    }
+-
+-    /* check we have client's certificate */
+-    if (reqctx->received_cert == NULL) {
+-        retval = KRB5KDC_ERR_PREAUTH_FAILED;
+-        goto cleanup;
+-    }
+-    encerts = sk_X509_new_null();
+-    sk_X509_push(encerts, reqctx->received_cert);
+-
+-    cipher = EVP_des_ede3_cbc();
+-    in = BIO_new(BIO_s_mem());
+-    prepare_enc_data(signed_data, signed_data_len, &enc_data,
+-                     &enc_data_len);
+-    retval = BIO_write(in, enc_data, enc_data_len);
+-    if (retval != enc_data_len) {
+-        pkiDebug("BIO_write only wrote %d\n", retval);
+-        goto cleanup;
+-    }
+-
+-    p7 = PKCS7_encrypt(encerts, in, cipher, flags);
+-    if (p7 == NULL) {
+-        retval = oerr(context, 0, _("Failed to encrypt PKCS7 object"));
+-        goto cleanup;
+-    }
+-    p7->d.enveloped->enc_data->content_type = OBJ_nid2obj(NID_pkcs7_signed);
+-
+-    *out_len = i2d_PKCS7(p7, NULL);
+-    if (!*out_len || (p = *out = malloc(*out_len)) == NULL) {
+-        retval = ENOMEM;
+-        goto cleanup;
+-    }
+-    retval = i2d_PKCS7(p7, &p);
+-    if (!retval) {
+-        retval = oerr(context, 0, _("Failed to DER encode PKCS7"));
+-        goto cleanup;
+-    }
+-    retval = 0;
+-
+-#ifdef DEBUG_ASN1
+-    print_buffer_bin(*out, *out_len, "/tmp/kdc_enveloped_data");
+-#endif
+-
+-cleanup:
+-    if (p7 != NULL)
+-        PKCS7_free(p7);
+-    if (in != NULL)
+-        BIO_free(in);
+-    free(signed_data);
+-    free(enc_data);
+-    if (encerts != NULL)
+-        sk_X509_free(encerts);
+-
+-    return retval;
+-}
+-
+-krb5_error_code
+-cms_envelopeddata_verify(krb5_context context,
+-                         pkinit_plg_crypto_context plg_cryptoctx,
+-                         pkinit_req_crypto_context req_cryptoctx,
+-                         pkinit_identity_crypto_context id_cryptoctx,
+-                         krb5_preauthtype pa_type,
+-                         int require_crl_checking,
+-                         unsigned char *enveloped_data,
+-                         unsigned int enveloped_data_len,
+-                         unsigned char **data,
+-                         unsigned int *data_len)
+-{
+-    krb5_error_code retval = KRB5KDC_ERR_PREAUTH_FAILED;
+-    PKCS7 *p7 = NULL;
+-    const unsigned char *p = enveloped_data;
+-    unsigned int tmp_buf_len = 0, tmp_buf2_len = 0, vfy_buf_len = 0;
+-    unsigned char *tmp_buf = NULL, *tmp_buf2 = NULL, *vfy_buf = NULL;
+-
+-#ifdef DEBUG_ASN1
+-    print_buffer_bin(enveloped_data, enveloped_data_len,
+-                     "/tmp/client_envelopeddata");
+-#endif
+-    /* decode received PKCS7 message */
+-    if ((p7 = d2i_PKCS7(NULL, &p, (int)enveloped_data_len)) == NULL) {
+-        retval = oerr(context, 0, _("Failed to decode PKCS7"));
+-        goto cleanup;
+-    }
+-
+-    /* verify that the received message is PKCS7 EnvelopedData message */
+-    if (OBJ_obj2nid(p7->type) != NID_pkcs7_enveloped ||
+-        p7->d.enveloped == NULL ||
+-        p7->d.enveloped->enc_data->enc_data == NULL) {
+-        pkiDebug("Expected id-enveloped PKCS7 msg (received type = %d)\n",
+-                 OBJ_obj2nid(p7->type));
+-        krb5_set_error_message(context, retval, "wrong oid\n");
+-        goto cleanup;
+-    }
+-
+-    /* decrypt received PKCS7 message */
+-    if (pkcs7_decrypt(context, id_cryptoctx, p7, &tmp_buf, &tmp_buf_len)) {
+-        pkiDebug("PKCS7 decryption successful\n");
+-    } else {
+-        retval = oerr(context, 0, _("Failed to decrypt PKCS7 message"));
+-        goto cleanup;
+-    }
+-
+-#ifdef DEBUG_ASN1
+-    print_buffer_bin(tmp_buf, tmp_buf_len, "/tmp/client_enc_keypack");
+-#endif
+-    /* verify PKCS7 SignedData message */
+-    /* Wrap the signed data to make decoding easier in the verify routine. */
+-    retval = wrap_signeddata(tmp_buf, tmp_buf_len, &tmp_buf2, &tmp_buf2_len);
+-    if (retval) {
+-        pkiDebug("failed to encode signeddata\n");
+-        goto cleanup;
+-    }
+-    vfy_buf = tmp_buf2;
+-    vfy_buf_len = tmp_buf2_len;
+-
+-#ifdef DEBUG_ASN1
+-    print_buffer_bin(vfy_buf, vfy_buf_len, "/tmp/client_enc_keypack2");
+-#endif
+-
+-    retval = cms_signeddata_verify(context, plg_cryptoctx, req_cryptoctx,
+-                                   id_cryptoctx, CMS_ENVEL_SERVER,
+-                                   require_crl_checking,
+-                                   vfy_buf, vfy_buf_len,
+-                                   data, data_len, NULL, NULL, NULL);
+-
+-    if (!retval)
+-        pkiDebug("PKCS7 Verification Success\n");
+-    else {
+-        pkiDebug("PKCS7 Verification Failure\n");
+-        goto cleanup;
+-    }
+-
+-    retval = 0;
+-
+-cleanup:
+-
+-    if (p7 != NULL)
+-        PKCS7_free(p7);
+-    free(tmp_buf);
+-    free(tmp_buf2);
+-
+-    return retval;
+-}
+-
+ static krb5_error_code
+ crypto_retrieve_X509_sans(krb5_context context,
+                           pkinit_plg_crypto_context plgctx,
+@@ -3398,70 +3203,6 @@ pkinit_pkcs7type2oid(pkinit_plg_crypto_context cryptoctx, int pkcs7_type)
+ 
+ }
+ 
+-static int
+-wrap_signeddata(unsigned char *data, unsigned int data_len,
+-                unsigned char **out, unsigned int *out_len)
+-{
+-
+-    unsigned int orig_len = 0, oid_len = 0, tot_len = 0;
+-    ASN1_OBJECT *oid = NULL;
+-    unsigned char *p = NULL;
+-
+-    /* Get length to wrap the original data with SEQUENCE tag */
+-    tot_len = orig_len = ASN1_object_size(1, (int)data_len, V_ASN1_SEQUENCE);
+-
+-    /* Add the signedData OID and adjust lengths */
+-    oid = OBJ_nid2obj(NID_pkcs7_signed);
+-    oid_len = i2d_ASN1_OBJECT(oid, NULL);
+-
+-    tot_len = ASN1_object_size(1, (int)(orig_len+oid_len), V_ASN1_SEQUENCE);
+-
+-    p = *out = malloc(tot_len);
+-    if (p == NULL) return -1;
+-
+-    ASN1_put_object(&p, 1, (int)(orig_len+oid_len),
+-                    V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
+-
+-    i2d_ASN1_OBJECT(oid, &p);
+-
+-    ASN1_put_object(&p, 1, (int)data_len, 0, V_ASN1_CONTEXT_SPECIFIC);
+-    memcpy(p, data, data_len);
+-
+-    *out_len = tot_len;
+-
+-    return 0;
+-}
+-
+-static int
+-prepare_enc_data(const uint8_t *indata, int indata_len, uint8_t **outdata,
+-                 int *outdata_len)
+-{
+-    int tag, class;
+-    long tlen, slen;
+-    const uint8_t *p = indata, *oldp;
+-
+-    if (ASN1_get_object(&p, &slen, &tag, &class, indata_len) & 0x80)
+-        return EINVAL;
+-    if (tag != V_ASN1_SEQUENCE)
+-        return EINVAL;
+-
+-    oldp = p;
+-    if (ASN1_get_object(&p, &tlen, &tag, &class, slen) & 0x80)
+-        return EINVAL;
+-    p += tlen;
+-    slen -= (p - oldp);
+-
+-    if (ASN1_get_object(&p, &tlen, &tag, &class, slen) & 0x80)
+-        return EINVAL;
+-
+-    *outdata = malloc(tlen);
+-    if (*outdata == NULL)
+-        return ENOMEM;
+-    memcpy(*outdata, p, tlen);
+-    *outdata_len = tlen;
+-    return 0;
+-}
+-
+ #ifndef WITHOUT_PKCS11
+ static struct plugin_file_handle *
+ load_pkcs11_module(krb5_context context, const char *modname,
+@@ -3780,169 +3521,6 @@ pkinit_find_private_key(pkinit_identity_crypto_context id_cryptoctx,
+ }
+ #endif
+ 
+-static krb5_error_code
+-pkinit_decode_data_fs(krb5_context context,
+-                      pkinit_identity_crypto_context id_cryptoctx,
+-                      const uint8_t *data, unsigned int data_len,
+-                      uint8_t **decoded_data, unsigned int *decoded_data_len)
+-{
+-    X509 *cert = sk_X509_value(id_cryptoctx->my_certs,
+-                               id_cryptoctx->cert_index);
+-    EVP_PKEY *pkey = id_cryptoctx->my_key;
+-    EVP_PKEY_CTX *ctx = NULL;
+-    uint8_t *buf = NULL;
+-    size_t buf_len = 0;
+-    int ok;
+-
+-    *decoded_data = NULL;
+-    *decoded_data_len = 0;
+-
+-    if (cert != NULL && !X509_check_private_key(cert, pkey)) {
+-        pkiDebug("private key does not match certificate\n");
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
+-    }
+-
+-    ctx = EVP_PKEY_CTX_new(pkey, NULL);
+-    if (ctx == NULL)
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
+-
+-    ok = EVP_PKEY_decrypt_init(ctx);
+-    if (!ok)
+-        goto cleanup;
+-
+-    /* Get the length of the eventual output. */
+-    ok = EVP_PKEY_decrypt(ctx, NULL, &buf_len, data, data_len);
+-    if (!ok) {
+-        pkiDebug("unable to decrypt received data\n");
+-        goto cleanup;
+-    }
+-
+-    buf = malloc(buf_len);
+-    if (buf == NULL) {
+-        ok = 0;
+-        goto cleanup;
+-    }
+-
+-    ok = EVP_PKEY_decrypt(ctx, buf, &buf_len, data, data_len);
+-    if (!ok) {
+-        pkiDebug("unable to decrypt received data\n");
+-        goto cleanup;
+-    }
+-
+-    *decoded_data = buf;
+-    *decoded_data_len = buf_len;
+-    buf = NULL;
+-cleanup:
+-    zapfree(buf, buf_len);
+-    EVP_PKEY_CTX_free(ctx);
+-    return ok ? 0 : KRB5KDC_ERR_PREAUTH_FAILED;
+-}
+-
+-#ifndef WITHOUT_PKCS11
+-/*
+- * When using the ActivCard Linux pkcs11 library (v2.0.1), the decrypt function
+- * fails.  By inserting an extra function call, which serves nothing but to
+- * change the stack, we were able to work around the issue.  If the ActivCard
+- * library is fixed in the future, this function can be inlined back into the
+- * caller.
+- */
+-static CK_RV
+-pkinit_C_Decrypt(pkinit_identity_crypto_context id_cryptoctx,
+-                 CK_BYTE_PTR pEncryptedData,
+-                 CK_ULONG  ulEncryptedDataLen,
+-                 CK_BYTE_PTR pData,
+-                 CK_ULONG_PTR pulDataLen)
+-{
+-    CK_RV rv = CKR_OK;
+-
+-    rv = id_cryptoctx->p11->C_Decrypt(id_cryptoctx->session, pEncryptedData,
+-                                      ulEncryptedDataLen, pData, pulDataLen);
+-    if (rv == CKR_OK) {
+-        pkiDebug("pData %p *pulDataLen %d\n", (void *) pData,
+-                 (int) *pulDataLen);
+-    }
+-    return rv;
+-}
+-
+-static krb5_error_code
+-pkinit_decode_data_pkcs11(krb5_context context,
+-                          pkinit_identity_crypto_context id_cryptoctx,
+-                          const uint8_t *data, unsigned int data_len,
+-                          uint8_t **decoded_data,
+-                          unsigned int *decoded_data_len)
+-{
+-    CK_OBJECT_HANDLE obj;
+-    CK_ULONG len;
+-    CK_MECHANISM mech;
+-    uint8_t *cp;
+-    int r;
+-
+-    *decoded_data = NULL;
+-    *decoded_data_len = 0;
+-
+-    if (pkinit_open_session(context, id_cryptoctx)) {
+-        pkiDebug("can't open pkcs11 session\n");
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
+-    }
+-
+-    pkinit_find_private_key(id_cryptoctx, CKA_DECRYPT, &obj);
+-
+-    mech.mechanism = CKM_RSA_PKCS;
+-    mech.pParameter = NULL;
+-    mech.ulParameterLen = 0;
+-
+-    if ((r = id_cryptoctx->p11->C_DecryptInit(id_cryptoctx->session, &mech,
+-                                              obj)) != CKR_OK) {
+-        pkiDebug("C_DecryptInit: 0x%x\n", (int) r);
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
+-    }
+-    pkiDebug("data_len = %d\n", data_len);
+-    cp = malloc((size_t) data_len);
+-    if (cp == NULL)
+-        return ENOMEM;
+-    len = data_len;
+-    pkiDebug("session %p edata %p edata_len %d data %p datalen @%p %d\n",
+-             (void *) id_cryptoctx->session, (void *) data, (int) data_len,
+-             (void *) cp, (void *) &len, (int) len);
+-    r = pkinit_C_Decrypt(id_cryptoctx, (CK_BYTE_PTR) data, (CK_ULONG) data_len,
+-                         cp, &len);
+-    if (r != CKR_OK) {
+-        pkiDebug("C_Decrypt: %s\n", pkcs11err(r));
+-        if (r == CKR_BUFFER_TOO_SMALL)
+-            pkiDebug("decrypt %d needs %d\n", (int) data_len, (int) len);
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
+-    }
+-    pkiDebug("decrypt %d -> %d\n", (int) data_len, (int) len);
+-    *decoded_data_len = len;
+-    *decoded_data = cp;
+-
+-    return 0;
+-}
+-#endif
+-
+-krb5_error_code
+-pkinit_decode_data(krb5_context context,
+-                   pkinit_identity_crypto_context id_cryptoctx,
+-                   const uint8_t *data, unsigned int data_len,
+-                   uint8_t **decoded_data, unsigned int *decoded_data_len)
+-{
+-    krb5_error_code retval = KRB5KDC_ERR_PREAUTH_FAILED;
+-
+-    *decoded_data = NULL;
+-    *decoded_data_len = 0;
+-
+-    if (id_cryptoctx->pkcs11_method != 1)
+-        retval = pkinit_decode_data_fs(context, id_cryptoctx, data, data_len,
+-                                       decoded_data, decoded_data_len);
+-#ifndef WITHOUT_PKCS11
+-    else
+-        retval = pkinit_decode_data_pkcs11(context, id_cryptoctx, data,
+-                                           data_len, decoded_data, decoded_data_len);
+-#endif
+-
+-    return retval;
+-}
+-
+ static krb5_error_code
+ pkinit_sign_data_fs(krb5_context context,
+                     pkinit_identity_crypto_context id_cryptoctx,
+@@ -5617,88 +5195,6 @@ cleanup:
+     return retval;
+ }
+ 
+-/* Originally based on OpenSSL's PKCS7_dataDecode(), now modified to remove the
+- * use of BIO objects and to fit the PKINIT internal interfaces. */
+-static int
+-pkcs7_decrypt(krb5_context context,
+-              pkinit_identity_crypto_context id_cryptoctx, PKCS7 *p7,
+-              unsigned char **data_out, unsigned int *len_out)
+-{
+-    krb5_error_code ret;
+-    int ok = 0, plaintext_len = 0, final_len;
+-    unsigned int keylen = 0, eklen = 0, blocksize;
+-    unsigned char *ek = NULL, *tkey = NULL, *plaintext = NULL, *use_key;
+-    ASN1_OCTET_STRING *data_body = p7->d.enveloped->enc_data->enc_data;
+-    const EVP_CIPHER *evp_cipher;
+-    EVP_CIPHER_CTX *evp_ctx = NULL;
+-    X509_ALGOR *enc_alg = p7->d.enveloped->enc_data->algorithm;
+-    STACK_OF(PKCS7_RECIP_INFO) *rsk = p7->d.enveloped->recipientinfo;
+-    PKCS7_RECIP_INFO *ri = NULL;
+-
+-    *data_out = NULL;
+-    *len_out = 0;
+-
+-    p7->state = PKCS7_S_HEADER;
+-
+-    /* RFC 4556 section 3.2.3.2 requires that there be exactly one
+-     * recipientInfo. */
+-    if (sk_PKCS7_RECIP_INFO_num(rsk) != 1) {
+-        pkiDebug("invalid number of EnvelopedData RecipientInfos\n");
+-        return 0;
+-    }
+-    ri = sk_PKCS7_RECIP_INFO_value(rsk, 0);
+-
+-    evp_cipher = EVP_get_cipherbyobj(enc_alg->algorithm);
+-    if (evp_cipher == NULL)
+-        goto cleanup;
+-    keylen = EVP_CIPHER_key_length(evp_cipher);
+-    blocksize = EVP_CIPHER_block_size(evp_cipher);
+-
+-    evp_ctx = EVP_CIPHER_CTX_new();
+-    if (evp_ctx == NULL)
+-        goto cleanup;
+-    if (!EVP_DecryptInit(evp_ctx, evp_cipher, NULL, NULL) ||
+-        EVP_CIPHER_asn1_to_param(evp_ctx, enc_alg->parameter) <= 0)
+-        goto cleanup;
+-
+-    /* Generate a random symmetric key to avoid exposing timing data if RSA
+-     * decryption fails the padding check. */
+-    tkey = malloc(keylen);
+-    if (tkey == NULL || !EVP_CIPHER_CTX_rand_key(evp_ctx, tkey))
+-        goto cleanup;
+-
+-    /* Decrypt the secret key with the private key. */
+-    ret = pkinit_decode_data(context, id_cryptoctx,
+-                             ASN1_STRING_get0_data(ri->enc_key),
+-                             ASN1_STRING_length(ri->enc_key), &ek, &eklen);
+-    use_key = (ret || eklen != keylen) ? tkey : ek;
+-
+-    /* Allocate a plaintext buffer and decrypt data_body into it. */
+-    plaintext = malloc(data_body->length + blocksize);
+-    if (plaintext == NULL)
+-        goto cleanup;
+-    if (!EVP_DecryptInit(evp_ctx, NULL, use_key, NULL))
+-        goto cleanup;
+-    if (!EVP_DecryptUpdate(evp_ctx, plaintext, &plaintext_len,
+-                           data_body->data, data_body->length))
+-        goto cleanup;
+-    if (!EVP_DecryptFinal(evp_ctx, plaintext + plaintext_len, &final_len))
+-        goto cleanup;
+-    plaintext_len += final_len;
+-
+-    *len_out = plaintext_len;
+-    *data_out = plaintext;
+-    plaintext = NULL;
+-    ok = 1;
+-
+-cleanup:
+-    EVP_CIPHER_CTX_free(evp_ctx);
+-    zapfree(plaintext, plaintext_len);
+-    zapfree(ek, eklen);
+-    zapfree(tkey, keylen);
+-    return ok;
+-}
+-
+ #ifdef DEBUG_DH
+ static void
+ print_dh(DH * dh, char *msg)
+diff --git a/src/plugins/preauth/pkinit/pkinit_lib.c b/src/plugins/preauth/pkinit/pkinit_lib.c
+index 4c3d46bf5a..19db695a4d 100644
+--- a/src/plugins/preauth/pkinit/pkinit_lib.c
++++ b/src/plugins/preauth/pkinit/pkinit_lib.c
+@@ -50,7 +50,6 @@ pkinit_init_req_opts(pkinit_req_opts **reqopts)
+     opts->require_eku = 1;
+     opts->accept_secondary_eku = 0;
+     opts->allow_upn = 0;
+-    opts->dh_or_rsa = DH_PROTOCOL;
+     opts->require_crl_checking = 0;
+     opts->dh_size = PKINIT_DEFAULT_DH_MIN_BITS;
+ 
+@@ -79,7 +78,6 @@ pkinit_init_plg_opts(pkinit_plg_opts **plgopts)
+ 
+     opts->require_eku = 1;
+     opts->accept_secondary_eku = 0;
+-    opts->dh_or_rsa = DH_PROTOCOL;
+     opts->allow_upn = 0;
+     opts->require_crl_checking = 0;
+     opts->require_freshness = 0;
+diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
+index 768a4e559f..aab21f951c 100644
+--- a/src/plugins/preauth/pkinit/pkinit_srv.c
++++ b/src/plugins/preauth/pkinit/pkinit_srv.c
+@@ -821,132 +821,55 @@ pkinit_server_return_padata(krb5_context context,
+         retval = ENOMEM;
+         goto cleanup;
+     }
+-    /* let's assume it's RSA. we'll reset it to DH if needed */
+-    rep->choice = choice_pa_pk_as_rep_encKeyPack;
+ 
+-    if (reqctx->rcv_auth_pack != NULL &&
+-        reqctx->rcv_auth_pack->clientPublicValue.length > 0) {
+-        rep->choice = choice_pa_pk_as_rep_dhInfo;
+-
+-        pkiDebug("received DH key delivery AS REQ\n");
+-        retval = server_process_dh(context, plgctx->cryptoctx,
+-                                   reqctx->cryptoctx, plgctx->idctx,
+-                                   &dh_pubkey, &dh_pubkey_len,
+-                                   &server_key, &server_key_len);
+-        if (retval) {
+-            pkiDebug("failed to process/create dh parameters\n");
+-            goto cleanup;
+-        }
+-
+-        /*
+-         * This is DH, so don't generate the key until after we
+-         * encode the reply, because the encoded reply is needed
+-         * to generate the key in some cases.
+-         */
+-
+-        dhkey_info.subjectPublicKey.length = dh_pubkey_len;
+-        dhkey_info.subjectPublicKey.data = (char *)dh_pubkey;
+-        dhkey_info.nonce = request->nonce;
+-        dhkey_info.dhKeyExpiration = 0;
+-
+-        retval = k5int_encode_krb5_kdc_dh_key_info(&dhkey_info,
+-                                                   &encoded_dhkey_info);
+-        if (retval) {
+-            pkiDebug("encode_krb5_kdc_dh_key_info failed\n");
+-            goto cleanup;
+-        }
+-#ifdef DEBUG_ASN1
+-        print_buffer_bin((unsigned char *)encoded_dhkey_info->data,
+-                         encoded_dhkey_info->length,
+-                         "/tmp/kdc_dh_key_info");
+-#endif
+-
+-        retval = cms_signeddata_create(context, plgctx->cryptoctx,
+-                                       reqctx->cryptoctx, plgctx->idctx,
+-                                       CMS_SIGN_SERVER,
+-                                       (unsigned char *)
+-                                       encoded_dhkey_info->data,
+-                                       encoded_dhkey_info->length,
+-                                       (unsigned char **)
+-                                       &rep->u.dh_Info.dhSignedData.data,
+-                                       &rep->u.dh_Info.dhSignedData.length);
+-        if (retval) {
+-            pkiDebug("failed to create pkcs7 signed data\n");
+-            goto cleanup;
+-        }
+-
+-    } else {
+-        pkiDebug("received RSA key delivery AS REQ\n");
+-
+-        init_krb5_reply_key_pack(&key_pack);
+-        if (key_pack == NULL) {
+-            retval = ENOMEM;
+-            goto cleanup;
+-        }
++    if (reqctx->rcv_auth_pack == NULL ||
++        reqctx->rcv_auth_pack->clientPublicValue.length == 0) {
++        retval = KRB5KDC_ERR_PREAUTH_FAILED;
++        k5_setmsg(context, retval, _("Unsupported PKINIT RSA request"));
++        goto cleanup;
++    }
+ 
+-        retval = krb5_c_make_random_key(context, enctype, &key_pack->replyKey);
+-        if (retval) {
+-            pkiDebug("unable to make a session key\n");
+-            goto cleanup;
+-        }
++    rep->choice = choice_pa_pk_as_rep_dhInfo;
+ 
+-        retval = krb5_c_make_checksum(context, 0, &key_pack->replyKey,
+-                                      KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM,
+-                                      req_pkt, &key_pack->asChecksum);
+-        if (retval) {
+-            pkiDebug("unable to calculate AS REQ checksum\n");
+-            goto cleanup;
+-        }
+-#ifdef DEBUG_CKSUM
+-        pkiDebug("calculating checksum on buf size = %d\n", req_pkt->length);
+-        print_buffer(req_pkt->data, req_pkt->length);
+-        pkiDebug("checksum size = %d\n", key_pack->asChecksum.length);
+-        print_buffer(key_pack->asChecksum.contents,
+-                     key_pack->asChecksum.length);
+-        pkiDebug("encrypting key (%d)\n", key_pack->replyKey.length);
+-        print_buffer(key_pack->replyKey.contents, key_pack->replyKey.length);
+-#endif
++    retval = server_process_dh(context, plgctx->cryptoctx, reqctx->cryptoctx,
++                               plgctx->idctx, &dh_pubkey, &dh_pubkey_len,
++                               &server_key, &server_key_len);
++    if (retval) {
++        pkiDebug("failed to process/create dh parameters\n");
++        goto cleanup;
++    }
+ 
+-        retval = k5int_encode_krb5_reply_key_pack(key_pack,
+-                                                  &encoded_key_pack);
+-        if (retval) {
+-            pkiDebug("failed to encode reply_key_pack\n");
+-            goto cleanup;
+-        }
++    dhkey_info.subjectPublicKey.length = dh_pubkey_len;
++    dhkey_info.subjectPublicKey.data = (char *)dh_pubkey;
++    dhkey_info.nonce = request->nonce;
++    dhkey_info.dhKeyExpiration = 0;
+ 
+-        rep->choice = choice_pa_pk_as_rep_encKeyPack;
+-        retval = cms_envelopeddata_create(context, plgctx->cryptoctx,
+-                                          reqctx->cryptoctx, plgctx->idctx,
+-                                          padata->pa_type,
+-                                          (unsigned char *)
+-                                          encoded_key_pack->data,
+-                                          encoded_key_pack->length,
+-                                          (unsigned char **)
+-                                          &rep->u.encKeyPack.data,
+-                                          &rep->u.encKeyPack.length);
+-        if (retval) {
+-            pkiDebug("failed to create pkcs7 enveloped data: %s\n",
+-                     error_message(retval));
+-            goto cleanup;
+-        }
++    retval = k5int_encode_krb5_kdc_dh_key_info(&dhkey_info,
++                                               &encoded_dhkey_info);
++    if (retval) {
++        pkiDebug("encode_krb5_kdc_dh_key_info failed\n");
++        goto cleanup;
++    }
+ #ifdef DEBUG_ASN1
+-        print_buffer_bin((unsigned char *)encoded_key_pack->data,
+-                         encoded_key_pack->length,
+-                         "/tmp/kdc_key_pack");
+-        print_buffer_bin(rep->u.encKeyPack.data, rep->u.encKeyPack.length,
+-                         "/tmp/kdc_enc_key_pack");
++    print_buffer_bin((unsigned char *)encoded_dhkey_info->data,
++                     encoded_dhkey_info->length, "/tmp/kdc_dh_key_info");
+ #endif
+ 
+-        retval = cb->replace_reply_key(context, rock, &key_pack->replyKey,
+-                                       FALSE);
+-        if (retval)
+-            goto cleanup;
++    retval = cms_signeddata_create(context, plgctx->cryptoctx,
++                                   reqctx->cryptoctx, plgctx->idctx,
++                                   CMS_SIGN_SERVER,
++                                   (unsigned char *)encoded_dhkey_info->data,
++                                   encoded_dhkey_info->length,
++                                   (unsigned char **)
++                                   &rep->u.dh_Info.dhSignedData.data,
++                                   &rep->u.dh_Info.dhSignedData.length);
++    if (retval) {
++        pkiDebug("failed to create pkcs7 signed data\n");
++        goto cleanup;
+     }
+ 
+-    if (rep->choice == choice_pa_pk_as_rep_dhInfo &&
+-        ((reqctx->rcv_auth_pack != NULL &&
+-          reqctx->rcv_auth_pack->supportedKDFs != NULL))) {
+-
++    if (reqctx->rcv_auth_pack != NULL &&
++        reqctx->rcv_auth_pack->supportedKDFs != NULL) {
+         /* If using the alg-agility KDF, put the algorithm in the reply
+          * before encoding it.
+          */
+@@ -973,41 +896,36 @@ pkinit_server_return_padata(krb5_context context,
+                          "/tmp/kdc_as_rep");
+ #endif
+ 
+-    /* If this is DH, we haven't computed the key yet, so do it now. */
+-    if (rep->choice == choice_pa_pk_as_rep_dhInfo) {
+-
+-        /* If mutually supported KDFs were found, use the algorithm agility
+-         * KDF. */
+-        if (rep->u.dh_Info.kdfID) {
+-            secret.data = (char *)server_key;
+-            secret.length = server_key_len;
++    /* If mutually supported KDFs were found, use the algorithm agility KDF. */
++    if (rep->u.dh_Info.kdfID) {
++        secret.data = (char *)server_key;
++        secret.length = server_key_len;
+ 
+-            retval = pkinit_alg_agility_kdf(context, &secret,
+-                                            rep->u.dh_Info.kdfID,
+-                                            request->client, request->server,
+-                                            enctype, req_pkt, out_data,
+-                                            &reply_key);
+-            if (retval) {
+-                pkiDebug("pkinit_alg_agility_kdf failed: %s\n",
+-                         error_message(retval));
+-                goto cleanup;
+-            }
++        retval = pkinit_alg_agility_kdf(context, &secret, rep->u.dh_Info.kdfID,
++                                        request->client, request->server,
++                                        enctype, req_pkt, out_data,
++                                        &reply_key);
++        if (retval) {
++            pkiDebug("pkinit_alg_agility_kdf failed: %s\n",
++                     error_message(retval));
++            goto cleanup;
++        }
+ 
+-            /* Otherwise, use the older octetstring2key() function */
+-        } else {
+-            retval = pkinit_octetstring2key(context, enctype, server_key,
++        /* Otherwise, use the older octetstring2key() function */
++    } else {
++        retval = pkinit_octetstring2key(context, enctype, server_key,
+                                             server_key_len, &reply_key);
+-            if (retval) {
+-                pkiDebug("pkinit_octetstring2key failed: %s\n",
+-                         error_message(retval));
+-                goto cleanup;
+-            }
+-        }
+-        retval = cb->replace_reply_key(context, rock, &reply_key, FALSE);
+-        if (retval)
++        if (retval) {
++            pkiDebug("pkinit_octetstring2key failed: %s\n",
++                     error_message(retval));
+             goto cleanup;
++        }
+     }
+ 
++    retval = cb->replace_reply_key(context, rock, &reply_key, FALSE);
++    if (retval)
++        goto cleanup;
++
+     *send_pa = malloc(sizeof(krb5_pa_data));
+     if (*send_pa == NULL) {
+         retval = ENOMEM;
+diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
+index 5ee39c085c..d385759145 100644
+--- a/src/plugins/preauth/pkinit/pkinit_trace.h
++++ b/src/plugins/preauth/pkinit/pkinit_trace.h
+@@ -58,19 +58,10 @@
+     TRACE(c, "PKINIT client verified DH reply")
+ #define TRACE_PKINIT_CLIENT_REP_DH_FAIL(c)              \
+     TRACE(c, "PKINIT client could not verify DH reply")
+-#define TRACE_PKINIT_CLIENT_REP_RSA(c)                  \
+-    TRACE(c, "PKINIT client verified RSA reply")
+-#define TRACE_PKINIT_CLIENT_REP_RSA_KEY(c, keyblock, cksum)             \
+-    TRACE(c, "PKINIT client retrieved reply key {keyblock} from RSA "   \
+-          "reply (checksum {cksum})", keyblock, cksum)
+-#define TRACE_PKINIT_CLIENT_REP_RSA_FAIL(c)                     \
+-    TRACE(c, "PKINIT client could not verify RSA reply")
+ #define TRACE_PKINIT_CLIENT_REQ_CHECKSUM(c, cksum)                      \
+     TRACE(c, "PKINIT client computed kdc-req-body checksum {cksum}", cksum)
+ #define TRACE_PKINIT_CLIENT_REQ_DH(c)                           \
+     TRACE(c, "PKINIT client making DH request")
+-#define TRACE_PKINIT_CLIENT_REQ_RSA(c)                  \
+-    TRACE(c, "PKINIT client making RSA request")
+ #define TRACE_PKINIT_CLIENT_SAN_CONFIG_DNSNAME(c, host)                 \
+     TRACE(c, "PKINIT client config accepts KDC dNSName SAN {str}", host)
+ #define TRACE_PKINIT_CLIENT_SAN_MATCH_DNSNAME(c, host)                  \
+diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py
+index ec2356ea22..62e6c426d3 100755
+--- a/src/tests/t_pkinit.py
++++ b/src/tests/t_pkinit.py
+@@ -179,13 +179,6 @@ id_conf = {'realms': {'$realm': {'pkinit_identities': [file_identity + 'X',
+ id_env = realm.special_env('idconf', False, krb5_conf=id_conf)
+ realm.kinit(realm.user_princ, expected_trace=msgs, env=id_env)
+ 
+-# Try again using RSA instead of DH.
+-mark('FILE identity, no password, RSA')
+-realm.pkinit(realm.user_princ, flags=['-X', 'flag_RSA_PROTOCOL=yes'],
+-             expected_trace=('PKINIT client making RSA request',
+-                             'PKINIT client verified RSA reply'))
+-realm.klist(realm.user_princ)
+-
+ # Test a DH parameter renegotiation by temporarily setting a 4096-bit
+ # minimum on the KDC.  (Preauth type 16 is PKINIT PA_PK_AS_REQ;
+ # 109 is PKINIT TD_DH_PARAMETERS; 133 is FAST PA-FX-COOKIE.)
+diff --git a/src/windows/leash/htmlhelp/html/KINIT.htm b/src/windows/leash/htmlhelp/html/KINIT.htm
+index eeee211a6e..46cb4a3ad8 100644
+--- a/src/windows/leash/htmlhelp/html/KINIT.htm
++++ b/src/windows/leash/htmlhelp/html/KINIT.htm
+@@ -146,9 +146,6 @@ default credentials cache may vary between systems. If the <b>KRB5CCNAME</b>  en
+   <th id="th2"> <span class="command"> <b>-S</b> <i>service</i><b>_</b><i>name</i></span></th>
+ <td> specify  an  alternate  service name to use when getting initial
+               tickets.</td></tr>
+- <tr>
+-  <th id="th2"> <span class="command"> <b>flag_RSA_PROTOCOL</b>[=yes] </span></th>
+-<td> specify use of RSA, rather than the default Diffie-Hellman protocol. </td></tr>
+ </tbody></table>
+ 
+ <h2>ENVIRONMENT</h2>
+-- 
+2.46.0
+
diff --git a/0024-Fix-various-issues-detected-by-static-analysis.patch b/0024-Fix-various-issues-detected-by-static-analysis.patch
new file mode 100644
index 0000000..ebab90b
--- /dev/null
+++ b/0024-Fix-various-issues-detected-by-static-analysis.patch
@@ -0,0 +1,265 @@
+From 3999883b9745bfd7065d41ff05b19e56bcb2e791 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Fri, 6 Sep 2024 17:18:11 +0200
+Subject: [PATCH] Fix various issues detected by static analysis
+
+In klists's show_credential(), ensure that the column counter doesn't
+decrease if printf() fails.
+
+In process_k5beta7_princ(), bounds-check the e_length field.
+
+In ndr_enc_delegation_info(), initialize b so it is always valid for
+the cleanup handler.
+
+In krb5_dbe_def_decrypt_key_data(), change the flow control so ret is
+always set by the end of the function.  Return KRB5_KDB_INVALIDKEYSIZE
+if there isn't enough data in the first key_data_contents field or if
+the serialized key length is invalid.
+
+In svcauth_gss_validate(), expand rpchdr to accomodate the header plus
+MAX_AUTH_BYTES.
+
+In svcudp_reply(), change slen to unsigned to match the return type of
+XDR_GETPOS() and eliminate an unnecessary check for slen >= 0.
+
+In krb5int_pthread_loaded()(), remove pthread_equal() from the weak
+symbol checks.  It is implemented as an inline function in some glibc
+versions, which makes the comparison "&pthread_equal == 0" always
+false.
+
+[ghudson@mit.edu: further modified krb5_dbe_def_decrypt_key_data() for
+clarity; added detail to commit message]
+
+(cherry picked from commit a96541981ee34c8642ddeb6101b98e883e41c6e5)
+---
+ src/clients/klist/klist.c  | 12 ++++-----
+ src/kadmin/dbutil/dump.c   |  5 ++++
+ src/kdc/ndr.c              |  2 +-
+ src/lib/kdb/decrypt_key.c  | 54 ++++++++++++++++++++------------------
+ src/lib/rpc/svc_auth_gss.c |  5 +++-
+ src/lib/rpc/svc_udp.c      | 13 ++++-----
+ src/util/support/threads.c |  2 --
+ 7 files changed, 51 insertions(+), 42 deletions(-)
+
+diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
+index b5808e5c93..ba9539fd23 100644
+--- a/src/clients/klist/klist.c
++++ b/src/clients/klist/klist.c
+@@ -681,7 +681,7 @@ show_credential(krb5_creds *cred, const char *defname)
+     krb5_error_code ret;
+     krb5_ticket *tkt = NULL;
+     char *name = NULL, *sname = NULL, *tktsname, *flags;
+-    int extra_field = 0, ccol = 0, i;
++    int extra_field = 0, ccol = 0, i, r;
+     krb5_boolean is_config = krb5_is_config_principal(context, cred->server);
+ 
+     ret = krb5_unparse_name(context, cred->client, &name);
+@@ -711,11 +711,11 @@ show_credential(krb5_creds *cred, const char *defname)
+         fputs("config: ", stdout);
+         ccol = 8;
+         for (i = 1; i < cred->server->length; i++) {
+-            ccol += printf("%s%.*s%s",
+-                           i > 1 ? "(" : "",
+-                           (int)cred->server->data[i].length,
+-                           cred->server->data[i].data,
+-                           i > 1 ? ")" : "");
++            r = printf("%s%.*s%s", i > 1 ? "(" : "",
++                       (int)cred->server->data[i].length,
++                       cred->server->data[i].data, i > 1 ? ")" : "");
++            if (r >= 0)
++                ccol += r;
+         }
+         fputs(" = ", stdout);
+         ccol += 3;
+diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
+index 4d6cc0bdf9..feb053d834 100644
+--- a/src/kadmin/dbutil/dump.c
++++ b/src/kadmin/dbutil/dump.c
+@@ -704,6 +704,11 @@ process_k5beta7_princ(krb5_context context, const char *fname, FILE *filep,
+ 
+     dbentry->len = u1;
+     dbentry->n_key_data = u4;
++
++    if (u5 > UINT16_MAX) {
++        load_err(fname, *linenop, _("invalid principal extra data size"));
++        goto fail;
++    }
+     dbentry->e_length = u5;
+ 
+     if (kp != NULL) {
+diff --git a/src/kdc/ndr.c b/src/kdc/ndr.c
+index d438408ee2..38be9fe42a 100644
+--- a/src/kdc/ndr.c
++++ b/src/kdc/ndr.c
+@@ -242,7 +242,7 @@ ndr_enc_delegation_info(struct pac_s4u_delegation_info *in, krb5_data *out)
+ {
+     krb5_error_code ret;
+     size_t i;
+-    struct k5buf b;
++    struct k5buf b = EMPTY_K5BUF;
+     struct encoded_wchars pt_encoded = { 0 }, *tss_encoded = NULL;
+     uint32_t pointer = 0;
+ 
+diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
+index 82bbed6312..21aa3742b1 100644
+--- a/src/lib/kdb/decrypt_key.c
++++ b/src/lib/kdb/decrypt_key.c
+@@ -60,7 +60,7 @@ krb5_dbe_def_decrypt_key_data(krb5_context context, const krb5_keyblock *mkey,
+                               krb5_keyblock *dbkey_out,
+                               krb5_keysalt *keysalt_out)
+ {
+-    krb5_error_code ret;
++    krb5_error_code ret = KRB5_CRYPTO_INTERNAL;
+     int16_t keylen;
+     krb5_enc_data cipher;
+     krb5_data plain = empty_data();
+@@ -74,36 +74,38 @@ krb5_dbe_def_decrypt_key_data(krb5_context context, const krb5_keyblock *mkey,
+     if (mkey == NULL)
+         return KRB5_KDB_BADSTORED_MKEY;
+ 
+-    if (kd->key_data_contents[0] != NULL && kd->key_data_length[0] >= 2) {
+-        keylen = load_16_le(kd->key_data_contents[0]);
+-        if (keylen < 0)
+-            return EINVAL;
+-        cipher.enctype = ENCTYPE_UNKNOWN;
+-        cipher.ciphertext = make_data(kd->key_data_contents[0] + 2,
+-                                      kd->key_data_length[0] - 2);
+-        ret = alloc_data(&plain, kd->key_data_length[0] - 2);
+-        if (ret)
+-            goto cleanup;
++    if (kd->key_data_contents[0] == NULL || kd->key_data_length[0] < 2)
++        return KRB5_KDB_INVALIDKEYSIZE;
+ 
+-        ret = krb5_c_decrypt(context, mkey, 0, 0, &cipher, &plain);
+-        if (ret)
+-            goto cleanup;
++    keylen = load_16_le(kd->key_data_contents[0]);
++    if (keylen < 0)
++        return KRB5_KDB_INVALIDKEYSIZE;
+ 
+-        /* Make sure the plaintext has at least as many bytes as the true ke
+-         * length (it may have more due to padding). */
+-        if ((unsigned int)keylen > plain.length) {
+-            ret = KRB5_CRYPTO_INTERNAL;
+-            if (ret)
+-                goto cleanup;
+-        }
++    cipher.enctype = ENCTYPE_UNKNOWN;
++    cipher.ciphertext = make_data(kd->key_data_contents[0] + 2,
++                                  kd->key_data_length[0] - 2);
++    ret = alloc_data(&plain, kd->key_data_length[0] - 2);
++    if (ret)
++        goto cleanup;
+ 
+-        kb.magic = KV5M_KEYBLOCK;
+-        kb.enctype = kd->key_data_type[0];
+-        kb.length = keylen;
+-        kb.contents = (uint8_t *)plain.data;
+-        plain = empty_data();
++    ret = krb5_c_decrypt(context, mkey, 0, 0, &cipher, &plain);
++    if (ret)
++        goto cleanup;
++
++    /* Make sure the plaintext has at least as many bytes as the true key
++     * length (it may have more due to padding). */
++    if ((unsigned int)keylen > plain.length) {
++        ret = KRB5_CRYPTO_INTERNAL;
++        if (ret)
++            goto cleanup;
+     }
+ 
++    kb.magic = KV5M_KEYBLOCK;
++    kb.enctype = kd->key_data_type[0];
++    kb.length = keylen;
++    kb.contents = (uint8_t *)plain.data;
++    plain = empty_data();
++
+     /* Decode salt data. */
+     if (keysalt_out != NULL) {
+         if (kd->key_data_ver == 2) {
+diff --git a/src/lib/rpc/svc_auth_gss.c b/src/lib/rpc/svc_auth_gss.c
+index 98d601c8ab..4f1d2911b0 100644
+--- a/src/lib/rpc/svc_auth_gss.c
++++ b/src/lib/rpc/svc_auth_gss.c
+@@ -297,7 +297,7 @@ svcauth_gss_validate(struct svc_req *rqst, struct svc_rpc_gss_data *gd, struct r
+ 	struct opaque_auth	*oa;
+ 	gss_buffer_desc		 rpcbuf, checksum;
+ 	OM_uint32		 maj_stat, min_stat, qop_state;
+-	u_char			 rpchdr[128];
++	u_char			 rpchdr[32 + MAX_AUTH_BYTES];
+ 	int32_t			*buf;
+ 
+ 	log_debug("in svcauth_gss_validate()");
+@@ -315,6 +315,8 @@ svcauth_gss_validate(struct svc_req *rqst, struct svc_rpc_gss_data *gd, struct r
+ 		return (FALSE);
+ 
+ 	buf = (int32_t *)(void *)rpchdr;
++
++	/* Write the 32 first bytes of the header. */
+ 	IXDR_PUT_LONG(buf, msg->rm_xid);
+ 	IXDR_PUT_ENUM(buf, msg->rm_direction);
+ 	IXDR_PUT_LONG(buf, msg->rm_call.cb_rpcvers);
+@@ -323,6 +325,7 @@ svcauth_gss_validate(struct svc_req *rqst, struct svc_rpc_gss_data *gd, struct r
+ 	IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
+ 	IXDR_PUT_ENUM(buf, oa->oa_flavor);
+ 	IXDR_PUT_LONG(buf, oa->oa_length);
++
+ 	if (oa->oa_length) {
+ 		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
+ 		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
+diff --git a/src/lib/rpc/svc_udp.c b/src/lib/rpc/svc_udp.c
+index 8ecbdf2b33..3aff277eb7 100644
+--- a/src/lib/rpc/svc_udp.c
++++ b/src/lib/rpc/svc_udp.c
+@@ -248,8 +248,9 @@ static bool_t svcudp_reply(
+ {
+      struct svcudp_data *su = su_data(xprt);
+      XDR *xdrs = &su->su_xdrs;
+-     int slen;
++     u_int slen;
+      bool_t stat = FALSE;
++     ssize_t r;
+ 
+      xdrproc_t xdr_results = NULL;
+      caddr_t xdr_location = 0;
+@@ -272,12 +273,12 @@ static bool_t svcudp_reply(
+      if (xdr_replymsg(xdrs, msg) &&
+ 	 (!has_args ||
+ 	  (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
+-	  slen = (int)XDR_GETPOS(xdrs);
+-	  if (sendto(xprt->xp_sock, rpc_buffer(xprt), slen, 0,
+-		     (struct sockaddr *)&(xprt->xp_raddr), xprt->xp_addrlen)
+-	      == slen) {
++	  slen = XDR_GETPOS(xdrs);
++	  r = sendto(xprt->xp_sock, rpc_buffer(xprt), slen, 0,
++		     (struct sockaddr *)&(xprt->xp_raddr), xprt->xp_addrlen);
++	  if (r >= 0 && (u_int)r == slen) {
+ 	       stat = TRUE;
+-	       if (su->su_cache && slen >= 0) {
++	       if (su->su_cache) {
+ 		    cache_set(xprt, (uint32_t) slen);
+ 	       }
+ 	  }
+diff --git a/src/util/support/threads.c b/src/util/support/threads.c
+index be7e4c2e3f..4ded805b79 100644
+--- a/src/util/support/threads.c
++++ b/src/util/support/threads.c
+@@ -118,7 +118,6 @@ struct tsd_block {
+ # pragma weak pthread_mutex_destroy
+ # pragma weak pthread_mutex_init
+ # pragma weak pthread_self
+-# pragma weak pthread_equal
+ # pragma weak pthread_getspecific
+ # pragma weak pthread_setspecific
+ # pragma weak pthread_key_create
+@@ -151,7 +150,6 @@ int krb5int_pthread_loaded (void)
+         || &pthread_mutex_destroy == 0
+         || &pthread_mutex_init == 0
+         || &pthread_self == 0
+-        || &pthread_equal == 0
+         /* Any program that's really multithreaded will have to be
+            able to create threads.  */
+         || &pthread_create == 0
+-- 
+2.46.0
+
diff --git a/0025-Generate-and-verify-message-MACs-in-libkrad.patch b/0025-Generate-and-verify-message-MACs-in-libkrad.patch
new file mode 100644
index 0000000..58c9352
--- /dev/null
+++ b/0025-Generate-and-verify-message-MACs-in-libkrad.patch
@@ -0,0 +1,629 @@
+From ea02fd7bb79861b8e36517c7c95af821a16657c4 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 22 Aug 2024 17:15:50 +0200
+Subject: [PATCH] Generate and verify message MACs in libkrad
+
+Implement some of the measures specified in
+draft-ietf-radext-deprecating-radius-03 for mitigating the BlastRADIUS
+attack (CVE-2024-3596):
+
+* Include a Message-Authenticator MAC as the first attribute when
+  generating a packet of type Access-Request, Access-Reject,
+  Access-Accept, or Access-Challenge (sections 5.2.1 and 5.2.4), if
+  the secret is non-empty.  (An empty secret indicates the use of Unix
+  domain socket transport.)
+
+* Validate the Message-Authenticator MAC in received packets, if
+  present.
+
+FreeRADIUS enforces Message-Authenticator as of versions 3.2.5 and
+3.0.27.  libkrad must generate Message-Authenticator attributes in
+order to remain compatible with these implementations.
+
+[ghudson@mit.edu: adjusted style and naming; simplified some
+functions; edited commit message]
+
+ticket: 9142 (new)
+tags: pullup
+target_version: 1.21-next
+
+(cherry picked from commit 871125fea8ce0370a972bf65f7d1de63f619b06c)
+---
+ src/include/k5-int.h                   |   5 +
+ src/lib/crypto/krb/checksum_hmac_md5.c |  28 ++++
+ src/lib/crypto/libk5crypto.exports     |   1 +
+ src/lib/krad/attr.c                    |  17 ++
+ src/lib/krad/attrset.c                 |  59 +++++--
+ src/lib/krad/internal.h                |   7 +-
+ src/lib/krad/packet.c                  | 206 +++++++++++++++++++++++--
+ src/lib/krad/t_attrset.c               |   2 +-
+ src/lib/krad/t_daemon.py               |   3 +-
+ src/lib/krad/t_packet.c                |  11 ++
+ src/tests/t_otp.py                     |   3 +
+ 11 files changed, 311 insertions(+), 31 deletions(-)
+
+diff --git a/src/include/k5-int.h b/src/include/k5-int.h
+index 69d6a6f569..b7789a2dd8 100644
+--- a/src/include/k5-int.h
++++ b/src/include/k5-int.h
+@@ -2403,4 +2403,9 @@ krb5_boolean
+ k5_sname_compare(krb5_context context, krb5_const_principal sname,
+                  krb5_const_principal princ);
+ 
++/* Generate an HMAC-MD5 keyed checksum as specified by RFC 2104. */
++krb5_error_code
++k5_hmac_md5(const krb5_data *key, const krb5_crypto_iov *data, size_t num_data,
++            krb5_data *output);
++
+ #endif /* _KRB5_INT_H */
+diff --git a/src/lib/crypto/krb/checksum_hmac_md5.c b/src/lib/crypto/krb/checksum_hmac_md5.c
+index ec024f3966..a809388549 100644
+--- a/src/lib/crypto/krb/checksum_hmac_md5.c
++++ b/src/lib/crypto/krb/checksum_hmac_md5.c
+@@ -92,3 +92,31 @@ cleanup:
+     free(hash_iov);
+     return ret;
+ }
++
++krb5_error_code
++k5_hmac_md5(const krb5_data *key, const krb5_crypto_iov *data, size_t num_data,
++            krb5_data *output)
++{
++    krb5_error_code ret;
++    const struct krb5_hash_provider *hash = &krb5int_hash_md5;
++    krb5_keyblock keyblock = { 0 };
++    krb5_data hashed_key;
++    uint8_t hkeybuf[16];
++    krb5_crypto_iov iov;
++
++    /* Hash the key if it is longer than the block size. */
++    if (key->length > hash->blocksize) {
++        hashed_key = make_data(hkeybuf, sizeof(hkeybuf));
++        iov.flags = KRB5_CRYPTO_TYPE_DATA;
++        iov.data = *key;
++        ret = hash->hash(&iov, 1, &hashed_key);
++        if (ret)
++            return ret;
++        key = &hashed_key;
++    }
++
++    keyblock.magic = KV5M_KEYBLOCK;
++    keyblock.length = key->length;
++    keyblock.contents = (uint8_t *)key->data;
++    return krb5int_hmac_keyblock(hash, &keyblock, data, num_data, output);
++}
+diff --git a/src/lib/crypto/libk5crypto.exports b/src/lib/crypto/libk5crypto.exports
+index d8ffa63304..00e0ce1812 100644
+--- a/src/lib/crypto/libk5crypto.exports
++++ b/src/lib/crypto/libk5crypto.exports
+@@ -102,3 +102,4 @@ krb5_c_prfplus
+ krb5_c_derive_prfplus
+ k5_enctype_to_ssf
+ krb5int_c_deprecated_enctype
++k5_hmac_md5
+diff --git a/src/lib/krad/attr.c b/src/lib/krad/attr.c
+index 42d354a3b5..65ed1d35e7 100644
+--- a/src/lib/krad/attr.c
++++ b/src/lib/krad/attr.c
+@@ -125,6 +125,23 @@ static const attribute_record attributes[UCHAR_MAX] = {
+     {"NAS-Port-Type", 4, 4, NULL, NULL},
+     {"Port-Limit", 4, 4, NULL, NULL},
+     {"Login-LAT-Port", 1, MAX_ATTRSIZE, NULL, NULL},
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for tunnelling */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for tunnelling */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for tunnelling */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for tunnelling */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for tunnelling */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for tunnelling */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for Apple Remote Access Protocol */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for Apple Remote Access Protocol */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for Apple Remote Access Protocol */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for Apple Remote Access Protocol */
++    {NULL, 0, 0, NULL, NULL}, /* Reserved for Apple Remote Access Protocol */
++    {NULL, 0, 0, NULL, NULL}, /* Password-Retry */
++    {NULL, 0, 0, NULL, NULL}, /* Prompt */
++    {NULL, 0, 0, NULL, NULL}, /* Connect-Info */
++    {NULL, 0, 0, NULL, NULL}, /* Configuration-Token */
++    {NULL, 0, 0, NULL, NULL}, /* EAP-Message */
++    {"Message-Authenticator", MD5_DIGEST_SIZE, MD5_DIGEST_SIZE, NULL, NULL},
+ };
+ 
+ /* Encode User-Password attribute. */
+diff --git a/src/lib/krad/attrset.c b/src/lib/krad/attrset.c
+index 6ec031e320..e5457ebfd7 100644
+--- a/src/lib/krad/attrset.c
++++ b/src/lib/krad/attrset.c
+@@ -164,15 +164,44 @@ krad_attrset_copy(const krad_attrset *set, krad_attrset **copy)
+     return 0;
+ }
+ 
++/* Place an encoded attributes into outbuf at position *i.  Increment *i by the
++ * length of the encoding. */
++static krb5_error_code
++append_attr(krb5_context ctx, const char *secret,
++            const uint8_t *auth, krad_attr type, const krb5_data *data,
++            uint8_t outbuf[MAX_ATTRSETSIZE], size_t *i, krb5_boolean *is_fips)
++{
++    uint8_t buffer[MAX_ATTRSIZE];
++    size_t attrlen;
++    krb5_error_code retval;
++
++    retval = kr_attr_encode(ctx, secret, auth, type, data, buffer, &attrlen,
++                            is_fips);
++    if (retval)
++        return retval;
++
++    if (attrlen > MAX_ATTRSETSIZE - *i - 2)
++        return EMSGSIZE;
++
++    outbuf[(*i)++] = type;
++    outbuf[(*i)++] = attrlen + 2;
++    memcpy(outbuf + *i, buffer, attrlen);
++    *i += attrlen;
++
++    return 0;
++}
++
+ krb5_error_code
+ kr_attrset_encode(const krad_attrset *set, const char *secret,
+-                  const unsigned char *auth,
++                  const uint8_t *auth, krb5_boolean add_msgauth,
+                   unsigned char outbuf[MAX_ATTRSETSIZE], size_t *outlen,
+                   krb5_boolean *is_fips)
+ {
+-    unsigned char buffer[MAX_ATTRSIZE];
+     krb5_error_code retval;
+-    size_t i = 0, attrlen;
++    krad_attr msgauth_type = krad_attr_name2num("Message-Authenticator");
++    const uint8_t zeroes[MD5_DIGEST_SIZE] = { 0 };
++    krb5_data zerodata;
++    size_t i = 0;
+     attr *a;
+ 
+     if (set == NULL) {
+@@ -180,19 +209,21 @@ kr_attrset_encode(const krad_attrset *set, const char *secret,
+         return 0;
+     }
+ 
+-    K5_TAILQ_FOREACH(a, &set->list, list) {
+-        retval = kr_attr_encode(set->ctx, secret, auth, a->type, &a->attr,
+-                                buffer, &attrlen, is_fips);
+-        if (retval != 0)
++    if (add_msgauth) {
++        /* Encode Message-Authenticator as the first attribute, per
++         * draft-ietf-radext-deprecating-radius-03 section 5.2. */
++        zerodata = make_data((uint8_t *)zeroes, MD5_DIGEST_SIZE);
++        retval = append_attr(set->ctx, secret, auth, msgauth_type, &zerodata,
++                             outbuf, &i, is_fips);
++        if (retval)
+             return retval;
++    }
+ 
+-        if (i + attrlen + 2 > MAX_ATTRSETSIZE)
+-            return EMSGSIZE;
+-
+-        outbuf[i++] = a->type;
+-        outbuf[i++] = attrlen + 2;
+-        memcpy(&outbuf[i], buffer, attrlen);
+-        i += attrlen;
++    K5_TAILQ_FOREACH(a, &set->list, list) {
++        retval = append_attr(set->ctx, secret, auth, a->type, &a->attr,
++                             outbuf, &i, is_fips);
++        if (retval)
++            return retval;
+     }
+ 
+     *outlen = i;
+diff --git a/src/lib/krad/internal.h b/src/lib/krad/internal.h
+index a17b6f39b1..ca66f3ec68 100644
+--- a/src/lib/krad/internal.h
++++ b/src/lib/krad/internal.h
+@@ -49,6 +49,8 @@
+ #define UCHAR_MAX 255
+ #endif
+ 
++#define MD5_DIGEST_SIZE 16
++
+ /* RFC 2865 */
+ #define MAX_ATTRSIZE (UCHAR_MAX - 2)
+ #define MAX_ATTRSETSIZE (KRAD_PACKET_SIZE_MAX - 20)
+@@ -79,10 +81,11 @@ kr_attr_decode(krb5_context ctx, const char *secret, const unsigned char *auth,
+                krad_attr type, const krb5_data *in,
+                unsigned char outbuf[MAX_ATTRSIZE], size_t *outlen);
+ 
+-/* Encode the attributes into the buffer. */
++/* Encode set into outbuf.  If add_msgauth is true, include a zeroed
++ * Message-Authenticator as the first attribute. */
+ krb5_error_code
+ kr_attrset_encode(const krad_attrset *set, const char *secret,
+-                  const unsigned char *auth,
++                  const uint8_t *auth, krb5_boolean add_msgauth,
+                   unsigned char outbuf[MAX_ATTRSETSIZE], size_t *outlen,
+                   krb5_boolean *is_fips);
+ 
+diff --git a/src/lib/krad/packet.c b/src/lib/krad/packet.c
+index c5446b890c..3c1a4d507e 100644
+--- a/src/lib/krad/packet.c
++++ b/src/lib/krad/packet.c
+@@ -36,6 +36,7 @@
+ typedef unsigned char uchar;
+ 
+ /* RFC 2865 */
++#define MSGAUTH_SIZE (2 + MD5_DIGEST_SIZE)
+ #define OFFSET_CODE 0
+ #define OFFSET_ID 1
+ #define OFFSET_LENGTH 2
+@@ -222,6 +223,106 @@ packet_set_attrset(krb5_context ctx, const char *secret, krad_packet *pkt)
+     return kr_attrset_decode(ctx, &tmp, secret, pkt_auth(pkt), &pkt->attrset);
+ }
+ 
++/* Determine if a packet requires a Message-Authenticator attribute. */
++static inline krb5_boolean
++requires_msgauth(const char *secret, krad_code code)
++{
++    /* If no secret is provided, assume that the transport is a UNIX socket.
++     * Message-Authenticator is required only on UDP and TCP connections. */
++    if (*secret == '\0')
++        return FALSE;
++
++    /*
++     * Per draft-ietf-radext-deprecating-radius-03 sections 5.2.1 and 5.2.4,
++     * Message-Authenticator is required in Access-Request packets and all
++     * potential responses when UDP or TCP transport is used.
++     */
++    return code == krad_code_name2num("Access-Request") ||
++        code == krad_code_name2num("Access-Reject") ||
++        code == krad_code_name2num("Access-Accept") ||
++        code == krad_code_name2num("Access-Challenge");
++}
++
++/* Check if the packet has a Message-Authenticator attribute. */
++static inline krb5_boolean
++has_pkt_msgauth(const krad_packet *pkt)
++{
++    krad_attr msgauth_type = krad_attr_name2num("Message-Authenticator");
++
++    return krad_attrset_get(pkt->attrset, msgauth_type, 0) != NULL;
++}
++
++/* Return the beginning of the Message-Authenticator attribute in pkt, or NULL
++ * if no such attribute is present. */
++static const uint8_t *
++lookup_msgauth_addr(const krad_packet *pkt)
++{
++    krad_attr msgauth_type = krad_attr_name2num("Message-Authenticator");
++    size_t i;
++    uint8_t *p;
++
++    i = OFFSET_ATTR;
++    while (i + 2 < pkt->pkt.length) {
++        p = (uint8_t *)offset(&pkt->pkt, i);
++        if (msgauth_type == *p)
++            return p;
++        i += p[1];
++    }
++
++    return NULL;
++}
++
++/*
++ * Calculate the message authenticator MAC for pkt as specified in RFC 2869
++ * section 5.14, placing the result in mac_out.  Use the provided authenticator
++ * auth, which may be from pkt or from a corresponding request.
++ */
++static krb5_error_code
++calculate_mac(const char *secret, const krad_packet *pkt,
++              const uint8_t auth[AUTH_FIELD_SIZE],
++              uint8_t mac_out[MD5_DIGEST_SIZE])
++{
++    uint8_t zeroed_msgauth[MSGAUTH_SIZE];
++    krad_attr msgauth_type = krad_attr_name2num("Message-Authenticator");
++    const uint8_t *msgauth_attr, *msgauth_end, *pkt_end;
++    krb5_crypto_iov input[5];
++    krb5_data ksecr, mac;
++
++    msgauth_attr = lookup_msgauth_addr(pkt);
++    if (msgauth_attr == NULL)
++        return EINVAL;
++    msgauth_end = msgauth_attr + MSGAUTH_SIZE;
++    pkt_end = (const uint8_t *)pkt->pkt.data + pkt->pkt.length;
++
++    /* Read code, id, and length from the packet. */
++    input[0].flags = KRB5_CRYPTO_TYPE_DATA;
++    input[0].data = make_data(pkt->pkt.data, OFFSET_AUTH);
++
++    /* Read the provided authenticator. */
++    input[1].flags = KRB5_CRYPTO_TYPE_DATA;
++    input[1].data = make_data((uint8_t *)auth, AUTH_FIELD_SIZE);
++
++    /* Read any attributes before Message-Authenticator. */
++    input[2].flags = KRB5_CRYPTO_TYPE_DATA;
++    input[2].data = make_data(pkt_attr(pkt), msgauth_attr - pkt_attr(pkt));
++
++    /* Read Message-Authenticator with the data bytes all set to zero, per RFC
++     * 2869 section 5.14. */
++    zeroed_msgauth[0] = msgauth_type;
++    zeroed_msgauth[1] = MSGAUTH_SIZE;
++    memset(zeroed_msgauth + 2, 0, MD5_DIGEST_SIZE);
++    input[3].flags = KRB5_CRYPTO_TYPE_DATA;
++    input[3].data = make_data(zeroed_msgauth, MSGAUTH_SIZE);
++
++    /* Read any attributes after Message-Authenticator. */
++    input[4].flags = KRB5_CRYPTO_TYPE_DATA;
++    input[4].data = make_data((uint8_t *)msgauth_end, pkt_end - msgauth_end);
++
++    mac = make_data(mac_out, MD5_DIGEST_SIZE);
++    ksecr = string2data((char *)secret);
++    return k5_hmac_md5(&ksecr, input, 5, &mac);
++}
++
+ ssize_t
+ krad_packet_bytes_needed(const krb5_data *buffer)
+ {
+@@ -255,6 +356,7 @@ krad_packet_new_request(krb5_context ctx, const char *secret, krad_code code,
+     krad_packet *pkt;
+     uchar id;
+     size_t attrset_len;
++    krb5_boolean msgauth_required;
+ 
+     pkt = packet_new();
+     if (pkt == NULL) {
+@@ -274,9 +376,13 @@ krad_packet_new_request(krb5_context ctx, const char *secret, krad_code code,
+     if (retval != 0)
+         goto error;
+ 
++    /* Determine if Message-Authenticator is required. */
++    msgauth_required = (*secret != '\0' &&
++                        code == krad_code_name2num("Access-Request"));
++
+     /* Encode the attributes. */
+-    retval = kr_attrset_encode(set, secret, pkt_auth(pkt), pkt_attr(pkt),
+-                               &attrset_len, &pkt->is_fips);
++    retval = kr_attrset_encode(set, secret, pkt_auth(pkt), msgauth_required,
++                               pkt_attr(pkt), &attrset_len, &pkt->is_fips);
+     if (retval != 0)
+         goto error;
+ 
+@@ -285,6 +391,13 @@ krad_packet_new_request(krb5_context ctx, const char *secret, krad_code code,
+     pkt_code_set(pkt, code);
+     pkt_len_set(pkt, pkt->pkt.length);
+ 
++    if (msgauth_required) {
++        /* Calculate and set the Message-Authenticator MAC. */
++        retval = calculate_mac(secret, pkt, pkt_auth(pkt), pkt_attr(pkt) + 2);
++        if (retval != 0)
++            goto error;
++    }
++
+     /* Copy the attrset for future use. */
+     retval = packet_set_attrset(ctx, secret, pkt);
+     if (retval != 0)
+@@ -307,14 +420,19 @@ krad_packet_new_response(krb5_context ctx, const char *secret, krad_code code,
+     krb5_error_code retval;
+     krad_packet *pkt;
+     size_t attrset_len;
++    krb5_boolean msgauth_required;
+ 
+     pkt = packet_new();
+     if (pkt == NULL)
+         return ENOMEM;
+ 
++    /* Determine if Message-Authenticator is required. */
++    msgauth_required = requires_msgauth(secret, code);
++
+     /* Encode the attributes. */
+-    retval = kr_attrset_encode(set, secret, pkt_auth(request), pkt_attr(pkt),
+-                               &attrset_len, &pkt->is_fips);
++    retval = kr_attrset_encode(set, secret, pkt_auth(request),
++                               msgauth_required, pkt_attr(pkt), &attrset_len,
++                               &pkt->is_fips);
+     if (retval != 0)
+         goto error;
+ 
+@@ -330,6 +448,18 @@ krad_packet_new_response(krb5_context ctx, const char *secret, krad_code code,
+     if (retval != 0)
+         goto error;
+ 
++    if (msgauth_required) {
++        /*
++         * Calculate and replace the Message-Authenticator MAC.  Per RFC 2869
++         * section 5.14, use the authenticator from the request, not from the
++         * response.
++         */
++        retval = calculate_mac(secret, pkt, pkt_auth(request),
++                               pkt_attr(pkt) + 2);
++        if (retval != 0)
++            goto error;
++    }
++
+     /* Copy the attrset for future use. */
+     retval = packet_set_attrset(ctx, secret, pkt);
+     if (retval != 0)
+@@ -343,6 +473,34 @@ error:
+     return retval;
+ }
+ 
++/* Verify the Message-Authenticator value in pkt, using the provided
++ * authenticator (which may be from pkt or from a corresponding request). */
++static krb5_error_code
++verify_msgauth(const char *secret, const krad_packet *pkt,
++               const uint8_t auth[AUTH_FIELD_SIZE])
++{
++    uint8_t mac[MD5_DIGEST_SIZE];
++    krad_attr msgauth_type = krad_attr_name2num("Message-Authenticator");
++    const krb5_data *msgauth;
++    krb5_error_code retval;
++
++    msgauth = krad_packet_get_attr(pkt, msgauth_type, 0);
++    if (msgauth == NULL)
++        return ENODATA;
++
++    retval = calculate_mac(secret, pkt, auth, mac);
++    if (retval)
++        return retval;
++
++    if (msgauth->length != MD5_DIGEST_SIZE)
++        return EMSGSIZE;
++
++    if (k5_bcmp(mac, msgauth->data, MD5_DIGEST_SIZE) != 0)
++        return EBADMSG;
++
++    return 0;
++}
++
+ /* Decode a packet. */
+ static krb5_error_code
+ decode_packet(krb5_context ctx, const char *secret, const krb5_data *buffer,
+@@ -394,21 +552,35 @@ krad_packet_decode_request(krb5_context ctx, const char *secret,
+                            krad_packet **reqpkt)
+ {
+     const krad_packet *tmp = NULL;
++    krad_packet *req;
+     krb5_error_code retval;
+ 
+-    retval = decode_packet(ctx, secret, buffer, reqpkt);
+-    if (cb != NULL && retval == 0) {
++    retval = decode_packet(ctx, secret, buffer, &req);
++    if (retval)
++        return retval;
++
++    /* Verify Message-Authenticator if present. */
++    if (has_pkt_msgauth(req)) {
++        retval = verify_msgauth(secret, req, pkt_auth(req));
++        if (retval) {
++            krad_packet_free(req);
++            return retval;
++        }
++    }
++
++    if (cb != NULL) {
+         for (tmp = (*cb)(data, FALSE); tmp != NULL; tmp = (*cb)(data, FALSE)) {
+             if (pkt_id_get(*reqpkt) == pkt_id_get(tmp))
+                 break;
+         }
+-    }
+ 
+-    if (cb != NULL && (retval != 0 || tmp != NULL))
+-        (*cb)(data, TRUE);
++        if (tmp != NULL)
++            (*cb)(data, TRUE);
++    }
+ 
++    *reqpkt = req;
+     *duppkt = tmp;
+-    return retval;
++    return 0;
+ }
+ 
+ krb5_error_code
+@@ -435,9 +607,17 @@ krad_packet_decode_response(krb5_context ctx, const char *secret,
+                 break;
+             }
+ 
+-            /* If the authenticator matches, then the response is valid. */
+-            if (memcmp(pkt_auth(*rsppkt), auth, sizeof(auth)) == 0)
+-                break;
++            /* Verify the response authenticator. */
++            if (k5_bcmp(pkt_auth(*rsppkt), auth, sizeof(auth)) != 0)
++                continue;
++
++            /* Verify Message-Authenticator if present. */
++            if (has_pkt_msgauth(*rsppkt)) {
++                if (verify_msgauth(secret, *rsppkt, pkt_auth(tmp)) != 0)
++                    continue;
++            }
++
++            break;
+         }
+     }
+ 
+diff --git a/src/lib/krad/t_attrset.c b/src/lib/krad/t_attrset.c
+index 4cdb8b7d8e..f9c66509bd 100644
+--- a/src/lib/krad/t_attrset.c
++++ b/src/lib/krad/t_attrset.c
+@@ -63,7 +63,7 @@ main(void)
+     noerror(krad_attrset_add(set, krad_attr_name2num("User-Password"), &tmp));
+ 
+     /* Encode attrset. */
+-    noerror(kr_attrset_encode(set, "foo", auth, buffer, &encode_len,
++    noerror(kr_attrset_encode(set, "foo", auth, FALSE, buffer, &encode_len,
+                               &is_fips));
+     krad_attrset_free(set);
+ 
+diff --git a/src/lib/krad/t_daemon.py b/src/lib/krad/t_daemon.py
+index 4a3de079c7..647d4894eb 100755
+--- a/src/lib/krad/t_daemon.py
++++ b/src/lib/krad/t_daemon.py
+@@ -40,6 +40,7 @@ DICTIONARY = """
+ ATTRIBUTE\tUser-Name\t1\tstring
+ ATTRIBUTE\tUser-Password\t2\toctets
+ ATTRIBUTE\tNAS-Identifier\t32\tstring
++ATTRIBUTE\tMessage-Authenticator\t80\toctets
+ """
+ 
+ class TestServer(server.Server):
+@@ -52,7 +53,7 @@ class TestServer(server.Server):
+             if key == "User-Password":
+                 passwd = [pkt.PwDecrypt(x) for x in pkt[key]]
+ 
+-        reply = self.CreateReplyPacket(pkt)
++        reply = self.CreateReplyPacket(pkt, message_authenticator=True)
+         if passwd == ['accept']:
+             reply.code = packet.AccessAccept
+         else:
+diff --git a/src/lib/krad/t_packet.c b/src/lib/krad/t_packet.c
+index c22489144f..104b6507a2 100644
+--- a/src/lib/krad/t_packet.c
++++ b/src/lib/krad/t_packet.c
+@@ -172,6 +172,9 @@ main(int argc, const char **argv)
+     krb5_data username, password;
+     krb5_boolean auth = FALSE;
+     krb5_context ctx;
++    const krad_packet *dupreq;
++    const krb5_data *encpkt;
++    krad_packet *decreq;
+ 
+     username = string2data("testUser");
+ 
+@@ -184,9 +187,17 @@ main(int argc, const char **argv)
+ 
+     password = string2data("accept");
+     noerror(make_packet(ctx, &username, &password, &packets[ACCEPT_PACKET]));
++    encpkt = krad_packet_encode(packets[ACCEPT_PACKET]);
++    noerror(krad_packet_decode_request(ctx, "foo", encpkt, NULL, NULL,
++                                       &dupreq, &decreq));
++    krad_packet_free(decreq);
+ 
+     password = string2data("reject");
+     noerror(make_packet(ctx, &username, &password, &packets[REJECT_PACKET]));
++    encpkt = krad_packet_encode(packets[REJECT_PACKET]);
++    noerror(krad_packet_decode_request(ctx, "foo", encpkt, NULL, NULL,
++                                       &dupreq, &decreq));
++    krad_packet_free(decreq);
+ 
+     memset(&hints, 0, sizeof(hints));
+     hints.ai_family = AF_INET;
+diff --git a/src/tests/t_otp.py b/src/tests/t_otp.py
+index c3b820a411..dd5cdc5c26 100755
+--- a/src/tests/t_otp.py
++++ b/src/tests/t_otp.py
+@@ -49,6 +49,7 @@ ATTRIBUTE    User-Name    1    string
+ ATTRIBUTE    User-Password   2    octets
+ ATTRIBUTE    Service-Type    6    integer
+ ATTRIBUTE    NAS-Identifier  32    string
++ATTRIBUTE    Message-Authenticator 80 octets
+ '''
+ 
+ class RadiusDaemon(Process):
+@@ -97,6 +98,8 @@ class RadiusDaemon(Process):
+             reply.code = packet.AccessReject
+             replyq['reply'] = False
+ 
++        reply.add_message_authenticator()
++
+         outq.put(replyq)
+         if addr is None:
+             sock.send(reply.ReplyPacket())
+-- 
+2.46.0
+
diff --git a/0026-PKINIT-ECDH-support.patch b/0026-PKINIT-ECDH-support.patch
new file mode 100644
index 0000000..14c86be
--- /dev/null
+++ b/0026-PKINIT-ECDH-support.patch
@@ -0,0 +1,1027 @@
+From 5af8bb21de29e3b9a0d5b2001fab71ea102f7990 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Fri, 12 May 2023 15:38:46 -0400
+Subject: [PATCH] PKINIT ECDH support
+
+Add support for elliptic curve key exchange to PKINIT (RFC 5349
+section 4).  Extend pkinit_dh_min_bits to allow the string values
+"P-256", "P-384", and "P-521", using rough finite-field strength
+equivalents to rank them relative to the Oakley Diffie-Hellman groups.
+
+When processing TD-DH-PARAMETERS on the client, only accept the three
+Oakley groups or the three supported elliptic curve groups.
+Previously we accepted any Diffie-Hellman parameters that passed
+EVP_PKEY_param_check()/DH_check() and had equal or better bit strength
+to the original proposal.
+
+ticket: 9095 (new)
+(cherry picked from commit 0f870b1bcad960fd5319a3f97aafd7f4a289e2fb)
+---
+ doc/admin/conf_files/kdc_conf.rst             |   7 +-
+ doc/admin/conf_files/krb5_conf.rst            |   7 +-
+ src/plugins/preauth/pkinit/pkinit.h           |   6 +-
+ src/plugins/preauth/pkinit/pkinit_clnt.c      |  17 +-
+ src/plugins/preauth/pkinit/pkinit_constants.c |  27 +
+ src/plugins/preauth/pkinit/pkinit_crypto.h    |   7 +
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 470 ++++++++++++------
+ .../preauth/pkinit/pkinit_crypto_openssl.h    |   4 +-
+ src/plugins/preauth/pkinit/pkinit_lib.c       |   3 -
+ src/plugins/preauth/pkinit/pkinit_srv.c       |  17 +-
+ src/plugins/preauth/pkinit/pkinit_trace.h     |  11 +
+ src/tests/t_pkinit.py                         |  12 +
+ 12 files changed, 405 insertions(+), 183 deletions(-)
+
+diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst
+index 846c58ed82..fb0593f281 100644
+--- a/doc/admin/conf_files/kdc_conf.rst
++++ b/doc/admin/conf_files/kdc_conf.rst
+@@ -768,8 +768,11 @@ For information about the syntax of some of these options, see
+     be specified multiple times.
+ 
+ **pkinit_dh_min_bits**
+-    Specifies the minimum number of bits the KDC is willing to accept
+-    for a client's Diffie-Hellman key.  The default is 2048.
++    Specifies the minimum strength of Diffie-Hellman group the KDC is
++    willing to accept for key exchange.  Valid values in order of
++    increasing strength are 1024, 2048, P-256, 4096, P-384, and P-521.
++    The default is 2048.  (P-256, P-384, and P-521 are new in release
++    1.22.)
+ 
+ **pkinit_allow_upn**
+     Specifies that the KDC is willing to accept client certificates
+diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
+index b7284c47df..dca52e1426 100644
+--- a/doc/admin/conf_files/krb5_conf.rst
++++ b/doc/admin/conf_files/krb5_conf.rst
+@@ -1131,9 +1131,10 @@ PKINIT krb5.conf options
+         option is not recommended.
+ 
+ **pkinit_dh_min_bits**
+-    Specifies the size of the Diffie-Hellman key the client will
+-    attempt to use.  The acceptable values are 1024, 2048, and 4096.
+-    The default is 2048.
++    Specifies the group of the Diffie-Hellman key the client will
++    attempt to use.  The acceptable values are 1024, 2048, P-256,
++    4096, P-384, and P-521.  The default is 2048.  (P-256, P-384, and
++    P-521 are new in release 1.22.)
+ 
+ **pkinit_identities**
+     Specifies the location(s) to be used to find the user's X.509
+diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h
+index 5ab0f4bc28..7ba7155bb4 100644
+--- a/src/plugins/preauth/pkinit/pkinit.h
++++ b/src/plugins/preauth/pkinit/pkinit.h
+@@ -59,6 +59,10 @@
+ 
+ #define PKINIT_DEFAULT_DH_MIN_BITS  2048
+ #define PKINIT_DH_MIN_CONFIG_BITS   1024
++/* Rough finite-field bit strength equivalents for the elliptic curve groups */
++#define PKINIT_DH_P256_BITS         3072
++#define PKINIT_DH_P384_BITS         7680
++#define PKINIT_DH_P521_BITS         15360
+ 
+ #define KRB5_CONF_KDCDEFAULTS                   "kdcdefaults"
+ #define KRB5_CONF_LIBDEFAULTS                   "libdefaults"
+@@ -101,8 +105,6 @@ static inline void pkiDebug (const char *fmt, ...) { }
+ #define OCTETDATA_TO_KRB5DATA(octd, k5d) \
+     (k5d)->length = (octd)->length; (k5d)->data = (char *)(octd)->data;
+ 
+-extern const krb5_data dh_oid;
+-
+ /*
+  * notes about crypto contexts:
+  *
+diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
+index 54e7537600..b08022a214 100644
+--- a/src/plugins/preauth/pkinit/pkinit_clnt.c
++++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
+@@ -681,7 +681,7 @@ pkinit_client_profile(krb5_context context,
+                       const krb5_data *realm)
+ {
+     const char *configured_identity;
+-    char *eku_string = NULL;
++    char *eku_string = NULL, *minbits = NULL;
+ 
+     pkiDebug("pkinit_client_profile %p %p %p %p\n",
+              context, plgctx, reqctx, realm);
+@@ -690,17 +690,10 @@ pkinit_client_profile(krb5_context context,
+                               KRB5_CONF_PKINIT_REQUIRE_CRL_CHECKING,
+                               reqctx->opts->require_crl_checking,
+                               &reqctx->opts->require_crl_checking);
+-    pkinit_libdefault_integer(context, realm,
+-                              KRB5_CONF_PKINIT_DH_MIN_BITS,
+-                              reqctx->opts->dh_size,
+-                              &reqctx->opts->dh_size);
+-    if (reqctx->opts->dh_size != 1024 && reqctx->opts->dh_size != 2048
+-        && reqctx->opts->dh_size != 4096) {
+-        pkiDebug("%s: invalid value (%d) for pkinit_dh_min_bits, "
+-                 "using default value (%d) instead\n", __FUNCTION__,
+-                 reqctx->opts->dh_size, PKINIT_DEFAULT_DH_MIN_BITS);
+-        reqctx->opts->dh_size = PKINIT_DEFAULT_DH_MIN_BITS;
+-    }
++    pkinit_libdefault_string(context, realm, KRB5_CONF_PKINIT_DH_MIN_BITS,
++                             &minbits);
++    reqctx->opts->dh_size = parse_dh_min_bits(context, minbits);
++    free(minbits);
+     pkinit_libdefault_string(context, realm,
+                              KRB5_CONF_PKINIT_EKU_CHECKING,
+                              &eku_string);
+diff --git a/src/plugins/preauth/pkinit/pkinit_constants.c b/src/plugins/preauth/pkinit/pkinit_constants.c
+index 1da482e0b4..10f8688ec2 100644
+--- a/src/plugins/preauth/pkinit/pkinit_constants.c
++++ b/src/plugins/preauth/pkinit/pkinit_constants.c
+@@ -320,6 +320,33 @@ static const uint8_t o4096[] = {
+     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+ };
+ 
++/* Named curve prime256v1 (1.2.840.10045.3.1.7) as parameters for RFC 3279
++ * section 2.3.5 id-ecPublicKey */
++static const uint8_t p256[] = {
++    0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07
++};
++
++/* Named curve secp384r1 (1.3.132.0.34, from RFC 5480 section 2.1.1.1) as
++ * parameters for RFC 3279 section 2.3.5 id-ecPublicKey */
++static const uint8_t p384[] = {
++    0x06, 0x05, 0x2B, 0x81, 0x04, 0x00, 0x22
++};
++
++/* Named curve secp521r1 (1.3.132.0.35, from RFC 5480 section 2.1.1.1) as
++ * parameters for RFC 3279 section 2.3.5 id-ecPublicKey */
++static const uint8_t p521[] = {
++    0x06, 0x05, 0x2B, 0x81, 0x04, 0x00, 0x23
++};
++
+ const krb5_data oakley_1024 = { KV5M_DATA, sizeof(o1024), (char *)o1024 };
+ const krb5_data oakley_2048 = { KV5M_DATA, sizeof(o2048), (char *)o2048 };
+ const krb5_data oakley_4096 = { KV5M_DATA, sizeof(o4096), (char *)o4096 };
++const krb5_data ec_p256 = { KV5M_DATA, sizeof(p256), (char *)p256 };
++const krb5_data ec_p384 = { KV5M_DATA, sizeof(p384), (char *)p384 };
++const krb5_data ec_p521 = { KV5M_DATA, sizeof(p521), (char *)p521 };
++
++/* RFC 3279 section 2.3.3 dhpublicnumber (1.2.840.10046.2.1) */
++const krb5_data dh_oid = { 0, 7, "\x2A\x86\x48\xce\x3e\x02\x01" };
++
++/* RFC 3279 section 2.3.5 id-ecPublicKey (1.2.840.10045.2.1) */
++const krb5_data ec_oid = { 0, 7, "\x2A\x86\x48\xCE\x3D\x02\x01" };
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h
+index 04199b45a4..fd876e4850 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto.h
++++ b/src/plugins/preauth/pkinit/pkinit_crypto.h
+@@ -568,6 +568,11 @@ extern const krb5_data sha512_id;
+ extern const krb5_data oakley_1024;
+ extern const krb5_data oakley_2048;
+ extern const krb5_data oakley_4096;
++extern const krb5_data ec_p256;
++extern const krb5_data ec_p384;
++extern const krb5_data ec_p521;
++extern const krb5_data dh_oid;
++extern const krb5_data ec_oid;
+ 
+ /**
+  * An ordered set of OIDs, stored as krb5_data, of KDF algorithms
+@@ -590,4 +595,6 @@ crypto_req_cert_matching_data(krb5_context context,
+ 			      pkinit_req_crypto_context reqctx,
+ 			      pkinit_cert_matching_data **md_out);
+ 
++int parse_dh_min_bits(krb5_context context, const char *str);
++
+ #endif	/* _PKINIT_CRYPTO_H */
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 26fa9184b3..f6d494bd11 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -181,6 +181,15 @@ compat_get0_DH(const EVP_PKEY *pkey)
+ 
+ }
+ 
++#define EVP_PKEY_get0_EC_KEY compat_get0_EC
++static EC_KEY *
++compat_get0_EC(const EVP_PKEY *pkey)
++{
++    if (pkey->type != EVP_PKEY_EC)
++        return NULL;
++    return pkey->pkey.ec;
++}
++
+ /* Return true if the cert c includes a key usage which doesn't include u.
+  * Define using direct member access for pre-1.1. */
+ #define ku_reject(c, u)                                                 \
+@@ -260,37 +269,11 @@ decode_bn_der(const uint8_t *der, size_t len)
+     return bn;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+-static int
+-params_valid(EVP_PKEY *params)
+-{
+-    EVP_PKEY_CTX *ctx;
+-    int result;
+-
+-    ctx = EVP_PKEY_CTX_new(params, NULL);
+-    if (ctx == NULL)
+-        return 0;
+-    result = EVP_PKEY_param_check(ctx);
+-    EVP_PKEY_CTX_free(ctx);
+-    return result == 1;
+-}
+-#else
+-static int
+-params_valid(EVP_PKEY *params)
+-{
+-    DH *dh;
+-    int codes;
+-
+-    dh = EVP_PKEY_get0_DH(params);
+-    return (dh == NULL) ? 0 : (DH_check(dh, &codes) && codes == 0);
+-}
+-#endif
+-
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ static EVP_PKEY *
+-decode_dh_params(const krb5_data *params_der)
++decode_params(const krb5_data *params_der, const char *type)
+ {
+     EVP_PKEY *pkey = NULL;
+     const uint8_t *inptr = (uint8_t *)params_der->data;
+@@ -298,7 +281,7 @@ decode_dh_params(const krb5_data *params_der)
+     OSSL_DECODER_CTX *dctx;
+     int ok;
+ 
+-    dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", "type-specific", "DHX",
++    dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", "type-specific", type,
+                                          EVP_PKEY_KEY_PARAMETERS, NULL, NULL);
+     if (dctx == NULL)
+         return NULL;
+@@ -307,7 +290,15 @@ decode_dh_params(const krb5_data *params_der)
+     OSSL_DECODER_CTX_free(dctx);
+     return ok ? pkey : NULL;
+ }
++
++static EVP_PKEY *
++decode_dh_params(const krb5_data *params_der)
++{
++    return decode_params(params_der, "DHX");
++}
++
+ #else
++
+ static EVP_PKEY *
+ decode_dh_params(const krb5_data *params_der)
+ {
+@@ -320,6 +311,7 @@ decode_dh_params(const krb5_data *params_der)
+     DH_free(dh);
+     return pkey;
+ }
++
+ #endif
+ 
+ static krb5_error_code
+@@ -520,6 +512,39 @@ cleanup:
+ 
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++
++static EVP_PKEY *
++decode_ec_params(const krb5_data *params_der)
++{
++    return decode_params(params_der, "EC");
++}
++
++#else /* OPENSSL_VERSION_NUMBER < 0x30000000L */
++
++static EVP_PKEY *
++decode_ec_params(const krb5_data *params_der)
++{
++    const uint8_t *p = (uint8_t *)params_der->data;
++    EC_KEY *eckey;
++    EVP_PKEY *pkey;
++
++    eckey = d2i_ECParameters(NULL, &p, params_der->length);
++    if (eckey == NULL)
++        return NULL;
++    pkey = EVP_PKEY_new();
++    if (pkey != NULL) {
++        if (!EVP_PKEY_set1_EC_KEY(pkey, eckey)) {
++            EVP_PKEY_free(pkey);
++            pkey = NULL;
++        }
++    }
++    EC_KEY_free(eckey);
++    return pkey;
++}
++
++#endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */
++
+ /* Attempt to specify padded Diffie-Hellman result derivation.  Don't error out
+  * if this fails since we also detect short results and adjust them. */
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+@@ -551,7 +576,8 @@ dh_result(EVP_PKEY *pkey, EVP_PKEY *peer,
+     EVP_PKEY_CTX *derive_ctx = NULL;
+     int ok = 0;
+     uint8_t *buf = NULL;
+-    size_t len, dh_size = EVP_PKEY_get_size(pkey);
++    size_t len, result_size;
++    krb5_boolean ecc = (EVP_PKEY_id(pkey) == EVP_PKEY_EC);
+ 
+     *result_out = NULL;
+     *len_out = 0;
+@@ -561,24 +587,39 @@ dh_result(EVP_PKEY *pkey, EVP_PKEY *peer,
+         goto cleanup;
+     if (EVP_PKEY_derive_init(derive_ctx) <= 0)
+         goto cleanup;
+-    set_padded_derivation(derive_ctx);
++    if (!ecc)
++        set_padded_derivation(derive_ctx);
+     if (EVP_PKEY_derive_set_peer(derive_ctx, peer) <= 0)
+         goto cleanup;
+ 
+-    buf = malloc(dh_size);
++    if (ecc) {
++        if (EVP_PKEY_derive(derive_ctx, NULL, &result_size) <= 0)
++            goto cleanup;
++    } else {
++        /*
++         * For finite-field Diffie-Hellman we must ensure that the result
++         * matches the key size (normally through padded derivation, but that
++         * isn't supported by OpenSSL 1.0 so we must check).
++         */
++        result_size = EVP_PKEY_get_size(pkey);
++    }
++    buf = malloc(result_size);
+     if (buf == NULL)
+         goto cleanup;
+-    len = dh_size;
++    len = result_size;
+     if (EVP_PKEY_derive(derive_ctx, buf, &len) <= 0)
+         goto cleanup;
+-    if (len < dh_size) {        /* only possible without padded derivation */
+-        memmove(buf + (dh_size - len), buf, len);
+-        memset(buf, 0, dh_size - len);
++
++    /* If we couldn't specify padded derivation for finite-field DH we may need
++     * to fix up the result by right-shifting it within the buffer. */
++    if (len < result_size) {
++        memmove(buf + (result_size - len), buf, len);
++        memset(buf, 0, result_size - len);
+     }
+ 
+     ok = 1;
+     *result_out = buf;
+-    *len_out = dh_size;
++    *len_out = result_size;
+     buf = NULL;
+ 
+ cleanup:
+@@ -592,13 +633,21 @@ static int
+ dh_pubkey_der(EVP_PKEY *pkey, uint8_t **pubkey_out, unsigned int *len_out)
+ {
+     BIGNUM *pubkey_bn = NULL;
+-    int len, ok;
+-    uint8_t *buf;
+-
+-    if (!EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PUB_KEY, &pubkey_bn))
+-        return 0;
+-    ok = encode_bn_der(pubkey_bn, &buf, &len);
+-    BN_free(pubkey_bn);
++    int len, ok = 0;
++    uint8_t *buf, *outptr;
++
++    if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) {
++        len = i2d_PublicKey(pkey, NULL);
++        if (len > 0 && (outptr = buf = malloc(len)) != NULL) {
++            (void)i2d_PublicKey(pkey, &outptr);
++            ok = 1;
++        }
++    } else {
++        if (!EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PUB_KEY, &pubkey_bn))
++            return 0;
++        ok = encode_bn_der(pubkey_bn, &buf, &len);
++        BN_free(pubkey_bn);
++    }
+     if (ok) {
+         *pubkey_out = buf;
+         *len_out = len;
+@@ -610,19 +659,33 @@ static int
+ dh_pubkey_der(EVP_PKEY *pkey, uint8_t **pubkey_out, unsigned int *len_out)
+ {
+     const DH *dh;
++    EC_KEY *eckey;              /* can be const when OpenSSL 1.0 dropped */
+     const BIGNUM *pubkey_bn;
+-    uint8_t *buf;
++    uint8_t *buf, *outptr;
+     int len;
+ 
+     dh = EVP_PKEY_get0_DH(pkey);
+-    if (dh == NULL)
+-        return 0;
+-    DH_get0_key(dh, &pubkey_bn, NULL);
+-    if (!encode_bn_der(pubkey_bn, &buf, &len))
+-        return 0;
+-    *pubkey_out = buf;
+-    *len_out = len;
+-    return 1;
++    if (dh != NULL) {
++        DH_get0_key(dh, &pubkey_bn, NULL);
++        if (!encode_bn_der(pubkey_bn, &buf, &len))
++            return 0;
++        *pubkey_out = buf;
++        *len_out = len;
++        return 1;
++    }
++
++    eckey = EVP_PKEY_get0_EC_KEY(pkey);
++    if (eckey != NULL) {
++        len = i2o_ECPublicKey(eckey, NULL);
++        if (len > 0 && (outptr = buf = malloc(len)) != NULL) {
++            (void)i2o_ECPublicKey(eckey, &outptr);
++            *pubkey_out = buf;
++            *len_out = len;
++            return 1;
++        }
++    }
++
++    return 0;
+ }
+ #endif
+ 
+@@ -686,17 +749,23 @@ compose_dh_pkey(EVP_PKEY *params, const uint8_t *pubkey_der, size_t der_len)
+     if (pkey == NULL)
+         goto cleanup;
+ 
+-    pubkey_bn = decode_bn_der(pubkey_der, der_len);
+-    if (pubkey_bn == NULL)
+-        goto cleanup;
+-    binlen = EVP_PKEY_get_size(pkey);
+-    pubkey_bin = malloc(binlen);
+-    if (pubkey_bin == NULL)
+-        goto cleanup;
+-    if (BN_bn2binpad(pubkey_bn, pubkey_bin, binlen) != binlen)
+-        goto cleanup;
+-    if (EVP_PKEY_set1_encoded_public_key(pkey, pubkey_bin, binlen) != 1)
+-        goto cleanup;
++    if (EVP_PKEY_id(params) == EVP_PKEY_EC) {
++        if (d2i_PublicKey(EVP_PKEY_id(params), &pkey, &pubkey_der,
++                          der_len) == NULL)
++            goto cleanup;
++    } else {
++        pubkey_bn = decode_bn_der(pubkey_der, der_len);
++        if (pubkey_bn == NULL)
++            goto cleanup;
++        binlen = EVP_PKEY_get_size(pkey);
++        pubkey_bin = malloc(binlen);
++        if (pubkey_bin == NULL)
++            goto cleanup;
++        if (BN_bn2binpad(pubkey_bn, pubkey_bin, binlen) != binlen)
++            goto cleanup;
++        if (EVP_PKEY_set1_encoded_public_key(pkey, pubkey_bin, binlen) != 1)
++            goto cleanup;
++    }
+ 
+     pkey_ret = pkey;
+     pkey = NULL;
+@@ -741,29 +810,60 @@ static EVP_PKEY *
+ compose_dh_pkey(EVP_PKEY *params, const uint8_t *pubkey_der, size_t der_len)
+ {
+     DH *dhparams, *dh = NULL;
+-    EVP_PKEY *pkey = NULL;
++    EVP_PKEY *pkey = NULL, *pkey_ret = NULL;
+     BIGNUM *pubkey_bn = NULL;
++    EC_KEY *params_eckey, *eckey = NULL;
++    const EC_GROUP *group;
++
++    if (EVP_PKEY_id(params) == EVP_PKEY_EC) {
++        /* We would like to use EVP_PKEY_copy_parameters() and d2i_PublicKey(),
++         * but the latter is broken in OpenSSL 1.1.0-1.1.1a for EC keys. */
++        params_eckey = EVP_PKEY_get0_EC_KEY(params);
++        if (params_eckey == NULL)
++            goto cleanup;
++        group = EC_KEY_get0_group(params_eckey);
++        eckey = EC_KEY_new();
++        if (eckey == NULL)
++            goto cleanup;
++        if (!EC_KEY_set_group(eckey, group))
++            goto cleanup;
++        if (o2i_ECPublicKey(&eckey, &pubkey_der, der_len) == NULL)
++            goto cleanup;
++        pkey = EVP_PKEY_new();
++        if (pkey == NULL)
++            return NULL;
++        if (!EVP_PKEY_assign(pkey, EVP_PKEY_EC, eckey)) {
++            EVP_PKEY_free(pkey);
++            return NULL;
++        }
++        eckey = NULL;
++    } else {
++        pubkey_bn = decode_bn_der(pubkey_der, der_len);
++        if (pubkey_bn == NULL)
++            goto cleanup;
+ 
+-    pubkey_bn = decode_bn_der(pubkey_der, der_len);
+-    if (pubkey_bn == NULL)
+-        goto cleanup;
++        dhparams = EVP_PKEY_get0_DH(params);
++        if (dhparams == NULL)
++            goto cleanup;
++        dh = dup_dh_params(dhparams);
++        if (dh == NULL)
++            goto cleanup;
++        if (!DH_set0_key(dh, pubkey_bn, NULL))
++            goto cleanup;
++        pubkey_bn = NULL;
+ 
+-    dhparams = EVP_PKEY_get0_DH(params);
+-    if (dhparams == NULL)
+-        goto cleanup;
+-    dh = dup_dh_params(dhparams);
+-    if (dh == NULL)
+-        goto cleanup;
+-    if (!DH_set0_key(dh, pubkey_bn, NULL))
+-        goto cleanup;
+-    pubkey_bn = NULL;
++        pkey = dh_to_pkey(&dh);
++    }
+ 
+-    pkey = dh_to_pkey(&dh);
++    pkey_ret = pkey;
++    pkey = NULL;
+ 
+ cleanup:
+     BN_free(pubkey_bn);
+     DH_free(dh);
+-    return pkey;
++    EC_KEY_free(eckey);
++    EVP_PKEY_free(pkey);
++    return pkey_ret;
+ }
+ 
+ #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */
+@@ -1032,7 +1132,6 @@ pkinit_init_req_crypto(pkinit_req_crypto_context *cryptoctx)
+     memset(ctx, 0, sizeof(*ctx));
+ 
+     ctx->client_pkey = NULL;
+-    ctx->received_params = NULL;
+     ctx->received_cert = NULL;
+ 
+     *cryptoctx = ctx;
+@@ -1054,7 +1153,6 @@ pkinit_fini_req_crypto(pkinit_req_crypto_context req_cryptoctx)
+ 
+     pkiDebug("%s: freeing ctx at %p\n", __FUNCTION__, req_cryptoctx);
+     EVP_PKEY_free(req_cryptoctx->client_pkey);
+-    EVP_PKEY_free(req_cryptoctx->received_params);
+     X509_free(req_cryptoctx->received_cert);
+ 
+     free(req_cryptoctx);
+@@ -1258,9 +1356,9 @@ pkinit_fini_pkinit_oids(pkinit_plg_crypto_context ctx)
+ 
+ static int
+ try_import_group(krb5_context context, const krb5_data *params,
+-                 const char *name, EVP_PKEY **pkey_out)
++                 const char *name, krb5_boolean ec, EVP_PKEY **pkey_out)
+ {
+-    *pkey_out = decode_dh_params(params);
++    *pkey_out = ec ? decode_ec_params(params) : decode_dh_params(params);
+     if (*pkey_out == NULL)
+         TRACE_PKINIT_DH_GROUP_UNAVAILABLE(context, name);
+     return (*pkey_out != NULL) ? 1 : 0;
+@@ -1271,12 +1369,15 @@ pkinit_init_dh_params(krb5_context context, pkinit_plg_crypto_context plgctx)
+ {
+     int n = 0;
+ 
+-    n += try_import_group(context, &oakley_1024, "MODP 2 (1024-bit)",
++    n += try_import_group(context, &oakley_1024, "MODP 2 (1024-bit)", FALSE,
+                           &plgctx->dh_1024);
+-    n += try_import_group(context, &oakley_2048, "MODP 14 (2048-bit)",
++    n += try_import_group(context, &oakley_2048, "MODP 14 (2048-bit)", FALSE,
+                           &plgctx->dh_2048);
+-    n += try_import_group(context, &oakley_4096, "MODP 16 (4096-bit)",
++    n += try_import_group(context, &oakley_4096, "MODP 16 (4096-bit)", FALSE,
+                           &plgctx->dh_4096);
++    n += try_import_group(context, &ec_p256, "P-256", TRUE, &plgctx->ec_p256);
++    n += try_import_group(context, &ec_p384, "P-384", TRUE, &plgctx->ec_p384);
++    n += try_import_group(context, &ec_p521, "P-521", TRUE, &plgctx->ec_p521);
+ 
+     if (n == 0) {
+         pkinit_fini_dh_params(plgctx);
+@@ -1294,7 +1395,11 @@ pkinit_fini_dh_params(pkinit_plg_crypto_context plgctx)
+     EVP_PKEY_free(plgctx->dh_1024);
+     EVP_PKEY_free(plgctx->dh_2048);
+     EVP_PKEY_free(plgctx->dh_4096);
++    EVP_PKEY_free(plgctx->ec_p256);
++    EVP_PKEY_free(plgctx->ec_p384);
++    EVP_PKEY_free(plgctx->ec_p521);
+     plgctx->dh_1024 = plgctx->dh_2048 = plgctx->dh_4096 = NULL;
++    plgctx->ec_p256 = plgctx->ec_p384 = plgctx->ec_p521 = NULL;
+ }
+ 
+ static krb5_error_code
+@@ -2711,6 +2816,62 @@ cleanup:
+     return ret;
+ }
+ 
++/* Return the equivalent finite-field bit strength of pkey if it matches a
++ * well-known group, or -1 if it doesn't. */
++static int
++check_dh_wellknown(pkinit_plg_crypto_context cryptoctx, EVP_PKEY *pkey)
++{
++    int nbits = EVP_PKEY_get_bits(pkey);
++
++    if (nbits == 1024 && EVP_PKEY_parameters_eq(cryptoctx->dh_1024, pkey) == 1)
++        return nbits;
++    if (nbits == 2048 && EVP_PKEY_parameters_eq(cryptoctx->dh_2048, pkey) == 1)
++        return nbits;
++    if (nbits == 4096 && EVP_PKEY_parameters_eq(cryptoctx->dh_4096, pkey) == 1)
++        return nbits;
++    if (nbits == 256 && EVP_PKEY_parameters_eq(cryptoctx->ec_p256, pkey) == 1)
++        return PKINIT_DH_P256_BITS;
++    if (nbits == 384 && EVP_PKEY_parameters_eq(cryptoctx->ec_p384, pkey) == 1)
++        return PKINIT_DH_P384_BITS;
++    if (nbits == 521 && EVP_PKEY_parameters_eq(cryptoctx->ec_p521, pkey) == 1)
++        return PKINIT_DH_P521_BITS;
++    return -1;
++}
++
++/* Return a short description of the Diffie-Hellman group with the given
++ * finite-field group size equivalent. */
++static const char *
++group_desc(int dh_bits)
++{
++    switch (dh_bits) {
++    case PKINIT_DH_P256_BITS: return "P-256";
++    case PKINIT_DH_P384_BITS: return "P-384";
++    case PKINIT_DH_P521_BITS: return "P-521";
++    case 1024: return "1024-bit DH";
++    case 2048: return "2048-bit DH";
++    case 4096: return "4096-bit DH";
++    }
++    return "(unknown)";
++}
++
++static EVP_PKEY *
++choose_dh_group(pkinit_plg_crypto_context plg_cryptoctx, int dh_size)
++{
++    if (dh_size == 1024)
++        return plg_cryptoctx->dh_1024;
++    if (dh_size == 2048)
++        return plg_cryptoctx->dh_2048;
++    if (dh_size == 4096)
++        return plg_cryptoctx->dh_4096;
++    if (dh_size == PKINIT_DH_P256_BITS)
++        return plg_cryptoctx->ec_p256;
++    if (dh_size == PKINIT_DH_P384_BITS)
++        return plg_cryptoctx->ec_p384;
++    if (dh_size == PKINIT_DH_P521_BITS)
++        return plg_cryptoctx->ec_p521;
++    return NULL;
++}
++
+ krb5_error_code
+ client_create_dh(krb5_context context,
+                  pkinit_plg_crypto_context plg_cryptoctx,
+@@ -2723,16 +2884,10 @@ client_create_dh(krb5_context context,
+ 
+     *spki_out = empty_data();
+ 
+-    if (cryptoctx->received_params != NULL)
+-        params = cryptoctx->received_params;
+-    else if (plg_cryptoctx->dh_1024 != NULL && dh_size == 1024)
+-        params = plg_cryptoctx->dh_1024;
+-    else if (plg_cryptoctx->dh_2048 != NULL && dh_size == 2048)
+-        params = plg_cryptoctx->dh_2048;
+-    else if (plg_cryptoctx->dh_4096 != NULL && dh_size == 4096)
+-        params = plg_cryptoctx->dh_4096;
+-    else
++    params = choose_dh_group(plg_cryptoctx, dh_size);
++    if (params == NULL)
+         goto cleanup;
++    TRACE_PKINIT_DH_PROPOSING_GROUP(context, group_desc(dh_size));
+ 
+     pkey = generate_dh_pkey(params);
+     if (pkey == NULL)
+@@ -2772,8 +2927,11 @@ client_process_dh(krb5_context context,
+     server_pkey = compose_dh_pkey(cryptoctx->client_pkey,
+                                   subjectPublicKey_data,
+                                   subjectPublicKey_length);
+-    if (server_pkey == NULL)
++    if (server_pkey == NULL) {
++        retval = KRB5_PREAUTH_FAILED;
++        k5_setmsg(context, retval, _("Cannot compose PKINIT KDC public key"));
+         goto cleanup;
++    }
+ 
+     if (!dh_result(cryptoctx->client_pkey, server_pkey,
+                    &client_key, &client_key_len))
+@@ -2797,20 +2955,6 @@ cleanup:
+     return retval;
+ }
+ 
+-/* Return 1 if dh is a permitted well-known group, otherwise return 0. */
+-static int
+-check_dh_wellknown(pkinit_plg_crypto_context cryptoctx, EVP_PKEY *pkey,
+-                   int nbits)
+-{
+-    if (nbits == 1024)
+-        return EVP_PKEY_parameters_eq(cryptoctx->dh_1024, pkey) == 1;
+-    else if (nbits == 2048)
+-        return EVP_PKEY_parameters_eq(cryptoctx->dh_2048, pkey) == 1;
+-    else if (nbits == 4096)
+-        return EVP_PKEY_parameters_eq(cryptoctx->dh_4096, pkey) == 1;
+-    return 0;
+-}
+-
+ krb5_error_code
+ server_check_dh(krb5_context context,
+                 pkinit_plg_crypto_context cryptoctx,
+@@ -2820,7 +2964,7 @@ server_check_dh(krb5_context context,
+                 int minbits)
+ {
+     EVP_PKEY *client_pkey = NULL;
+-    int dh_prime_bits;
++    int dh_bits;
+     krb5_error_code retval = KRB5KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED;
+ 
+     client_pkey = decode_spki(client_spki);
+@@ -2829,16 +2973,15 @@ server_check_dh(krb5_context context,
+         goto cleanup;
+     }
+ 
+-    /* KDC SHOULD check to see if the key parameters satisfy its policy */
+-    dh_prime_bits = EVP_PKEY_get_bits(client_pkey);
+-    if (minbits && dh_prime_bits < minbits) {
+-        pkiDebug("client sent dh params with %d bits, we require %d\n",
+-                 dh_prime_bits, minbits);
++    dh_bits = check_dh_wellknown(cryptoctx, client_pkey);
++    if (dh_bits == -1 || dh_bits < minbits) {
++        TRACE_PKINIT_DH_REJECTING_GROUP(context, group_desc(dh_bits),
++                                        group_desc(minbits));
+         goto cleanup;
+     }
++    TRACE_PKINIT_DH_RECEIVED_GROUP(context, group_desc(dh_bits));
+ 
+-    if (check_dh_wellknown(cryptoctx, client_pkey, dh_prime_bits))
+-        retval = 0;
++    retval = 0;
+ 
+ cleanup:
+     if (retval == 0)
+@@ -3023,9 +3166,20 @@ pkinit_create_td_dh_parameters(krb5_context context,
+     krb5_algorithm_identifier alg_1024 = { dh_oid, oakley_1024 };
+     krb5_algorithm_identifier alg_2048 = { dh_oid, oakley_2048 };
+     krb5_algorithm_identifier alg_4096 = { dh_oid, oakley_4096 };
+-    krb5_algorithm_identifier *alglist[4];
++    krb5_algorithm_identifier alg_p256 = { ec_oid, ec_p256 };
++    krb5_algorithm_identifier alg_p384 = { ec_oid, ec_p384 };
++    krb5_algorithm_identifier alg_p521 = { ec_oid, ec_p521 };
++    krb5_algorithm_identifier *alglist[7];
+ 
+     i = 0;
++    if (plg_cryptoctx->ec_p256 != NULL &&
++        opts->dh_min_bits <= PKINIT_DH_P256_BITS)
++        alglist[i++] = &alg_p256;
++    if (plg_cryptoctx->ec_p384 != NULL &&
++        opts->dh_min_bits <= PKINIT_DH_P384_BITS)
++        alglist[i++] = &alg_p384;
++    if (plg_cryptoctx->ec_p521 != NULL)
++        alglist[i++] = &alg_p521;
+     if (plg_cryptoctx->dh_2048 != NULL && opts->dh_min_bits <= 2048)
+         alglist[i++] = &alg_2048;
+     if (plg_cryptoctx->dh_4096 != NULL && opts->dh_min_bits <= 4096)
+@@ -3110,13 +3264,10 @@ pkinit_process_td_dh_params(krb5_context context,
+ {
+     krb5_error_code retval = KRB5KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED;
+     EVP_PKEY *params = NULL;
+-    int i, dh_prime_bits, old_dh_size;
++    int i, dh_bits, old_dh_size;
+ 
+     pkiDebug("dh parameters\n");
+ 
+-    EVP_PKEY_free(req_cryptoctx->received_params);
+-    req_cryptoctx->received_params = NULL;
+-
+     old_dh_size = *new_dh_size;
+ 
+     for (i = 0; algId[i] != NULL; i++) {
+@@ -3124,36 +3275,22 @@ pkinit_process_td_dh_params(krb5_context context,
+         EVP_PKEY_free(params);
+         params = NULL;
+ 
+-        /* Skip any parameters for algorithms other than DH. */
+-        if (algId[i]->algorithm.length != dh_oid.length ||
+-            memcmp(algId[i]->algorithm.data, dh_oid.data, dh_oid.length))
+-            continue;
+-
+-        params = decode_dh_params(&algId[i]->parameters);
++        if (data_eq(algId[i]->algorithm, dh_oid))
++            params = decode_dh_params(&algId[i]->parameters);
++        else if (data_eq(algId[i]->algorithm, ec_oid))
++            params = decode_ec_params(&algId[i]->parameters);
+         if (params == NULL)
+             continue;
+-        dh_prime_bits = EVP_PKEY_get_bits(params);
+-        /* Skip any parameters shorter than the previous size. */
+-        if (dh_prime_bits < old_dh_size)
+-            continue;
+-        pkiDebug("client sent %d DH bits server prefers %d DH bits\n",
+-                 *new_dh_size, dh_prime_bits);
+ 
+-        /* If this is one of our well-known groups, just save the new size; we
+-         * will use our own copy of the parameters. */
+-        if (check_dh_wellknown(cryptoctx, params, dh_prime_bits)) {
+-            *new_dh_size = dh_prime_bits;
+-            retval = 0;
+-            goto cleanup;
+-        }
++        dh_bits = check_dh_wellknown(cryptoctx, params);
++        /* Skip any parameters shorter than the previous size or unknown. */
++        if (dh_bits == -1 || dh_bits < old_dh_size)
++            continue;
++        TRACE_PKINIT_DH_NEGOTIATED_GROUP(context, group_desc(dh_bits));
+ 
+-        /* If the parameters aren't well-known but check out, save them. */
+-        if (params_valid(params)) {
+-            req_cryptoctx->received_params = params;
+-            params = NULL;
+-            retval = 0;
+-            goto cleanup;
+-        }
++        *new_dh_size = dh_bits;
++        retval = 0;
++        goto cleanup;
+     }
+ 
+ cleanup:
+@@ -5329,3 +5466,40 @@ crypto_req_cert_matching_data(krb5_context context,
+     return get_matching_data(context, plgctx, reqctx, reqctx->received_cert,
+                              md_out);
+ }
++
++/*
++ * Historically, the strength of PKINIT key exchange has been determined by the
++ * pkinit_dh_min_bits variable, which gives a finite field size.  With the
++ * addition of ECDH support, we allow the string values P-256, P-384, and P-521
++ * for this config variable, represented with the rough equivalent bit
++ * strengths for finite fields.
++ */
++int
++parse_dh_min_bits(krb5_context context, const char *str)
++{
++    char *endptr;
++    long n;
++
++    if (str == NULL)
++        return PKINIT_DEFAULT_DH_MIN_BITS;
++
++    n = strtol(str, &endptr, 0);
++    if (endptr == str) {
++        if (strcasecmp(str, "P-256") == 0)
++            return PKINIT_DH_P256_BITS;
++        else if (strcasecmp(str, "P-384") == 0)
++            return PKINIT_DH_P384_BITS;
++        else if (strcasecmp(str, "P-521") == 0)
++            return PKINIT_DH_P521_BITS;
++    } else {
++        if (n == 1024)
++            return 1024;
++        else if (n > 1024 && n <= 2048)
++            return 2048;
++        else if (n > 2048 && n <= 4096)
++            return 4096;
++    }
++
++    TRACE_PKINIT_DH_INVALID_MIN_BITS(context, str);
++    return PKINIT_DEFAULT_DH_MIN_BITS;
++}
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+index c807f044ac..b7a3358800 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+@@ -99,6 +99,9 @@ struct _pkinit_plg_crypto_context {
+     EVP_PKEY *dh_1024;
+     EVP_PKEY *dh_2048;
+     EVP_PKEY *dh_4096;
++    EVP_PKEY *ec_p256;
++    EVP_PKEY *ec_p384;
++    EVP_PKEY *ec_p521;
+     ASN1_OBJECT *id_pkinit_authData;
+     ASN1_OBJECT *id_pkinit_DHKeyData;
+     ASN1_OBJECT *id_pkinit_rkeyData;
+@@ -113,7 +116,6 @@ struct _pkinit_plg_crypto_context {
+ struct _pkinit_req_crypto_context {
+     X509 *received_cert;
+     EVP_PKEY *client_pkey;
+-    EVP_PKEY *received_params;
+ };
+ 
+ #endif	/* _PKINIT_CRYPTO_OPENSSL_H */
+diff --git a/src/plugins/preauth/pkinit/pkinit_lib.c b/src/plugins/preauth/pkinit/pkinit_lib.c
+index 19db695a4d..25965eb5d2 100644
+--- a/src/plugins/preauth/pkinit/pkinit_lib.c
++++ b/src/plugins/preauth/pkinit/pkinit_lib.c
+@@ -33,9 +33,6 @@
+ 
+ #define FAKECERT
+ 
+-const krb5_data dh_oid = { 0, 7, "\x2A\x86\x48\xce\x3e\x02\x01" };
+-
+-
+ krb5_error_code
+ pkinit_init_req_opts(pkinit_req_opts **reqopts)
+ {
+diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
+index aab21f951c..e22bcb195b 100644
+--- a/src/plugins/preauth/pkinit/pkinit_srv.c
++++ b/src/plugins/preauth/pkinit/pkinit_srv.c
+@@ -988,7 +988,7 @@ static krb5_error_code
+ pkinit_init_kdc_profile(krb5_context context, pkinit_kdc_context plgctx)
+ {
+     krb5_error_code retval;
+-    char *eku_string = NULL, *ocsp_check = NULL;
++    char *eku_string = NULL, *ocsp_check = NULL, *minbits = NULL;
+ 
+     pkiDebug("%s: entered for realm %s\n", __FUNCTION__, plgctx->realmname);
+     retval = pkinit_kdcdefault_string(context, plgctx->realmname,
+@@ -1033,17 +1033,10 @@ pkinit_init_kdc_profile(krb5_context context, pkinit_kdc_context plgctx)
+         goto errout;
+     }
+ 
+-    pkinit_kdcdefault_integer(context, plgctx->realmname,
+-                              KRB5_CONF_PKINIT_DH_MIN_BITS,
+-                              PKINIT_DEFAULT_DH_MIN_BITS,
+-                              &plgctx->opts->dh_min_bits);
+-    if (plgctx->opts->dh_min_bits < PKINIT_DH_MIN_CONFIG_BITS) {
+-        pkiDebug("%s: invalid value (%d < %d) for pkinit_dh_min_bits, "
+-                 "using default value (%d) instead\n", __FUNCTION__,
+-                 plgctx->opts->dh_min_bits, PKINIT_DH_MIN_CONFIG_BITS,
+-                 PKINIT_DEFAULT_DH_MIN_BITS);
+-        plgctx->opts->dh_min_bits = PKINIT_DEFAULT_DH_MIN_BITS;
+-    }
++    pkinit_kdcdefault_string(context, plgctx->realmname,
++                             KRB5_CONF_PKINIT_DH_MIN_BITS, &minbits);
++    plgctx->opts->dh_min_bits = parse_dh_min_bits(context, minbits);
++    free(minbits);
+ 
+     pkinit_kdcdefault_boolean(context, plgctx->realmname,
+                               KRB5_CONF_PKINIT_ALLOW_UPN,
+diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
+index d385759145..1c1ceb5a41 100644
+--- a/src/plugins/preauth/pkinit/pkinit_trace.h
++++ b/src/plugins/preauth/pkinit/pkinit_trace.h
+@@ -83,6 +83,17 @@
+ 
+ #define TRACE_PKINIT_DH_GROUP_UNAVAILABLE(c, name)                      \
+     TRACE(c, "PKINIT key exchange group {str} unsupported", name)
++#define TRACE_PKINIT_DH_INVALID_MIN_BITS(c, str)                        \
++    TRACE(c, "Invalid pkinit_dh_min_bits value {str}, using default", str)
++#define TRACE_PKINIT_DH_NEGOTIATED_GROUP(c, desc)                       \
++    TRACE(c, "PKINIT accepting KDC key exchange group preference {str}", desc)
++#define TRACE_PKINIT_DH_PROPOSING_GROUP(c, desc)                \
++    TRACE(c, "PKINIT using {str} key exchange group", desc)
++#define TRACE_PKINIT_DH_RECEIVED_GROUP(c, desc)                         \
++    TRACE(c, "PKINIT received {str} key from client for key exchange", desc)
++#define TRACE_PKINIT_DH_REJECTING_GROUP(c, desc, mindesc)               \
++    TRACE(c, "PKINIT client key has group {str}, need at least {str}",  \
++          desc, mindesc)
+ 
+ #define TRACE_PKINIT_OPENSSL_ERROR(c, msg)              \
+     TRACE(c, "PKINIT OpenSSL error: {str}", msg)
+diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py
+index 62e6c426d3..f8f2debc1b 100755
+--- a/src/tests/t_pkinit.py
++++ b/src/tests/t_pkinit.py
+@@ -172,6 +172,15 @@ realm.pkinit(realm.user_princ, expected_trace=msgs)
+ realm.klist(realm.user_princ)
+ realm.run([kvno, realm.host_princ])
+ 
++# Test each Diffie-Hellman group except 1024-bit (which doesn't work
++# in OpenSSL 3.0) and the default 2048-bit group.
++for g in ('4096', 'P-256', 'P-384', 'P-521'):
++    mark('Diffie-Hellman group ' + g)
++    group_conf = {'realms': {'$realm': {'pkinit_dh_min_bits': g}}}
++    group_env = realm.special_env(g, True, krb5_conf=group_conf)
++    realm.pkinit(realm.user_princ, expected_trace=('PKINIT using ' + g,),
++                 env=group_env)
++
+ # Try using multiple configured pkinit_identities, to make sure we
+ # fall back to the second one when the first one cannot be read.
+ id_conf = {'realms': {'$realm': {'pkinit_identities': [file_identity + 'X',
+@@ -190,11 +199,14 @@ realm.start_kdc(env=minbits_env)
+ msgs = ('Sending unauthenticated request',
+         '/Additional pre-authentication required',
+         'Preauthenticating using KDC method data',
++        'PKINIT using 2048-bit DH key exchange group',
+         'Preauth module pkinit (16) (real) returned: 0/Success',
+         ' preauth for next request: PA-FX-COOKIE (133), PA-PK-AS-REQ (16)',
+         '/Key parameters not accepted',
+         'Preauth tryagain input types (16): 109, PA-FX-COOKIE (133)',
++        'PKINIT accepting KDC key exchange group preference P-384',
+         'trying again with KDC-provided parameters',
++        'PKINIT using P-384 key exchange group',
+         'Preauth module pkinit (16) tryagain returned: 0/Success',
+         ' preauth for next request: PA-PK-AS-REQ (16), PA-FX-COOKIE (133)')
+ realm.pkinit(realm.user_princ, expected_trace=msgs)
+-- 
+2.47.1
+
diff --git a/0027-Add-ecdsa-with-sha512-256-to-supportedCMSTypes.patch b/0027-Add-ecdsa-with-sha512-256-to-supportedCMSTypes.patch
new file mode 100644
index 0000000..140a2e5
--- /dev/null
+++ b/0027-Add-ecdsa-with-sha512-256-to-supportedCMSTypes.patch
@@ -0,0 +1,78 @@
+From 43d10f1580c033fe706470e7588c720ac7854918 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Wed, 21 Jun 2023 18:27:11 +0200
+Subject: [PATCH] Add ecdsa-with-sha512/256 to supportedCMSTypes
+
+Elliptic curve certificates are already supported for PKINIT
+pre-authentication, but their associated signature types aren't
+advertized.  Add ecdsa-with-sha512 and ecdsa-with-sha256 OIDs to the
+supportedCMSTypes list sent by the client.
+
+[ghudson@mit.edu: edited commit message]
+
+ticket: 9100 (new)
+(cherry picked from commit 9913e5c92c4e5cb76d6ae58386f744766d2e6454)
+---
+ src/plugins/preauth/pkinit/pkinit_constants.c | 38 +++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+diff --git a/src/plugins/preauth/pkinit/pkinit_constants.c b/src/plugins/preauth/pkinit/pkinit_constants.c
+index 10f8688ec2..905e90d29c 100644
+--- a/src/plugins/preauth/pkinit/pkinit_constants.c
++++ b/src/plugins/preauth/pkinit/pkinit_constants.c
+@@ -64,14 +64,52 @@ static char sha512WithRSAEncr_oid[9] = {
+     0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0d
+ };
+ 
++/* RFC 3279 ecdsa-with-SHA1: iso(1) member-body(2) us(840) ansi-X9-62(10045)
++ * signatures(4) 1 */
++static char ecdsaWithSha1_oid[] = {
++    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x01
++};
++
++/* RFC 5758 ecdsa-with-SHA256: iso(1) member-body(2) us(840) ansi-X9-62(10045)
++ * signatures(4) ecdsa-with-SHA2(3) 2 */
++static char ecdsaWithSha256_oid[] = {
++    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02
++};
++
++/* RFC 5758 ecdsa-with-SHA384: iso(1) member-body(2) us(840) ansi-X9-62(10045)
++ * signatures(4) ecdsa-with-SHA2(3) 3 */
++static char ecdsaWithSha384_oid[] = {
++    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x03
++};
++
++/* RFC 5758 ecdsa-with-SHA512: iso(1) member-body(2) us(840) ansi-X9-62(10045)
++ * signatures(4) ecdsa-with-SHA2(3) 4 */
++static char ecdsaWithSha512_oid[] = {
++    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x04
++};
++
+ const krb5_data sha256WithRSAEncr_id = {
+     KV5M_DATA, sizeof(sha256WithRSAEncr_oid), sha256WithRSAEncr_oid
+ };
+ const krb5_data sha512WithRSAEncr_id = {
+     KV5M_DATA, sizeof(sha512WithRSAEncr_oid), sha512WithRSAEncr_oid
+ };
++const krb5_data ecdsaWithSha1_id = {
++    KV5M_DATA, sizeof(ecdsaWithSha1_oid), ecdsaWithSha1_oid
++};
++const krb5_data ecdsaWithSha256_id = {
++    KV5M_DATA, sizeof(ecdsaWithSha256_oid), ecdsaWithSha256_oid
++};
++const krb5_data ecdsaWithSha384_id = {
++    KV5M_DATA, sizeof(ecdsaWithSha384_oid), ecdsaWithSha384_oid
++};
++const krb5_data ecdsaWithSha512_id = {
++    KV5M_DATA, sizeof(ecdsaWithSha512_oid), ecdsaWithSha512_oid
++};
+ 
+ krb5_data const * const supported_cms_algs[] = {
++    &ecdsaWithSha512_id,
++    &ecdsaWithSha256_id,
+     &sha512WithRSAEncr_id,
+     &sha256WithRSAEncr_id,
+     NULL
+-- 
+2.47.1
+
diff --git a/0028-Get-rid-of-pkinit_crypto_openssl.h.patch b/0028-Get-rid-of-pkinit_crypto_openssl.h.patch
new file mode 100644
index 0000000..993e823
--- /dev/null
+++ b/0028-Get-rid-of-pkinit_crypto_openssl.h.patch
@@ -0,0 +1,264 @@
+From fba4cbf0bc50569b8ea6d1e1c3303eaab84935e1 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Sun, 30 Jul 2023 01:07:38 -0400
+Subject: [PATCH] Get rid of pkinit_crypto_openssl.h
+
+Fold pkinit_crypto_openssl.h into the one source file where it was
+used.  Also clean up the include of <arpa/inet.h>, as htonl() is no
+longer used after commit 1c87ce6c44a9de0824580a2d72a8a202237e01f4.
+
+(cherry picked from commit b3352945fb8836f8b4095e0b8aad04b54aca3152)
+---
+ src/plugins/preauth/pkinit/deps               |   2 +-
+ .../preauth/pkinit/pkinit_crypto_openssl.c    |  85 +++++++++++-
+ .../preauth/pkinit/pkinit_crypto_openssl.h    | 121 ------------------
+ 3 files changed, 83 insertions(+), 125 deletions(-)
+ delete mode 100644 src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+
+diff --git a/src/plugins/preauth/pkinit/deps b/src/plugins/preauth/pkinit/deps
+index 58320aa801..b6f4476fe8 100644
+--- a/src/plugins/preauth/pkinit/deps
++++ b/src/plugins/preauth/pkinit/deps
+@@ -112,4 +112,4 @@ pkinit_crypto_openssl.so pkinit_crypto_openssl.po $(OUTPRE)pkinit_crypto_openssl
+   $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+   pkcs11.h pkinit.h pkinit_accessor.h pkinit_crypto.h \
+-  pkinit_crypto_openssl.c pkinit_crypto_openssl.h pkinit_trace.h
++  pkinit_crypto_openssl.c pkinit_trace.h
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index f6d494bd11..ae8599d5a2 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -30,20 +30,99 @@
+  */
+ 
+ #include "k5-int.h"
+-#include "pkinit_crypto_openssl.h"
+ #include "k5-buf.h"
+ #include "k5-err.h"
+ #include "k5-hex.h"
+-#include <unistd.h>
++#include "pkinit.h"
+ #include <dirent.h>
+-#include <arpa/inet.h>
+ 
++#include <openssl/bn.h>
++#include <openssl/dh.h>
++#include <openssl/x509.h>
++#include <openssl/pkcs7.h>
++#include <openssl/pkcs12.h>
++#include <openssl/obj_mac.h>
++#include <openssl/x509v3.h>
++#include <openssl/err.h>
++#include <openssl/evp.h>
++#include <openssl/sha.h>
++#include <openssl/asn1.h>
++#include <openssl/pem.h>
++#include <openssl/asn1t.h>
++#include <openssl/cms.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #include <openssl/core_names.h>
+ #include <openssl/kdf.h>
++#include <openssl/decoder.h>
+ #include <openssl/params.h>
+ #endif
+ 
++#define DN_BUF_LEN  256
++#define MAX_CREDS_ALLOWED 20
++
++struct _pkinit_cred_info {
++    char *name;
++    X509 *cert;
++    EVP_PKEY *key;
++#ifndef WITHOUT_PKCS11
++    CK_BYTE_PTR cert_id;
++    int cert_id_len;
++#endif
++};
++typedef struct _pkinit_cred_info *pkinit_cred_info;
++
++struct _pkinit_identity_crypto_context {
++    pkinit_cred_info creds[MAX_CREDS_ALLOWED+1];
++    STACK_OF(X509) *my_certs;   /* available user certs */
++    char *identity;             /* identity name for user cert */
++    int cert_index;             /* cert to use out of available certs*/
++    EVP_PKEY *my_key;           /* available user keys if in filesystem */
++    STACK_OF(X509) *trustedCAs; /* available trusted ca certs */
++    STACK_OF(X509) *intermediateCAs;   /* available intermediate ca certs */
++    STACK_OF(X509_CRL) *revoked;    /* available crls */
++    int pkcs11_method;
++    krb5_prompter_fct prompter;
++    void *prompter_data;
++#ifndef WITHOUT_PKCS11
++    char *p11_module_name;
++    CK_SLOT_ID slotid;
++    char *token_label;
++    char *cert_label;
++    /* These are crypto-specific. */
++    struct plugin_file_handle *p11_module;
++    CK_SESSION_HANDLE session;
++    CK_FUNCTION_LIST_PTR p11;
++    uint8_t *cert_id;
++    size_t cert_id_len;
++    CK_MECHANISM_TYPE mech;
++#endif
++    krb5_boolean defer_id_prompt;
++    pkinit_deferred_id *deferred_ids;
++};
++
++struct _pkinit_plg_crypto_context {
++    EVP_PKEY *dh_1024;
++    EVP_PKEY *dh_2048;
++    EVP_PKEY *dh_4096;
++    EVP_PKEY *ec_p256;
++    EVP_PKEY *ec_p384;
++    EVP_PKEY *ec_p521;
++    ASN1_OBJECT *id_pkinit_authData;
++    ASN1_OBJECT *id_pkinit_DHKeyData;
++    ASN1_OBJECT *id_pkinit_rkeyData;
++    ASN1_OBJECT *id_pkinit_san;
++    ASN1_OBJECT *id_ms_san_upn;
++    ASN1_OBJECT *id_pkinit_KPClientAuth;
++    ASN1_OBJECT *id_pkinit_KPKdc;
++    ASN1_OBJECT *id_ms_kp_sc_logon;
++    ASN1_OBJECT *id_kp_serverAuth;
++};
++
++struct _pkinit_req_crypto_context {
++    X509 *received_cert;
++    EVP_PKEY *client_pkey;
++};
++
+ static krb5_error_code pkinit_init_pkinit_oids(pkinit_plg_crypto_context );
+ static void pkinit_fini_pkinit_oids(pkinit_plg_crypto_context );
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+deleted file mode 100644
+index b7a3358800..0000000000
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
++++ /dev/null
+@@ -1,121 +0,0 @@
+-/*
+- * COPYRIGHT (C) 2006,2007
+- * THE REGENTS OF THE UNIVERSITY OF MICHIGAN
+- * ALL RIGHTS RESERVED
+- *
+- * Permission is granted to use, copy, create derivative works
+- * and redistribute this software and such derivative works
+- * for any purpose, so long as the name of The University of
+- * Michigan is not used in any advertising or publicity
+- * pertaining to the use of distribution of this software
+- * without specific, written prior authorization.  If the
+- * above copyright notice or any other identification of the
+- * University of Michigan is included in any copy of any
+- * portion of this software, then the disclaimer below must
+- * also be included.
+- *
+- * THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION
+- * FROM THE UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY
+- * PURPOSE, AND WITHOUT WARRANTY BY THE UNIVERSITY OF
+- * MICHIGAN OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+- * WITHOUT LIMITATION THE IMPLIED WARRANTIES OF
+- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+- * REGENTS OF THE UNIVERSITY OF MICHIGAN SHALL NOT BE LIABLE
+- * FOR ANY DAMAGES, INCLUDING SPECIAL, INDIRECT, INCIDENTAL, OR
+- * CONSEQUENTIAL DAMAGES, WITH RESPECT TO ANY CLAIM ARISING
+- * OUT OF OR IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN
+- * IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF
+- * SUCH DAMAGES.
+- */
+-
+-#ifndef _PKINIT_CRYPTO_OPENSSL_H
+-#define _PKINIT_CRYPTO_OPENSSL_H
+-
+-#include "pkinit.h"
+-
+-#include <openssl/bn.h>
+-#include <openssl/dh.h>
+-#include <openssl/x509.h>
+-#include <openssl/pkcs7.h>
+-#include <openssl/pkcs12.h>
+-#include <openssl/obj_mac.h>
+-#include <openssl/x509v3.h>
+-#include <openssl/err.h>
+-#include <openssl/evp.h>
+-#include <openssl/sha.h>
+-#include <openssl/asn1.h>
+-#include <openssl/pem.h>
+-#include <openssl/asn1t.h>
+-#include <openssl/cms.h>
+-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+-#include <openssl/core_names.h>
+-#include <openssl/decoder.h>
+-#endif
+-
+-#define DN_BUF_LEN  256
+-#define MAX_CREDS_ALLOWED 20
+-
+-struct _pkinit_cred_info {
+-    char *name;
+-    X509 *cert;
+-    EVP_PKEY *key;
+-#ifndef WITHOUT_PKCS11
+-    CK_BYTE_PTR cert_id;
+-    int cert_id_len;
+-#endif
+-};
+-typedef struct _pkinit_cred_info * pkinit_cred_info;
+-
+-struct _pkinit_identity_crypto_context {
+-    pkinit_cred_info creds[MAX_CREDS_ALLOWED+1];
+-    STACK_OF(X509) *my_certs;   /* available user certs */
+-    char *identity;             /* identity name for user cert */
+-    int cert_index;             /* cert to use out of available certs*/
+-    EVP_PKEY *my_key;           /* available user keys if in filesystem */
+-    STACK_OF(X509) *trustedCAs; /* available trusted ca certs */
+-    STACK_OF(X509) *intermediateCAs;   /* available intermediate ca certs */
+-    STACK_OF(X509_CRL) *revoked;    /* available crls */
+-    int pkcs11_method;
+-    krb5_prompter_fct prompter;
+-    void *prompter_data;
+-#ifndef WITHOUT_PKCS11
+-    char *p11_module_name;
+-    CK_SLOT_ID slotid;
+-    char *token_label;
+-    char *cert_label;
+-    /* These are crypto-specific */
+-    struct plugin_file_handle *p11_module;
+-    CK_SESSION_HANDLE session;
+-    CK_FUNCTION_LIST_PTR p11;
+-    uint8_t *cert_id;
+-    size_t cert_id_len;
+-    CK_MECHANISM_TYPE mech;
+-#endif
+-    krb5_boolean defer_id_prompt;
+-    pkinit_deferred_id *deferred_ids;
+-};
+-
+-struct _pkinit_plg_crypto_context {
+-    EVP_PKEY *dh_1024;
+-    EVP_PKEY *dh_2048;
+-    EVP_PKEY *dh_4096;
+-    EVP_PKEY *ec_p256;
+-    EVP_PKEY *ec_p384;
+-    EVP_PKEY *ec_p521;
+-    ASN1_OBJECT *id_pkinit_authData;
+-    ASN1_OBJECT *id_pkinit_DHKeyData;
+-    ASN1_OBJECT *id_pkinit_rkeyData;
+-    ASN1_OBJECT *id_pkinit_san;
+-    ASN1_OBJECT *id_ms_san_upn;
+-    ASN1_OBJECT *id_pkinit_KPClientAuth;
+-    ASN1_OBJECT *id_pkinit_KPKdc;
+-    ASN1_OBJECT *id_ms_kp_sc_logon;
+-    ASN1_OBJECT *id_kp_serverAuth;
+-};
+-
+-struct _pkinit_req_crypto_context {
+-    X509 *received_cert;
+-    EVP_PKEY *client_pkey;
+-};
+-
+-#endif	/* _PKINIT_CRYPTO_OPENSSL_H */
+-- 
+2.47.1
+
diff --git a/0029-Use-SoftHSMv2-for-PKCS11-PKINIT-tests.patch b/0029-Use-SoftHSMv2-for-PKCS11-PKINIT-tests.patch
new file mode 100644
index 0000000..a328431
--- /dev/null
+++ b/0029-Use-SoftHSMv2-for-PKCS11-PKINIT-tests.patch
@@ -0,0 +1,157 @@
+From 1b01057df4c2223fbf92be44f1e764207208ef03 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Mon, 26 Feb 2024 19:03:38 -0500
+Subject: [PATCH] Use SoftHSMv2 for PKCS11 PKINIT tests
+
+Instead of softpkcs11, use SoftHSMv2 to mock the PKCS11 token for
+PKINIT tests.  Use pkcs11-tool from OpenSC to initialize the token and
+import a certificate and key.  SoftHSM does not support PIN-less
+tokens (see https://github.com/opendnssec/SoftHSMv2/issues/480) so
+remove that test for now.
+
+(cherry picked from commit 8ab61608236883fdc5c2d43f4bd1ff2094401d19)
+---
+ .github/workflows/build.yml |  2 +-
+ src/tests/t_pkinit.py       | 82 ++++++++++++++++++++-----------------
+ 2 files changed, 45 insertions(+), 39 deletions(-)
+
+diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
+index 68a4788adb..d7ae86b150 100644
+--- a/.github/workflows/build.yml
++++ b/.github/workflows/build.yml
+@@ -33,7 +33,7 @@ jobs:
+               if: startsWith(matrix.os, 'ubuntu')
+               run: |
+                 sudo apt-get update -qq
+-                sudo apt-get install -y bison gettext keyutils ldap-utils libcmocka-dev libldap2-dev libkeyutils-dev libsasl2-dev libssl-dev python3-kdcproxy python3-pip slapd tcsh
++                sudo apt-get install -y bison gettext keyutils ldap-utils libcmocka-dev libldap2-dev libkeyutils-dev libsasl2-dev libssl-dev python3-kdcproxy python3-pip slapd tcsh softhsm2 opensc
+                 pip3 install pyrad
+             - name: Build
+               env:
+diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py
+index f8f2debc1b..4435746429 100755
+--- a/src/tests/t_pkinit.py
++++ b/src/tests/t_pkinit.py
+@@ -1,11 +1,10 @@
+ from k5test import *
++import re
+ 
+ # Skip this test if pkinit wasn't built.
+ if not pkinit_enabled:
+     skip_rest('PKINIT tests', 'PKINIT module not built')
+ 
+-soft_pkcs11 = os.path.join(buildtop, 'tests', 'softpkcs11', 'softpkcs11.so')
+-
+ # Construct a krb5.conf fragment configuring pkinit.
+ user_pem = os.path.join(pkinit_certs, 'user.pem')
+ privkey_pem = os.path.join(pkinit_certs, 'privkey.pem')
+@@ -55,9 +54,6 @@ p12_upn2_identity = 'PKCS12:%s' % user_upn2_p12
+ p12_upn3_identity = 'PKCS12:%s' % user_upn3_p12
+ p12_generic_identity = 'PKCS12:%s' % generic_p12
+ p12_enc_identity = 'PKCS12:%s' % user_enc_p12
+-p11_identity = 'PKCS11:' + soft_pkcs11
+-p11_token_identity = ('PKCS11:module_name=' + soft_pkcs11 +
+-                      ':slotid=1:token=SoftToken (token)')
+ 
+ # Start a realm with the test kdb module for the following UPN SAN tests.
+ realm = K5Realm(kdc_conf=alias_kdc_conf, create_kdb=False, pkinit=True)
+@@ -389,53 +385,63 @@ realm.klist(realm.user_princ)
+ realm.kinit(realm.user_princ, flags=['-X', 'X509_user_identity=,'],
+             expected_code=1, expected_msg='Preauthentication failed while')
+ 
+-softpkcs11rc = os.path.join(os.getcwd(), 'testdir', 'soft-pkcs11.rc')
+-realm.env['SOFTPKCS11RC'] = softpkcs11rc
++softhsm2 = '/usr/lib/softhsm/libsofthsm2.so'
++if not os.path.exists(softhsm2):
++    skip_rest('PKCS11 tests', 'SoftHSMv2 required')
++pkcs11_tool = which('pkcs11-tool')
++if not pkcs11_tool:
++    skip_rest('PKCS11 tests', 'pkcs11-tool from OpenSC required')
++tool_cmd = [pkcs11_tool, '--module', softhsm2]
++
++# Prepare a SoftHSM token.
++softhsm2_conf = os.path.join(realm.testdir, 'softhsm2.conf')
++softhsm2_tokens = os.path.join(realm.testdir, 'tokens')
++os.mkdir(softhsm2_tokens)
++realm.env['SOFTHSM2_CONF'] = softhsm2_conf
++with open(softhsm2_conf, 'w') as f:
++    f.write('directories.tokendir = %s\n' % softhsm2_tokens)
++realm.run(tool_cmd + ['--init-token', '--label', 'user',
++                      '--so-pin', 'sopin', '--init-pin', '--pin', 'userpin'])
++realm.run(tool_cmd + ['-w', user_pem, '-y', 'cert'])
++realm.run(tool_cmd + ['-w', privkey_pem, '-y', 'privkey',
++                      '-l', '--pin', 'userpin'])
++
++# Extract the slot ID generated by SoftHSM.
++out = realm.run(tool_cmd + ['-L'])
++m = re.search(r'slot ID 0x([0-9a-f]+)\n', out)
++if not m:
++    fail('could not extract slot ID from SoftHSM token')
++slot_id = int(m.group(1), 16)
++
++p11_attr = 'X509_user_identity=PKCS11:' + softhsm2
++p11_token_identity = ('PKCS11:module_name=%s:slotid=%d:token=user' %
++                      (softhsm2, slot_id))
+ 
+-# PKINIT with PKCS11: identity, with no need for a PIN.
+-mark('PKCS11 identity, no PIN')
+-conf = open(softpkcs11rc, 'w')
+-conf.write("%s\t%s\t%s\t%s\n" % ('user', 'user token', user_pem, privkey_pem))
+-conf.close()
+-# Expect to succeed without having to supply any more information.
+-realm.kinit(realm.user_princ,
+-            flags=['-X', 'X509_user_identity=%s' % p11_identity])
++mark('PKCS11 identity, with PIN (prompter)')
++realm.kinit(realm.user_princ, flags=['-X', p11_attr], password='userpin')
+ realm.klist(realm.user_princ)
+ realm.run([kvno, realm.host_princ])
+ 
+-# PKINIT with PKCS11: identity, with a PIN supplied by the prompter.
+-mark('PKCS11 identity, with PIN (prompter)')
+-os.remove(softpkcs11rc)
+-conf = open(softpkcs11rc, 'w')
+-conf.write("%s\t%s\t%s\t%s\n" % ('user', 'user token', user_pem,
+-                                 privkey_enc_pem))
+-conf.close()
+-# Expect failure if the responder does nothing, and there's no prompter
++mark('PKCS11 identity, unavailable PIN')
+ realm.run(['./responder', '-x', 'pkinit={"%s": 0}' % p11_token_identity,
+-           '-X', 'X509_user_identity=%s' % p11_identity, realm.user_princ],
+-          expected_code=2)
+-realm.kinit(realm.user_princ,
+-            flags=['-X', 'X509_user_identity=%s' % p11_identity],
+-            password='encrypted')
+-realm.klist(realm.user_princ)
+-realm.run([kvno, realm.host_princ])
++           '-X', p11_attr, realm.user_princ], expected_code=2)
+ 
+-# Supply the wrong PIN.
+ mark('PKCS11 identity, wrong PIN')
+ expected_trace = ('PKINIT client has no configured identity; giving up',)
+ realm.kinit(realm.user_princ,
+-            flags=['-X', 'X509_user_identity=%s' % p11_identity],
++            flags=['-X', p11_attr],
+             password='wrong', expected_code=1, expected_trace=expected_trace)
+ 
+ # PKINIT with PKCS11: identity, with a PIN supplied by the responder.
+-# Supply the response in raw form.
++# Supply the response in raw form.  Expect the PIN_COUNT_LOW flag (1)
++# to be set due to the previous test.
+ mark('PKCS11 identity, with PIN (responder)')
+-realm.run(['./responder', '-x', 'pkinit={"%s": 0}' % p11_token_identity,
+-           '-r', 'pkinit={"%s": "encrypted"}' % p11_token_identity,
+-           '-X', 'X509_user_identity=%s' % p11_identity, realm.user_princ])
++realm.run(['./responder', '-x', 'pkinit={"%s": 1}' % p11_token_identity,
++           '-r', 'pkinit={"%s": "userpin"}' % p11_token_identity,
++           '-X', p11_attr, realm.user_princ])
+ # Supply the response through the convenience API.
+-realm.run(['./responder', '-X', 'X509_user_identity=%s' % p11_identity,
+-           '-p', '%s=%s' % (p11_token_identity, 'encrypted'),
++realm.run(['./responder', '-X', p11_attr,
++           '-p', '%s=%s' % (p11_token_identity, 'userpin'),
+            realm.user_princ])
+ realm.klist(realm.user_princ)
+ realm.run([kvno, realm.host_princ])
+-- 
+2.47.1
+
diff --git a/0030-Simplify-PKINIT-cert-representation.patch b/0030-Simplify-PKINIT-cert-representation.patch
new file mode 100644
index 0000000..1bd8d64
--- /dev/null
+++ b/0030-Simplify-PKINIT-cert-representation.patch
@@ -0,0 +1,202 @@
+From b0315d30f066c4241fcecc33dd9e4d1c7c28b9d8 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Fri, 9 Feb 2024 17:32:40 -0500
+Subject: [PATCH] Simplify PKINIT cert representation
+
+In the _pkinit_identity_crypto_context structure, the my_certs field
+is a stack which only ever contains one cert and is only ever used to
+retrieve that one cert.  The cert_index field is always 0.  Replace
+these fields with a my_cert field pointing directly to the X509
+certificate.
+
+Simplify crypto_cert_select_default() by making it call
+crypto_cert_select() with index 0 after verifying the certificate
+count.
+
+(cherry picked from commit f95dfb7908456f9563cee66706216a21df8d791f)
+---
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 74 +++++--------------
+ 1 file changed, 20 insertions(+), 54 deletions(-)
+
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index ae8599d5a2..da59cb1e02 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -73,10 +73,9 @@ typedef struct _pkinit_cred_info *pkinit_cred_info;
+ 
+ struct _pkinit_identity_crypto_context {
+     pkinit_cred_info creds[MAX_CREDS_ALLOWED+1];
+-    STACK_OF(X509) *my_certs;   /* available user certs */
++    X509 *my_cert;              /* selected user or KDC cert */
+     char *identity;             /* identity name for user cert */
+-    int cert_index;             /* cert to use out of available certs*/
+-    EVP_PKEY *my_key;           /* available user keys if in filesystem */
++    EVP_PKEY *my_key;           /* selected cert key if in filesystem */
+     STACK_OF(X509) *trustedCAs; /* available trusted ca certs */
+     STACK_OF(X509) *intermediateCAs;   /* available intermediate ca certs */
+     STACK_OF(X509_CRL) *revoked;    /* available crls */
+@@ -1489,8 +1488,7 @@ pkinit_init_certs(pkinit_identity_crypto_context ctx)
+ 
+     for (i = 0; i < MAX_CREDS_ALLOWED; i++)
+         ctx->creds[i] = NULL;
+-    ctx->my_certs = NULL;
+-    ctx->cert_index = 0;
++    ctx->my_cert = NULL;
+     ctx->my_key = NULL;
+     ctx->trustedCAs = NULL;
+     ctx->intermediateCAs = NULL;
+@@ -1506,8 +1504,8 @@ pkinit_fini_certs(pkinit_identity_crypto_context ctx)
+     if (ctx == NULL)
+         return;
+ 
+-    if (ctx->my_certs != NULL)
+-        sk_X509_pop_free(ctx->my_certs, X509_free);
++    if (ctx->my_cert != NULL)
++        X509_free(ctx->my_cert);
+ 
+     if (ctx->my_key != NULL)
+         EVP_PKEY_free(ctx->my_key);
+@@ -1696,7 +1694,6 @@ cms_signeddata_create(krb5_context context,
+     ASN1_OCTET_STRING *digest = NULL;
+     unsigned int alg_len = 0, digest_len = 0;
+     unsigned char *y = NULL;
+-    X509 *cert = NULL;
+     ASN1_OBJECT *oid = NULL, *oid_copy;
+ 
+     /* Start creating PKCS7 data. */
+@@ -1715,7 +1712,7 @@ cms_signeddata_create(krb5_context context,
+     if (oid == NULL)
+         goto cleanup;
+ 
+-    if (id_cryptoctx->my_certs != NULL) {
++    if (id_cryptoctx->my_cert != NULL) {
+         X509_STORE *certstore = NULL;
+         X509_STORE_CTX *certctx;
+         STACK_OF(X509) *certstack = NULL;
+@@ -1726,8 +1723,6 @@ cms_signeddata_create(krb5_context context,
+         if ((cert_stack = sk_X509_new_null()) == NULL)
+             goto cleanup;
+ 
+-        cert = sk_X509_value(id_cryptoctx->my_certs, id_cryptoctx->cert_index);
+-
+         certstore = X509_STORE_new();
+         if (certstore == NULL)
+             goto cleanup;
+@@ -1736,7 +1731,7 @@ cms_signeddata_create(krb5_context context,
+         certctx = X509_STORE_CTX_new();
+         if (certctx == NULL)
+             goto cleanup;
+-        X509_STORE_CTX_init(certctx, certstore, cert,
++        X509_STORE_CTX_init(certctx, certstore, id_cryptoctx->my_cert,
+                             id_cryptoctx->intermediateCAs);
+         X509_STORE_CTX_trusted_stack(certctx, id_cryptoctx->trustedCAs);
+         if (!X509_verify_cert(certctx)) {
+@@ -1764,13 +1759,13 @@ cms_signeddata_create(krb5_context context,
+         if (!ASN1_INTEGER_set(p7si->version, 1))
+             goto cleanup;
+         if (!X509_NAME_set(&p7si->issuer_and_serial->issuer,
+-                           X509_get_issuer_name(cert)))
++                           X509_get_issuer_name(id_cryptoctx->my_cert)))
+             goto cleanup;
+         /* because ASN1_INTEGER_set is used to set a 'long' we will do
+          * things the ugly way. */
+         ASN1_INTEGER_free(p7si->issuer_and_serial->serial);
+         if (!(p7si->issuer_and_serial->serial =
+-              ASN1_INTEGER_dup(X509_get_serialNumber(cert))))
++              ASN1_INTEGER_dup(X509_get_serialNumber(id_cryptoctx->my_cert))))
+             goto cleanup;
+ 
+         /* will not fill-out EVP_PKEY because it's on the smartcard */
+@@ -3311,7 +3306,7 @@ pkinit_check_kdc_pkid(krb5_context context,
+     PKCS7_ISSUER_AND_SERIAL *is = NULL;
+     const unsigned char *p = pdid_buf;
+     int status = 1;
+-    X509 *kdc_cert = sk_X509_value(id_cryptoctx->my_certs, id_cryptoctx->cert_index);
++    X509 *kdc_cert = id_cryptoctx->my_cert;
+ 
+     *valid_kdcPkId = 0;
+     pkiDebug("found kdcPkId in AS REQ\n");
+@@ -4783,7 +4778,8 @@ cleanup:
+ }
+ 
+ /*
+- * Set the certificate in idctx->creds[cred_index] as the selected certificate.
++ * Set the certificate in idctx->creds[cred_index] as the selected certificate,
++ * stealing pointers from it.
+  */
+ krb5_error_code
+ crypto_cert_select(krb5_context context, pkinit_identity_crypto_context idctx,
+@@ -4795,20 +4791,17 @@ crypto_cert_select(krb5_context context, pkinit_identity_crypto_context idctx,
+         return ENOENT;
+ 
+     ci = idctx->creds[cred_index];
+-    /* copy the selected cert into our id_cryptoctx */
+-    if (idctx->my_certs != NULL)
+-        sk_X509_pop_free(idctx->my_certs, X509_free);
+-    idctx->my_certs = sk_X509_new_null();
+-    sk_X509_push(idctx->my_certs, ci->cert);
+-    free(idctx->identity);
++
++    idctx->my_cert = ci->cert;
++    ci->cert = NULL;
++
+     /* hang on to the selected credential name */
++    free(idctx->identity);
+     if (ci->name != NULL)
+         idctx->identity = strdup(ci->name);
+     else
+         idctx->identity = NULL;
+ 
+-    ci->cert = NULL;       /* Don't free it twice */
+-    idctx->cert_index = 0;
+     if (idctx->pkcs11_method != 1) {
+         idctx->my_key = ci->key;
+         ci->key = NULL;    /* Don't free it twice */
+@@ -4837,41 +4830,14 @@ crypto_cert_select_default(krb5_context context,
+ 
+     retval = crypto_cert_get_count(id_cryptoctx, &cert_count);
+     if (retval)
+-        goto errout;
++        return retval;
+ 
+     if (cert_count != 1) {
+         TRACE_PKINIT_NO_DEFAULT_CERT(context, cert_count);
+-        retval = EINVAL;
+-        goto errout;
+-    }
+-    /* copy the selected cert into our id_cryptoctx */
+-    if (id_cryptoctx->my_certs != NULL) {
+-        sk_X509_pop_free(id_cryptoctx->my_certs, X509_free);
++        return EINVAL;
+     }
+-    id_cryptoctx->my_certs = sk_X509_new_null();
+-    sk_X509_push(id_cryptoctx->my_certs, id_cryptoctx->creds[0]->cert);
+-    id_cryptoctx->creds[0]->cert = NULL;        /* Don't free it twice */
+-    id_cryptoctx->cert_index = 0;
+-    /* hang on to the selected credential name */
+-    if (id_cryptoctx->creds[0]->name != NULL)
+-        id_cryptoctx->identity = strdup(id_cryptoctx->creds[0]->name);
+-    else
+-        id_cryptoctx->identity = NULL;
+ 
+-    if (id_cryptoctx->pkcs11_method != 1) {
+-        id_cryptoctx->my_key = id_cryptoctx->creds[0]->key;
+-        id_cryptoctx->creds[0]->key = NULL;     /* Don't free it twice */
+-    }
+-#ifndef WITHOUT_PKCS11
+-    else {
+-        id_cryptoctx->cert_id = id_cryptoctx->creds[0]->cert_id;
+-        id_cryptoctx->creds[0]->cert_id = NULL; /* Don't free it twice */
+-        id_cryptoctx->cert_id_len = id_cryptoctx->creds[0]->cert_id_len;
+-    }
+-#endif
+-    retval = 0;
+-errout:
+-    return retval;
++    return crypto_cert_select(context, id_cryptoctx, 0);
+ }
+ 
+ 
+-- 
+2.47.1
+
diff --git a/0031-Support-PKCS11-EC-client-certs-in-PKINIT.patch b/0031-Support-PKCS11-EC-client-certs-in-PKINIT.patch
new file mode 100644
index 0000000..920a6a8
--- /dev/null
+++ b/0031-Support-PKCS11-EC-client-certs-in-PKINIT.patch
@@ -0,0 +1,1768 @@
+From e7172ce0283b06f5208237535a086424d71d846b Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Wed, 21 Feb 2024 15:29:02 -0500
+Subject: [PATCH] Support PKCS11 EC client certs in PKINIT
+
+Move the digest computation and DigestInfo encoding from
+cms_signeddata_create() to pkinit_sign_data_pkcs11(), and
+conditionalize the DigestInfo encoding on the key type.  Use CKM_ECDSA
+instead of CKM_RSA_PKCS for EC keys, and convert the resulting
+signature from the PKS11 encoding to the ASN.1 encoding required by
+CMS.
+
+Regenerate the test certificates with an additional EC client cert.
+Add test cases for EC client certs with and without PKCS11.
+
+ticket: 9112 (new)
+(cherry picked from commit f745c9a9bd6c0c73b944182173f1ac305d03dc3a)
+---
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 319 +++++++++++-------
+ src/tests/pkinit-certs/ca.pem                 |  32 +-
+ src/tests/pkinit-certs/eckey.pem              |   5 +
+ src/tests/pkinit-certs/ecuser.pem             |  24 ++
+ src/tests/pkinit-certs/generic.p12            | Bin 2469 -> 2560 bytes
+ src/tests/pkinit-certs/generic.pem            |  38 +--
+ src/tests/pkinit-certs/kdc.pem                |  32 +-
+ src/tests/pkinit-certs/make-certs.sh          |  11 +-
+ src/tests/pkinit-certs/privkey-enc.pem        |  60 ++--
+ src/tests/pkinit-certs/privkey.pem            |  55 +--
+ src/tests/pkinit-certs/user-enc.p12           | Bin 2829 -> 2920 bytes
+ src/tests/pkinit-certs/user-upn.p12           | Bin 2821 -> 2912 bytes
+ src/tests/pkinit-certs/user-upn.pem           |  32 +-
+ src/tests/pkinit-certs/user-upn2.p12          | Bin 2805 -> 2896 bytes
+ src/tests/pkinit-certs/user-upn2.pem          |  34 +-
+ src/tests/pkinit-certs/user-upn3.p12          | Bin 2821 -> 2912 bytes
+ src/tests/pkinit-certs/user-upn3.pem          |  32 +-
+ src/tests/pkinit-certs/user.p12               | Bin 2829 -> 2920 bytes
+ src/tests/pkinit-certs/user.pem               |  30 +-
+ src/tests/t_pkinit.py                         |  20 ++
+ 20 files changed, 437 insertions(+), 287 deletions(-)
+ create mode 100644 src/tests/pkinit-certs/eckey.pem
+ create mode 100644 src/tests/pkinit-certs/ecuser.pem
+
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index da59cb1e02..4accfc2664 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -93,7 +93,6 @@ struct _pkinit_identity_crypto_context {
+     CK_FUNCTION_LIST_PTR p11;
+     uint8_t *cert_id;
+     size_t cert_id_len;
+-    CK_MECHANISM_TYPE mech;
+ #endif
+     krb5_boolean defer_id_prompt;
+     pkinit_deferred_id *deferred_ids;
+@@ -283,7 +282,6 @@ compat_get0_EC(const EVP_PKEY *pkey)
+ #if OPENSSL_VERSION_NUMBER < 0x30000000L
+ /* OpenSSL 3.0 changes several preferred function names. */
+ #define EVP_PKEY_parameters_eq EVP_PKEY_cmp_parameters
+-#define EVP_MD_CTX_get0_md EVP_MD_CTX_md
+ #define EVP_PKEY_get_size EVP_PKEY_size
+ #define EVP_PKEY_get_bits EVP_PKEY_bits
+ 
+@@ -1683,17 +1681,12 @@ cms_signeddata_create(krb5_context context,
+     STACK_OF(X509) * cert_stack = NULL;
+     ASN1_OCTET_STRING *digest_attr = NULL;
+     EVP_MD_CTX *ctx;
+-    const EVP_MD *md_tmp = NULL;
+-    unsigned char md_data[EVP_MAX_MD_SIZE], md_data2[EVP_MAX_MD_SIZE];
+-    unsigned char *digestInfo_buf = NULL, *abuf = NULL;
+-    unsigned int md_len, md_len2, alen, digestInfo_len;
++    unsigned char md_data[EVP_MAX_MD_SIZE], *abuf = NULL;
++    unsigned int md_len, alen;
+     STACK_OF(X509_ATTRIBUTE) * sk;
+     unsigned char *sig = NULL;
+     unsigned int sig_len = 0;
+     X509_ALGOR *alg = NULL;
+-    ASN1_OCTET_STRING *digest = NULL;
+-    unsigned int alg_len = 0, digest_len = 0;
+-    unsigned char *y = NULL;
+     ASN1_OBJECT *oid = NULL, *oid_copy;
+ 
+     /* Start creating PKCS7 data. */
+@@ -1795,7 +1788,6 @@ cms_signeddata_create(krb5_context context,
+             goto cleanup;
+         EVP_DigestInit_ex(ctx, EVP_sha256(), NULL);
+         EVP_DigestUpdate(ctx, data, data_len);
+-        md_tmp = EVP_MD_CTX_get0_md(ctx);
+         EVP_DigestFinal_ex(ctx, md_data, &md_len);
+         EVP_MD_CTX_free(ctx);
+ 
+@@ -1820,63 +1812,8 @@ cms_signeddata_create(krb5_context context,
+         if (abuf == NULL)
+             goto cleanup2;
+ 
+-#ifndef WITHOUT_PKCS11
+-        /*
+-         * Some tokens can only do RSAEncryption without a hash.  To compute
+-         * sha256WithRSAEncryption, encode the algorithm ID for the hash
+-         * function and the hash value into an ASN.1 value of type DigestInfo:
+-         * DigestInfo ::= SEQUENCE {
+-         *   digestAlgorithm  AlgorithmIdentifier,
+-         *   digest  OCTET STRING
+-         * }
+-         */
+-        if (id_cryptoctx->pkcs11_method == 1 &&
+-            id_cryptoctx->mech == CKM_RSA_PKCS) {
+-            pkiDebug("mech = CKM_RSA_PKCS\n");
+-            ctx = EVP_MD_CTX_new();
+-            if (ctx == NULL)
+-                goto cleanup;
+-            EVP_DigestInit_ex(ctx, md_tmp, NULL);
+-            EVP_DigestUpdate(ctx, abuf, alen);
+-            EVP_DigestFinal_ex(ctx, md_data2, &md_len2);
+-            EVP_MD_CTX_free(ctx);
+-
+-            alg = X509_ALGOR_new();
+-            if (alg == NULL)
+-                goto cleanup2;
+-            X509_ALGOR_set0(alg, OBJ_nid2obj(NID_sha256), V_ASN1_NULL, NULL);
+-            alg_len = i2d_X509_ALGOR(alg, NULL);
+-
+-            digest = ASN1_OCTET_STRING_new();
+-            if (digest == NULL)
+-                goto cleanup2;
+-            ASN1_OCTET_STRING_set(digest, md_data2, (int)md_len2);
+-            digest_len = i2d_ASN1_OCTET_STRING(digest, NULL);
+-
+-            digestInfo_len = ASN1_object_size(1, (int)(alg_len + digest_len),
+-                                              V_ASN1_SEQUENCE);
+-            y = digestInfo_buf = malloc(digestInfo_len);
+-            if (digestInfo_buf == NULL)
+-                goto cleanup2;
+-            ASN1_put_object(&y, 1, (int)(alg_len + digest_len), V_ASN1_SEQUENCE,
+-                            V_ASN1_UNIVERSAL);
+-            i2d_X509_ALGOR(alg, &y);
+-            i2d_ASN1_OCTET_STRING(digest, &y);
+-#ifdef DEBUG_SIG
+-            pkiDebug("signing buffer\n");
+-            print_buffer(digestInfo_buf, digestInfo_len);
+-            print_buffer_bin(digestInfo_buf, digestInfo_len, "/tmp/pkcs7_tosign");
+-#endif
+-            retval = pkinit_sign_data(context, id_cryptoctx, digestInfo_buf,
+-                                      digestInfo_len, &sig, &sig_len);
+-        } else
+-#endif
+-        {
+-            pkiDebug("mech = %s\n",
+-                     id_cryptoctx->pkcs11_method == 1 ? "CKM_SHA256_RSA_PKCS" : "FS");
+-            retval = pkinit_sign_data(context, id_cryptoctx, abuf, alen,
+-                                      &sig, &sig_len);
+-        }
++        retval = pkinit_sign_data(context, id_cryptoctx, abuf, alen,
++                                  &sig, &sig_len);
+ #ifdef DEBUG_SIG
+         print_buffer(sig, sig_len);
+ #endif
+@@ -1930,14 +1867,6 @@ cms_signeddata_create(krb5_context context,
+ 
+ cleanup2:
+     if (p7si) {
+-#ifndef WITHOUT_PKCS11
+-        if (id_cryptoctx->pkcs11_method == 1 &&
+-            id_cryptoctx->mech == CKM_RSA_PKCS) {
+-            free(digestInfo_buf);
+-            if (digest != NULL)
+-                ASN1_OCTET_STRING_free(digest);
+-        }
+-#endif
+         if (alg != NULL)
+             X509_ALGOR_free(alg);
+     }
+@@ -3657,8 +3586,7 @@ cleanup:
+  * Look for a key that's:
+  * 1. private
+  * 2. capable of the specified operation (usually signing or decrypting)
+- * 3. RSA (this may be wrong but it's all we can do for now)
+- * 4. matches the id of the cert we chose
++ * 3. matches the id of the cert we chose
+  *
+  * You must call pkinit_get_certs before calling pkinit_find_private_key
+  * (that's because we need the ID of the private key)
+@@ -3678,7 +3606,6 @@ pkinit_find_private_key(pkinit_identity_crypto_context id_cryptoctx,
+     CK_OBJECT_CLASS cls;
+     CK_ATTRIBUTE attrs[4];
+     CK_ULONG count;
+-    CK_KEY_TYPE keytype;
+     unsigned int nattrs = 0;
+     int r;
+ #ifdef PKINIT_USE_KEY_USAGE
+@@ -3705,12 +3632,6 @@ pkinit_find_private_key(pkinit_identity_crypto_context id_cryptoctx,
+     nattrs++;
+ #endif
+ 
+-    keytype = CKK_RSA;
+-    attrs[nattrs].type = CKA_KEY_TYPE;
+-    attrs[nattrs].pValue = &keytype;
+-    attrs[nattrs].ulValueLen = sizeof keytype;
+-    nattrs++;
+-
+     attrs[nattrs].type = CKA_ID;
+     attrs[nattrs].pValue = id_cryptoctx->cert_id;
+     attrs[nattrs].ulValueLen = id_cryptoctx->cert_id_len;
+@@ -3749,6 +3670,116 @@ pkinit_sign_data_fs(krb5_context context,
+ }
+ 
+ #ifndef WITHOUT_PKCS11
++/*
++ * DER-encode a DigestInfo sequence containing the algorithm md and the digest
++ * mdbytes.
++ *
++ * DigestInfo ::= SEQUENCE {
++ *   digestAlgorithm  AlgorithmIdentifier,
++ *   digest  OCTET STRING
++ * }
++ */
++static krb5_error_code
++encode_digestinfo(krb5_context context, const EVP_MD *md,
++                  const uint8_t *mdbytes, size_t mdlen,
++                  uint8_t **encoding_out, size_t *len_out)
++{
++    krb5_boolean ok = FALSE;
++    X509_ALGOR *alg = NULL;
++    ASN1_OCTET_STRING *digest = NULL;
++    uint8_t *buf, *p;
++    int alg_len, digest_len, len;
++
++    *encoding_out = NULL;
++    *len_out = 0;
++
++    alg = X509_ALGOR_new();
++    if (alg == NULL ||
++        !X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_nid(md)), V_ASN1_NULL, NULL))
++        goto cleanup;
++    alg_len = i2d_X509_ALGOR(alg, NULL);
++    if (alg_len < 0)
++        goto cleanup;
++
++    digest = ASN1_OCTET_STRING_new();
++    if (digest == NULL || !ASN1_OCTET_STRING_set(digest, mdbytes, mdlen))
++        goto cleanup;
++    digest_len = i2d_ASN1_OCTET_STRING(digest, NULL);
++    if (digest_len < 0)
++        goto cleanup;
++
++    len = ASN1_object_size(1, alg_len + digest_len, V_ASN1_SEQUENCE);
++    p = buf = malloc(len);
++    if (buf == NULL)
++        goto cleanup;
++    ASN1_put_object(&p, 1, alg_len + digest_len, V_ASN1_SEQUENCE,
++                    V_ASN1_UNIVERSAL);
++    i2d_X509_ALGOR(alg, &p);
++    i2d_ASN1_OCTET_STRING(digest, &p);
++
++    *encoding_out = buf;
++    *len_out = len;
++    ok = TRUE;
++
++cleanup:
++    X509_ALGOR_free(alg);
++    ASN1_OCTET_STRING_free(digest);
++    if (!ok)
++        return oerr(context, 0, _("Failed to DER encode DigestInfo"));
++    return 0;
++}
++
++/* Extract the r and s values from a PKCS11 ECDSA signature and re-encode them
++ * in the DER representation of an ECDSA-Sig-Value for use in CMS. */
++static krb5_error_code
++convert_pkcs11_ecdsa_sig(krb5_context context,
++                         const uint8_t *p11sig, unsigned int p11siglen,
++                         uint8_t **sig_out, unsigned int *sig_len_out)
++{
++    krb5_boolean ok = FALSE;
++    BIGNUM *r = NULL, *s = NULL;
++    ECDSA_SIG *sig = NULL;
++    int len;
++    uint8_t *p;
++
++    *sig_out = NULL;
++    *sig_len_out = 0;
++
++    if (p11siglen % 2 != 0)
++        return EINVAL;
++
++    /* Extract the r and s values from the PKCS11 signature. */
++    r = BN_bin2bn(p11sig, p11siglen / 2, NULL);
++    s = BN_bin2bn(p11sig + p11siglen / 2, p11siglen / 2, NULL);
++    if (r == NULL || s == NULL)
++        goto cleanup;
++
++    /* Create an ECDSA-Sig-Value object and transfer ownership of r and s. */
++    sig = ECDSA_SIG_new();
++    if (sig == NULL || !ECDSA_SIG_set0(sig, r, s))
++        goto cleanup;
++    r = s = NULL;
++
++    /* DER-encode the ECDSA-Sig-Value object. */
++    len = i2d_ECDSA_SIG(sig, NULL);
++    if (len < 0)
++        goto cleanup;
++    p = *sig_out = malloc(len);
++    if (*sig_out == NULL)
++        goto cleanup;
++    *sig_len_out = len;
++    i2d_ECDSA_SIG(sig, &p);
++    ok = TRUE;
++
++cleanup:
++    BN_free(r);
++    BN_free(s);
++    ECDSA_SIG_free(sig);
++    if (!ok)
++        return oerr(context, 0, _("Failed to convert PKCS11 ECDSA signature"));
++    return 0;
++}
++
+ static krb5_error_code
+ pkinit_sign_data_pkcs11(krb5_context context,
+                         pkinit_identity_crypto_context id_cryptoctx,
+@@ -3757,27 +3788,88 @@ pkinit_sign_data_pkcs11(krb5_context context,
+                         unsigned char **sig,
+                         unsigned int *sig_len)
+ {
++    krb5_error_code ret;
+     CK_OBJECT_HANDLE obj;
+     CK_ULONG len;
+     CK_MECHANISM mech;
+-    unsigned char *cp;
++    CK_SESSION_HANDLE session;
++    CK_FUNCTION_LIST_PTR p11;
++    CK_ATTRIBUTE attr;
++    CK_KEY_TYPE keytype;
++    EVP_MD_CTX *ctx;
++    const EVP_MD *md = EVP_sha256();
++    unsigned int mdlen;
++    uint8_t mdbuf[EVP_MAX_MD_SIZE], *dinfo = NULL, *sigbuf = NULL, *input;
++    size_t dinfo_len, input_len;
+     int r;
+ 
++    *sig = NULL;
++    *sig_len = 0;
++
+     if (pkinit_open_session(context, id_cryptoctx)) {
+         pkiDebug("can't open pkcs11 session\n");
+         return KRB5KDC_ERR_PREAUTH_FAILED;
+     }
++    p11 = id_cryptoctx->p11;
++    session = id_cryptoctx->session;
+ 
+-    pkinit_find_private_key(id_cryptoctx, CKA_SIGN, &obj);
++    ret = pkinit_find_private_key(id_cryptoctx, CKA_SIGN, &obj);
++    if (ret)
++        return ret;
++
++    attr.type = CKA_KEY_TYPE;
++    attr.pValue = &keytype;
++    attr.ulValueLen = sizeof(keytype);
++    r = p11->C_GetAttributeValue(session, obj, &attr, 1);
++    if (r) {
++        pkiDebug("C_GetAttributeValue: %s\n", pkcs11err(r));
++        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        goto cleanup;
++    }
++
++    /*
++     * We would ideally use CKM_SHA256_RSA_PKCS and CKM_ECDSA_SHA256, but
++     * historically many cards seem to be confused about whether they are
++     * capable of mechanisms or not.  To be safe we compute the digest
++     * ourselves and use CKM_RSA_PKCS and CKM_ECDSA.
++     */
++    ctx = EVP_MD_CTX_new();
++    if (ctx == NULL) {
++        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        goto cleanup;
++    }
++    EVP_DigestInit_ex(ctx, EVP_sha256(), NULL);
++    EVP_DigestUpdate(ctx, data, data_len);
++    EVP_DigestFinal_ex(ctx, mdbuf, &mdlen);
++    EVP_MD_CTX_free(ctx);
+ 
+-    mech.mechanism = id_cryptoctx->mech;
++    if (keytype == CKK_RSA) {
++        /* For RSA we must also encode the digest in a DigestInfo sequence. */
++        mech.mechanism = CKM_RSA_PKCS;
++        ret = encode_digestinfo(context, md, mdbuf, mdlen, &dinfo, &dinfo_len);
++        if (ret)
++            goto cleanup;
++        input = dinfo;
++        input_len = dinfo_len;
++    } else if (keytype == CKK_EC) {
++        mech.mechanism = CKM_ECDSA;
++        input = mdbuf;
++        input_len = mdlen;
++    } else {
++        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        k5_setmsg(context, ret,
++                  _("PKCS11 certificate has unsupported key type %lu"),
++                  keytype);
++        goto cleanup;
++    }
+     mech.pParameter = NULL;
+     mech.ulParameterLen = 0;
+ 
+-    if ((r = id_cryptoctx->p11->C_SignInit(id_cryptoctx->session, &mech,
+-                                           obj)) != CKR_OK) {
++    r = p11->C_SignInit(session, &mech, obj);
++    if (r != CKR_OK) {
+         pkiDebug("C_SignInit: %s\n", pkcs11err(r));
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
++        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        goto cleanup;
+     }
+ 
+     /*
+@@ -3785,28 +3877,38 @@ pkinit_sign_data_pkcs11(krb5_context context,
+      * get that. So guess, and if it's too small, re-malloc.
+      */
+     len = PK_SIGLEN_GUESS;
+-    cp = malloc((size_t) len);
+-    if (cp == NULL)
+-        return ENOMEM;
++    sigbuf = k5alloc(len, &ret);
++    if (sigbuf == NULL)
++        goto cleanup;
+ 
+-    r = id_cryptoctx->p11->C_Sign(id_cryptoctx->session, data,
+-                                  (CK_ULONG) data_len, cp, &len);
++    r = p11->C_Sign(session, input, input_len, sigbuf, &len);
+     if (r == CKR_BUFFER_TOO_SMALL || (r == CKR_OK && len >= PK_SIGLEN_GUESS)) {
+-        free(cp);
++        free(sigbuf);
+         pkiDebug("C_Sign realloc %d\n", (int) len);
+-        cp = malloc((size_t) len);
+-        r = id_cryptoctx->p11->C_Sign(id_cryptoctx->session, data,
+-                                      (CK_ULONG) data_len, cp, &len);
++        sigbuf = k5alloc(len, &ret);
++        if (sigbuf == NULL)
++            goto cleanup;
++        r = p11->C_Sign(session, input, input_len, sigbuf, &len);
+     }
+     if (r != CKR_OK) {
+         pkiDebug("C_Sign: %s\n", pkcs11err(r));
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
++        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        goto cleanup;
+     }
+-    pkiDebug("sign %d -> %d\n", (int) data_len, (int) len);
+-    *sig_len = len;
+-    *sig = cp;
+ 
+-    return 0;
++    if (keytype == CKK_EC) {
++        /* PKCS11 ECDSA signatures must be re-encoded for CMS. */
++        ret = convert_pkcs11_ecdsa_sig(context, sigbuf, len, sig, sig_len);
++    } else {
++        *sig_len = len;
++        *sig = sigbuf;
++        sigbuf = NULL;
++    }
++
++cleanup:
++    free(dinfo);
++    free(sigbuf);
++    return ret;
+ }
+ #endif
+ 
+@@ -4388,15 +4490,6 @@ pkinit_get_certs_pkcs11(krb5_context context,
+         return 0;
+     }
+ 
+-    /*
+-     * We'd like to use CKM_SHA256_RSA_PKCS for signing if it's available, but
+-     * historically many cards seem to be confused about whether they are
+-     * capable of mechanisms or not. The safe thing seems to be to ignore the
+-     * mechanism list, always use CKM_RSA_PKCS and calculate the sha256 digest
+-     * ourselves.
+-     */
+-    id_cryptoctx->mech = CKM_RSA_PKCS;
+-
+     cls = CKO_CERTIFICATE;
+     attrs[0].type = CKA_CLASS;
+     attrs[0].pValue = &cls;
+diff --git a/src/tests/pkinit-certs/ca.pem b/src/tests/pkinit-certs/ca.pem
+index 63d31c1f5f..6c782bcde5 100644
+--- a/src/tests/pkinit-certs/ca.pem
++++ b/src/tests/pkinit-certs/ca.pem
+@@ -3,27 +3,27 @@ MIIE5TCCA82gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+ FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+ A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+ dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+-b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMFoXDTMyMDkyMDIxMTEzMFowgacxCzAJ
++b3RoZXJ3aXNlMB4XDTI0MDIxNTA0NTkwN1oXDTM1MDEyODA0NTkwN1owgacxCzAJ
+ BgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMRIwEAYDVQQHDAlDYW1i
+ cmlkZ2UxDDAKBgNVBAoMA01JVDEpMCcGA1UECwwgSW5zZWN1cmUgUEtJTklUIEtl
+ cmJlcm9zIHRlc3QgQ0ExMzAxBgNVBAMMKnBraW5pdCB0ZXN0IHN1aXRlIENBOyBk
+ byBub3QgdXNlIG90aGVyd2lzZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+-ggEBAM+lV5iaVats0yBFN4FBe6bovloNe3d0F9qMuhKqlECv6cFra75gSGmHJz6t
+-GTK8zITU7sni429azTZC9IQnUt/2lW8dWzpZD1T5Vt1DYvYFqVzjhNfzeEDK88ig
+-ENfzaX/cY2P76arJr0cewGaauzaux8heYW1CjBxWmk6kWq4aD+5jggchvBeOGEE2
+-NkV3MPbXut8fu+3NzuuIG7Z0ilwQv+KUvQ8QQb9VCwdsDh/ERsQ4loC9P4jtuWCJ
+-ikIE78GxDcOMoC1ftJtW/mBCS2iCHipXrp2BDDJMyHxZjHpl0VoDR7koWGtD3sos
+-EwUkXVvWIuKs432h2dXQ+u8HaBsCAwEAAaOCARgwggEUMB0GA1UdDgQWBBT0F6X7
+-1QRftDiSeNSY3bks3nK0IzCB1AYDVR0jBIHMMIHJgBT0F6X71QRftDiSeNSY3bks
+-3nK0I6GBraSBqjCBpzELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0
++ggEBAJv9Sbc2QSbHWnZjk55JfeOdPGUsmKOcT/N7C0/0mOQq4tUCmha7ntpBoIJd
++UBDhMQayG3QHruQX7aogtOx8hoLoLUaNKgxzEZ0OLbDRMc2M+vTDpBROITGI1KPv
++QtthlS4ocqKvqBCze66N9LufzAju61CyKdB3pCykPrgDVVScfsZ1t2zCbK0SF2cf
++ZAdIyCLoGLeQ95/NL3SIx0CX9gU47AVmBkSQ+LExJRhbUSIg+puKbqJ0XVILR1B2
++ezgik2ObFND0hsRUS4v8pKnIDz0HXR2AneTESY+atjbzzelGA2zH86p4tLg0PanQ
++4x4+gpkQhzSr5Cmi3QX4XahSrmUCAwEAAaOCARgwggEUMB0GA1UdDgQWBBSSP/pz
++leX5zVcZ9hpI5GG2eQ+pqjCB1AYDVR0jBIHMMIHJgBSSP/pzleX5zVcZ9hpI5GG2
++eQ+pqqGBraSBqjCBpzELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0
+ dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoGA1UECgwDTUlUMSkwJwYDVQQLDCBJ
+ bnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVzdCBDQTEzMDEGA1UEAwwqcGtpbml0
+ IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ugb3RoZXJ3aXNlggEBMAsGA1UdDwQE
+-AwIB/jAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBT2FJVPS+U
+-0MXa1HUOETuUPrVff7VeIvyAPm9IgX1zNbCvktCc4d7ErNB3P5ng8aZz4MKqwzuX
+-HVhUxbF7JKfyUI41lcixPG+k+U9mzBJaozWT+K1OhdUF//mGPxaxe5jyUhDiQArD
+-/6vulX0/B+1iuIa1sCfoeelzqQcYHqhZdWn6bBdcDWNARHIXWs5zPeKA975+d5TW
+-rofE7T8nNQJvcZoVjCSfcYXhP82D/0sA+wPCt3fgbBZdvJ89xwvIlzBtiwC++Zbe
+-37Rt5av0+ykpR7nmh2jyG+ItzE73nYKdBrUI5J6JLSbUcQTw4jeXHwDULUHZ6fXg
+-TBEM2v1VW4Df
++AwIB/jAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAfx04Uqh0D
++myOR1PSqEEbMWJxZXYoESnjjH4Co4doceVBTuKix/2lplD4wcvA7aMXpmkvGfP38
++dPrN1jvGd4bi/djTuxab9qB7rOeswAt+NyVHReUmuIMwgcW1UD7HXErg4EsOMjGD
++2XGhJYxGnwdURmnFwoO3yLLwo5K+C4rqPm3PbnI3W0sCA+IXepQTxuXK3dSplMMm
++0Pejw3es2s3oI9WaD2JRXvFuylw4UWYX+cyFRb+wN55Gh0rPVdxDhKCkbWNt/gTi
++/DbC+5pyQXkmy07OEGrmh4+5ae9hwejr9AukF2IZJB+oFP4i1mt9xyAOXImnWOzB
++SdHD08WHl5Gq
+ -----END CERTIFICATE-----
+diff --git a/src/tests/pkinit-certs/eckey.pem b/src/tests/pkinit-certs/eckey.pem
+new file mode 100644
+index 0000000000..14c2efd2ac
+--- /dev/null
++++ b/src/tests/pkinit-certs/eckey.pem
+@@ -0,0 +1,5 @@
++-----BEGIN PRIVATE KEY-----
++MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSB3T7ihe3JUeIKZI
++PCDqATKN/dNugQsaC5AKiBPC6ymhRANCAAQy0E88e1CX16/2wL2T+nE0pmlb7wBM
++0hOh6m3m2uDbVsAIRJfhEjHWsT2ODCoBvGDV6vBeIOUjE/Ro9EwnYBW5
++-----END PRIVATE KEY-----
+diff --git a/src/tests/pkinit-certs/ecuser.pem b/src/tests/pkinit-certs/ecuser.pem
+new file mode 100644
+index 0000000000..585e53d8c5
+--- /dev/null
++++ b/src/tests/pkinit-certs/ecuser.pem
+@@ -0,0 +1,24 @@
++-----BEGIN CERTIFICATE-----
++MIIECDCCAvCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
++FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
++A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
++dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
++b3RoZXJ3aXNlMB4XDTI0MDIxNTA0NTkwN1oXDTM1MDEyODA0NTkwN1owSjELMAkG
++A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
++U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
++MtBPPHtQl9ev9sC9k/pxNKZpW+8ATNIToept5trg21bACESX4RIx1rE9jgwqAbxg
++1erwXiDlIxP0aPRMJ2AVuaOCAWQwggFgMB0GA1UdDgQWBBR5MaRx7ub5YBwsS0CF
++Li18nsl49zCB1AYDVR0jBIHMMIHJgBSSP/pzleX5zVcZ9hpI5GG2eQ+pqqGBraSB
++qjCBpzELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNV
++BAcMCUNhbWJyaWRnZTEMMAoGA1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQ
++S0lOSVQgS2VyYmVyb3MgdGVzdCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3Vp
++dGUgQ0E7IGRvIG5vdCB1c2Ugb3RoZXJ3aXNlggEBMAsGA1UdDwQEAwID6DAMBgNV
++HRMBAf8EAjAAMDkGA1UdEQQyMDCgLgYGKwYBBQICoCQwIqANGwtLUkJURVNULkNP
++TaERMA+gAwIBAaEIMAYbBHVzZXIwEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG
++9w0BAQsFAAOCAQEAfwlONLYPo0BNN2NyQZM3wkoldvFqidcoZiYALOcBcmllMP7H
++XQ/+en4TmbKR0RUJN6AjR9yEo92fHAYOB2L7AzR8AkOiRLjp/Pdg5kUHFTdKenTK
++DvpeiJELz9chk/vaMv1T9qvOwH2bVAyS8GrUc5n0ui5F61PrquLAmm+dpKyHDY60
++DdFaebS2gYsmy4bBv0mgcMZ+ZXnzXYmLNtdVQ3SgVGO7M8eyCqPbe/o0Lw4Gz+l0
++xgpFkptdlEogsOaJBzjrgWyBnWw6MkyyLiSY+iOxFpBGkwCxi1gtQwbcp4gMwaxc
++p5+JPM/JBfglBX1lpRhhxL8EGQvpryN9MT530w==
++-----END CERTIFICATE-----
+diff --git a/src/tests/pkinit-certs/generic.p12 b/src/tests/pkinit-certs/generic.p12
+index 35c27415bcb07c479990133882655bce3fe3bd72..55a248137ca7b82654252808422e97337ed95a6a 100644
+GIT binary patch
+delta 2529
+zcmV<72_E*P6Mz&VFoFsE0s#Xsf(fz)2`Yw2hW8Bt2LYgh38Msp37;^637e53JAbV+
+z<eLpXK_LPH2mpYB1IPt%iV8Q7E0I-}`D$o<?klte7Wjf!6nC7D!3|8@4Z8`k9)PO2
+z$l>63K|{jPm6S=lRhUG)C?|)hzs!}J6Z>esz%vM91VoEu)Pmv^_jw4QQ*{P;%zdH=
+z8s3InWP5X2dL3JP%_r_AH_wr3!haB>cU&;sQHeY0h(*0{Urg+^g7yVKn`IE0+Y~a<
+z<+xCb5BfX!dU%zZc~;wYZFOctxMS?Ch*eD^8-zy8#7*(m&=G8Yhq%X1&fk&#wqvO`
+z<a3xT(gizFXiC1WNw(0eY~lhG&qEJvG>_dV6f%Lq>$}y?fWJ0eZbaT_3xCB5v<1XX
+zhesXP-h3le9uU$XQav@c@^ng6qjNOuTgo57tfg;nGUhmeDh5PY6l0w(`tmfVgVRd9
+zI*Dp$(4kaUY$_|u8*tJ)z~Krm!cf$))c$ks%D6w-z)!1oA_bqAdZA}A1PNl78+^by
+zVRwaGflgdSeO1RqxQGi;-G4bE0H%>kz6g9{O9DNB5M5tLz%C?ula24llm<KP{jwP0
+z)Sgr^plscXWDlk9d|RGGYZOujcwQ@AJy}z{lwkD5dN!y=^YN?(I#CCwlT45q)5i>}
+zuabL^!h`a+uPu%ySk>~=QyaYKaBuM-cq;N~+Yx$45s+L!{%M=B-hZOqUNh4<T!iF*
+z`%?>Z-0?vO-hD#{!>=(UZ$|e*T(Ppu?Da=)T;Z(vy(zB2AS5Op(0bOE%ijXo4T48j
+zaWpTAg-^G1r}2Wp1*k*bZcWwf`iU-QS;py!e2L#5(1)IJP}}evf+~Y&;L^{uM-p#P
+z$CG)Ic1TsdW7ZAj_<zbSp{$nxQ6w{JWfmy%2ofpK70HLCdP9f8G};GRr*qOd9OUX$
+zTCax~>9OvHhVSGr5Tr)o_wWooY?lqp0j8d)wxI&i!7%mWDC=nXromP*=gpE(B1cq6
+z@&j;>({0S<2hI|cciYPo@g%a*p@w1QGgUypb46QUs!RVP9)D=_dWE&lLg-u?xw~PV
+z8h$a6Har0<@wSwfG;mYk()2u9489&2LgL1C(X*xX1j1|82eY!A`42Tp_64UG7SgBu
+z%wrY}ctA8@Orn<bCM$71W|=~s9uU74hc2L(XsYP|`h;``)>_s)L0sRiOYhfl{V{IX
+zM*Nb94b`ZcV1L~qp38AGXFWP*5hp^{z@{c)LZAu9VXKJ{o5DhRdf!Y&dE}=hwC#io
+zYZtdIiA~U5r(Up^;hSx%T>+Jy<}L55P1hamg|^{b1f$(AuO#g5sY1S!!RH0q+MJHB
+z4KRWQga!#JhDe6@4FLxMpn?T;1cC)|FoFebFoFeX27e1GhDe6@4FL=a0Ro_c1u-y!
+z1uZaF1_>&LNQU<f0R;^(N-!w~2`Yw2hW8Bt1q?781PIvb<@awST7Uuq2mmk)1_&yK
+zNQU<f0tp2GFdYU7V1`HmWdj5ODg+Q>z5YzW6GvH2i8WJEF=@#Jf&|c95Qocq9uI_J
+zuEKYIs(<f%N1T177XU0V*s07M&RQ=vS0B}$reFDd03;ZPqmZY)#|`A@k2u7DJ1FU_
+zCQ1N=!88mq84xFRSBs{|ihI-er`uLb;?{;uSh!|y!^?aHqG>pnOmNhS39%39z*|>!
+zQn!$n2&<*PQxpN5z%hjmlZIh7OhJBIERDLutbco%u}C>L6m-jbjU`E0z4N4hv7qv}
+z^<lFFBR2$l96BrkSjjgx3iq7V9V%3HTGMlO8fx6bd-SSD{W@RC;_;8{THyvHAx1Tv
+z91(Z+ttLT?$Ilad7j!8mC}h#%8II46r`<Vk{{xs%@CRGk&0uempW?gLnRRLjB>8gz
+zK!5#Z(o{x~w1P9(r4Li1M%kTWTj4<uwD7pk3vB*Y)BZEYIc?M_YA&{?nTN#VM@k{x
+zF|CXtC*@D%HUhXaP*{go8l$WBPzV?zBh`<;4?Cp91YR2z^&xAjDOfwuA_)}0J-B|2
+z2jj?Jz1CnC2s8pOuaQ*iN&(|p>^9LM>3^D&+%>&>Wli9sfvq8guK6okCa1xutOKr6
+ze5ic%+9n`|zI{F%*l8Fr;ljDGAvLV0jf_)^F#+Z_s_@|PN(w%P!=LYJK87-dtKya2
+z-ou2tBdt^%>*Aqa4Oz$fR`pK-Kt1~8U({s7fQm9sgMRC|HbAW@!MkNsf<n<#a({*_
+zGsl<Sy=@9wWibHpBk(d@1TN~%veYd2;h~5C9LcXsdct@q+7Lu_8+bpvzLEMEd&oo&
+z3)OC4eZ#&Hr$zT~GThxF&G+^Vm?Z05`*T@;4B%Ay^xW7FJ7cbK(HIh*@%lacdZ>z<
+zs3^xE3`}tjOvaZ`mTy27G6T*&3x76}mvTS&uHM)V*><Tjevw_ZB!emgvpS%Ezz9>8
+zLvM!WSi)FK>L5EKYmVS=wl>j?$b4-)uQ5|+rMxsUIRUb~2(_i}gtCLG(Lj^DK^6HR
+z9|Bvq^{Tc`3RDQ#EExyBL%EMeJ0A)4WmSkOXqfGF$5-3gA<;I^%nD!<^?!uBBky_h
+zDtHZ3Hq?a{K8#>eqP`A1yryjk_q9*A{X2bwX11sbz$$Y)U2w$6y=G^r0u5K6r-Qq$
+zh<kirXZ_+fdDpND;6oCWl|X6IhD%@X>mU#{eAbmCy5=l7y`BIj6sdNhVHC%_79bPl
+ziqj1XqSWmBQHa9luW4F^7k`C(;)-1%xig{k$ZRTikT+J#^4~y14n$+@8>ZlRhjX@X
+zGv{`|4XV@GM}bVDI$XXh4edI-nqiEw2@N*ip5xg23vTl~U@sV*_`HJxr#5B4$dV6v
+zj=|^1mfn3wd(>scr_%*luv9D=!6_Jf0%mi@W8$z1!<aX^Q=IZL>3`<@lUmc73wTM|
+ztMxU2wp4lXT+wF?cD6j|rz=JhmfCBD<A3FdmoDA#c}S{%BA3|RmpCUNUDBiCToZGR
+zp0oXZxy$4wk|4YZUIoZ14i9~`Yl!4>Al-Ij#Q0W%F$P)3fwn}<2+d$G9GIQzMh!YN
+zAmjmBVsnk6AgHmakbkjQY;aSX$`ujO5N8damZY7qviDEls~HZTCkILT#rJxJnsB*n
+zR>-H**-OEFgmF#KsXF__e;4CL7kK-*wNi<+Exq~-VcGD9%`qh~BL)d7hDe6@4FL%i
+zF%|?A!W!(19gkH}sK#VEJUUJdl+OXWFhMXeFbxI?V1`HmWi|r@0s#d81RywUr<O3v
+rUh(j1BB>7PU4+J&7;H`yIZWU8rteK!mx%-j>llc3<F@HH0s;sC$t9a|
+
+delta 2437
+zcmV;033~Q`6r~d)FoFr80s#Xsf(d5^2`Yw2hW8Bt2LYgh30MSz2~;qG2~d$DJAV~E
+zshs5PmWu)c2mpYB1IXvCTFy<(!A}P2?C_GrZ7&?M$38}6R<ZsiNZK4k;%3qlYW{C!
+zheqNlHGy(xi!bxM{pu1Qvd_`ruJYvQKV7B3Et$ZMeWTwbUNa!eC_Mt+p6JRlpCzZ;
+zJlk{WV8No&{x?u67)@@Ax6I4s_<zDBK<a6<9q|JLzS|2Te7C8*X?|5MQ^rjsSVTo2
+zyZbvzTC5~>nny_xmpD&=el8<hE1;skAKrc=&B!?tRnLSVuK&f<2)Mrls|C*v`V&V9
+z;Qm@$BNj%Q-`ri=%&Zdcv$O(ED>0aE%9m{fV68_AYFzhm@kKP%T=aiATz>)K7usww
+z(0*{b68eczuAI2a3uHsb3Zn_F)9~g+LCvtun(x>N9_kuVVuYlA^cxgA()Q^}p{@VX
+z(<h<^7%{^a$hTIARW=JhLO8NvfJK&EtIo~<PWkh4jGx3DHwLJ-53pU7kw5h}+t=&1
+zCfC<+M`ys7PlWrQ5<bVRS${?7{$JoC=c3I@eFSH=<cTwkUQgd+k~qb1O>pQJ#h!L#
+zvT%~2SR2lMq2|uvwt-65uo+g%PdM+yCR*0d3<~^2SWHuSkyu|U{2*phDUa6z^!f#K
+z&e!gf!i)wC0}3Cr;t4QJ>qXxqtd29tYZ!QSIJXcb1=)#Zz@NztpMM)iLM4FN{(b4O
+z7;Y8sDSuKgUUFZq^5D#5vcVSW7Jv7Yd(aBQZLxL`TMK);Odg}Pn?i_&$%=^rbRuT)
+z1@-3i4P15rwSp}Q52aT>>NISAeYnh|qF(@TkGZY4j&#|GeCZ}Hv|Wo|3Ildq{En?`
+z33W*|;8`HbhQf?M^M5j}nDMonW~5ihFn!pqa@$I}d3&;S<v}pFrB#1j&MA>f_zYJf
+zK3966V3l`s?KpMq7Xkws7rQ0uNx?O)nr5OZ&sjxPS8n6V!bbhl+S`tADP6n()KD|d
+z-4;CP6oPK*x2YwH4h?UM!7FQ+S?s;2-TRK1t94vz+%<~h=YKH5b;L89yyIr-R20Xh
+zS{BJAi-^$up9m8hh*-25HX~YLbxrHdA82beU_`X^W`y^J_2X$56A1j~=kc`==Z_+T
+zu7n}%#;**bdW+$vg-Mi7)lR@16R`>eP+7#cXM{AT8(O1C6<8Jjm?oO_Dk+uOv3t&g
+zP!zO+$`Utaxql8|%C$?vj}~CsWJnUybmONs+6V!t>=}LX3`Ea~#O_UYaY4adZ=6kJ
+zWazr~1Ui&-TH9eCh?b{xL&MfNVV`KjC{9Nh#fgY%F57NeV`~Z=1e&f>y{fZPK8Y+&
+z12BRGIR*(ThDe6@4FLxMpn?S|1cC)7FoFdlFoFdh27e1GhDe6@4FL=a0Ro_c1m-Y;
+z1mZ9p1_~;MNQU<f0So~HFb)I=bJ+c+ptRD20s;sC1cC&>xYm$0NS^prVcA%SO0uwo
+zHTQ=?Wn+3w3*FrDC(OA-<LkQjQul;b;&~?fK+1-+cYMKuQrA8NHMP>xz1k4gg0%e7
+zE|<Q|?SG%=Ce#pZFi3gw(DsP6a?pdfM#ar#U7dRMJfk=*65LPEI^A*bYR$sX3)(24
+z;l%ZZl4E>q{bGT1^9c;Po6)t2QAoislaez~##_3so3$~8c|6ThDA<wM;;I05!NRYa
+zT0xTJxJivb^4XS~Gehr8;1gt-83yViw6sc>LVuQ_`csrzZi7niVJ9&B&mxm=-<O_D
+zOWHeGb%U@V8S^l<&921j!8>_q))60k=1>ymZmg$D41NgWqT6$()f5qclF-{owN-!(
+zDNM-9lt=)MEIj|1m8It)GAoJ%qaW@RZQc!WT>eKQb<cj6hl<Ew+_^2Zy+q4|0K{RL
+z1Ap;ZBC{}y4eE$*70h>xMSU<nFOexT*uag%9YKk#j-ulwXEOK-v_IdKUH4F4A!r+l
+zn5>wCCXnn=J7dW==)=q%_QmbS-PsoBVmQ8#q>Z^57uw%&$COK#CU_J%s^HpCp-Pso
+zsVG6ZqD#N95LV4&Mw?3o*)hrMz~EOMuzxqgdGzSOzDoDF?Pkop!&U7s;C7a9@Bi+r
+z<q9eAdtpo`g>p!&vTiAsBFWBiz9fh!LHbIQHHOQPIy8weJzOs7nB3foOb*z7OelAz
+zF$EsP@)6NmCAs=uFa;EVKna5xx0wGC#1`kHKO_2-y{6nHp9b*qZx8n~sZv2}KYy=9
+z;~-}X`6hf1FeQEp+V1&}(%k_e+XYC3sTNhk<2T!iAyy{PA(IYE9GAHj(LQE#V91#~
+zMpN1OiY)j(O~~5A3sooGn~qp$_FCm)P6?T^VJIP^FO{K4O+egG1sF_F)0>`OQOio4
+zjE6GDi!3W7g|OZ^<sIvh5QW9|aer8s2t0laIp%o}u*)=yIY2Qeab{8`k{97flkYWS
+z$tU`zeO0R&{IGzSD^iH_>z;M7OTLGbU+pY!hzrsCEIoUkENh3X5HhDb9>|ytO0Stc
+z@^I;i)OpS<Vpfge<}WK-b}mSC2Sz7rWBm3lsMa1W?C6MhO&)G-=r=rJ<bTmsqY`@A
+z6n@P1<JTa$q3&<M1OJ`YOevnTZGX*e=~b-t6wj{$j8x{0)1p~K-#wfglI;vuaZm7%
+z?sWU^3>|&hTxBQ&rT4S3nmdg~fDy@qjnF^LgIQbKcXMGfqm}?RX#B>Gf;lzxO}jM-
+z^t@NcdY7+{Q-)q4=Ko$b^?&x{b!znTkhh!0ERCBt;t0ez_1?u1D*pnqDZ~gg>wdj_
+zDezCIv8*1y!-2=uWr$XJ4OSw>q5$^1c@yM?IK-sh^c19jqpxi*kgsE^^W-y_Nejad
+zd3khp1|E-OCe?G*$q+&?|L(>VjwhpmXG}Pxk5vO(Qyn{y81;~`)PL~7xU*N-!)((Q
+zs!t34$4XA5po!lQq66@%NADy&c}(Eg2(@_lQp3?MRq!|?PO=AXq;qSylg+*;=831x
+zV?Dd^3!*hvgv4ud@Ta2hPE24|C@l*$Kh8kG4%2x!jBss%!yz?NiaKJR*V?l>TPY!I
+zH_XRAWAxGcTje&~Pg*f0Fe3&DDuzgg_YDCF6)_eB6wv3{Iz-K-_+dQJ5g?!#l~?ug
+zDljoHAutIB1uG5%0vZJX1QbP$4lejcX32OA_0p;gH()NMq7(!OS_-~il6^%c0s;sC
+Dy-<?g
+
+diff --git a/src/tests/pkinit-certs/generic.pem b/src/tests/pkinit-certs/generic.pem
+index 55ebb3dbff..dde7f31a70 100644
+--- a/src/tests/pkinit-certs/generic.pem
++++ b/src/tests/pkinit-certs/generic.pem
+@@ -1,21 +1,21 @@
+ -----BEGIN CERTIFICATE-----
+-MIIDazCCAlOgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+-FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+-A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+-dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+-b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
+-A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
+-U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+-CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+-Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+-yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+-QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+-YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+-yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCS
+-OTfZununxFDxuThhIFDWEZ9p2qSqTrxKtKx4CDvdckz4kaKybiNZTW7Dlh6IwWta
+-60eq98WrMHXYlSaN87r95lU0ug2RFJh4uLdq3a5NM/daIIjO0Bo86oC+8EBM961Q
+-mCMe7dn9ngFK92msdqO+wfpAfvhSpBPtAjQovigirheiEoER/ov9t9/3mRi5OTkY
+-8YfKT/z6XJrnOUIB3AgCdGyzSRvWLqLrbh7iAFVrm6Pq6D2nNr+mE9r5u7uFl3r8
+-QeDgp0Unwd1ISWTHZlrP4bq29w7y2O+/2KV04Og8z+4zoGD4nRinuJBUdNqwAXVz
+-dz6pXFWgLRD+9ddI5jB0
++MIIDZjCCAk4CAQgwDQYJKoZIhvcNAQELBQAwgacxCzAJBgNVBAYTAlVTMRYwFAYD
++VQQIDA1NYXNzYWNodXNldHRzMRIwEAYDVQQHDAlDYW1icmlkZ2UxDDAKBgNVBAoM
++A01JVDEpMCcGA1UECwwgSW5zZWN1cmUgUEtJTklUIEtlcmJlcm9zIHRlc3QgQ0Ex
++MzAxBgNVBAMMKnBraW5pdCB0ZXN0IHN1aXRlIENBOyBkbyBub3QgdXNlIG90aGVy
++d2lzZTAeFw0yNDAyMTUwNDU5MDdaFw0zNTAxMjgwNDU5MDdaMEoxCzAJBgNVBAYT
++AlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMRQwEgYDVQQKDAtLUkJURVNULkNP
++TTENMAsGA1UEAwwEdXNlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
++AJv9Sbc2QSbHWnZjk55JfeOdPGUsmKOcT/N7C0/0mOQq4tUCmha7ntpBoIJdUBDh
++MQayG3QHruQX7aogtOx8hoLoLUaNKgxzEZ0OLbDRMc2M+vTDpBROITGI1KPvQtth
++lS4ocqKvqBCze66N9LufzAju61CyKdB3pCykPrgDVVScfsZ1t2zCbK0SF2cfZAdI
++yCLoGLeQ95/NL3SIx0CX9gU47AVmBkSQ+LExJRhbUSIg+puKbqJ0XVILR1B2ezgi
++k2ObFND0hsRUS4v8pKnIDz0HXR2AneTESY+atjbzzelGA2zH86p4tLg0PanQ4x4+
++gpkQhzSr5Cmi3QX4XahSrmUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAau8fw4h1
++hp4/gp7l+AXvq+9E/a2y2Np+H8BmlRIg8ZLyKjRR6iPjcUwFWUteSSBsFzcc+/5V
++/Qs9gAW4nRIb9zY/sPO3KMAjJGKaP3u8xWkrfVZzaqPkfOWa5RDkh9AtvpN/fVLH
++dC+hC1xlXtjJ/YugJD6OA66sxdyTjR/v++0mqaTQyTI29HqtTc9LUcpbC1OYzxS3
++8vlZZgieRU0UlBvpsR0AqCaTZPgcrIvJ0EVIk6XzgOWJAptAe3tFEVrHtZJAQG04
++TI7NN/zw17O9Sn8NVEB4RSw6CFZeEVBBfCZL99HveEd8WPU0zgYceuVl/UCpQFNi
++Av6/+n+/6KwHXg==
+ -----END CERTIFICATE-----
+diff --git a/src/tests/pkinit-certs/kdc.pem b/src/tests/pkinit-certs/kdc.pem
+index e46afc177f..4f7785854c 100644
+--- a/src/tests/pkinit-certs/kdc.pem
++++ b/src/tests/pkinit-certs/kdc.pem
+@@ -3,27 +3,27 @@ MIIE4TCCA8mgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+ FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+ A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+ dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+-b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMFoXDTMyMDkyMDIxMTEzMFowSTELMAkG
++b3RoZXJ3aXNlMB4XDTI0MDIxNTA0NTkwN1oXDTM1MDEyODA0NTkwN1owSTELMAkG
+ A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
+ U1QuQ09NMQwwCgYDVQQDDANLREMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+-AoIBAQDPpVeYmlWrbNMgRTeBQXum6L5aDXt3dBfajLoSqpRAr+nBa2u+YEhphyc+
+-rRkyvMyE1O7J4uNvWs02QvSEJ1Lf9pVvHVs6WQ9U+VbdQ2L2Balc44TX83hAyvPI
+-oBDX82l/3GNj++mqya9HHsBmmrs2rsfIXmFtQowcVppOpFquGg/uY4IHIbwXjhhB
+-NjZFdzD217rfH7vtzc7riBu2dIpcEL/ilL0PEEG/VQsHbA4fxEbEOJaAvT+I7blg
+-iYpCBO/BsQ3DjKAtX7SbVv5gQktogh4qV66dgQwyTMh8WYx6ZdFaA0e5KFhrQ97K
+-LBMFJF1b1iLirON9odnV0PrvB2gbAgMBAAGjggFzMIIBbzAdBgNVHQ4EFgQU9Bel
+-+9UEX7Q4knjUmN25LN5ytCMwgdQGA1UdIwSBzDCByYAU9Bel+9UEX7Q4knjUmN25
+-LN5ytCOhga2kgaowgacxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNl
++AoIBAQCb/Um3NkEmx1p2Y5OeSX3jnTxlLJijnE/zewtP9JjkKuLVApoWu57aQaCC
++XVAQ4TEGsht0B67kF+2qILTsfIaC6C1GjSoMcxGdDi2w0THNjPr0w6QUTiExiNSj
++70LbYZUuKHKir6gQs3uujfS7n8wI7utQsinQd6QspD64A1VUnH7GdbdswmytEhdn
++H2QHSMgi6Bi3kPefzS90iMdAl/YFOOwFZgZEkPixMSUYW1EiIPqbim6idF1SC0dQ
++dns4IpNjmxTQ9IbEVEuL/KSpyA89B10dgJ3kxEmPmrY2883pRgNsx/OqeLS4ND2p
++0OMePoKZEIc0q+Qpot0F+F2oUq5lAgMBAAGjggFzMIIBbzAdBgNVHQ4EFgQUkj/6
++c5Xl+c1XGfYaSORhtnkPqaowgdQGA1UdIwSBzDCByYAUkj/6c5Xl+c1XGfYaSORh
++tnkPqaqhga2kgaowgacxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNl
+ dHRzMRIwEAYDVQQHDAlDYW1icmlkZ2UxDDAKBgNVBAoMA01JVDEpMCcGA1UECwwg
+ SW5zZWN1cmUgUEtJTklUIEtlcmJlcm9zIHRlc3QgQ0ExMzAxBgNVBAMMKnBraW5p
+ dCB0ZXN0IHN1aXRlIENBOyBkbyBub3QgdXNlIG90aGVyd2lzZYIBATALBgNVHQ8E
+ BAMCA+gwDAYDVR0TAQH/BAIwADBIBgNVHREEQTA/oD0GBisGAQUCAqAzMDGgDRsL
+ S1JCVEVTVC5DT02hIDAeoAMCAQKhFzAVGwZrcmJ0Z3QbC0tSQlRFU1QuQ09NMBIG
+-A1UdJQQLMAkGBysGAQUCAwUwDQYJKoZIhvcNAQELBQADggEBAJZd7v5ZOMs8Y3ht
+-Kmtql8rKs0Jee73gVHYw3LXxJfHjIiNGdexxuWJ6Hy9gFnfwSco+15HP3MxMBkau
+-TKo3i1+Kwf+lc7gIZ0g/CEnYOx2smHGd9yGudWypunYLjGWfH/2M8/Wu1gZDTxQ1
+-pNMQZ2pPLL/C6c6vYpVQJ5cA0RSh/SC5IbOESUpZaFFMYxF5TNz+28/lDr/rN41O
+-miklos6cH5EkJyI0WUqJMk04HHjREl/9RTak8mo/eaqjUMTAOyweSwpaYRCddBOo
+-y1ix9yH0fSBib1+WQ3MAHZHgbgVnu7V2GnB6qMNqRLHoGa03x+5Q1X0QuKxP6iYo
+-9tiGt3k=
++A1UdJQQLMAkGBysGAQUCAwUwDQYJKoZIhvcNAQELBQADggEBAHGR7TUjyGt7IbqD
++MW/MfOkLtvpv1f3MhbRSmYDweGKejh2xQIONC/BlaBA2RWmhJIYTdc8wPRlcC76D
++2HLhBmGyOSy+ZTX/txGhtXm+xzNuhLF95VKDd2Z+06CMe1CptH1fvnf5YaZsUgv4
++nXmRN2i4WWrVHoWsAFCcEM6PqT9j/2485DbjtmoS7nVNvO0UKJs2vGgZYuxgYQsl
++S387YJnSbC3/VjTHGBh+R7oRZ0cBvpviWyp5Xak0kNcWAUSu3Oa1FRYDz6Cw/r7/
++wrTWxMA9W3Ygzeh+JFpYZkj5BNrwFem8UxrM/g2ZvXVS81dKGfA5spEZ/cEsAkU1
++8mWgcJY=
+ -----END CERTIFICATE-----
+diff --git a/src/tests/pkinit-certs/make-certs.sh b/src/tests/pkinit-certs/make-certs.sh
+index 5284f42599..9fb3e41412 100755
+--- a/src/tests/pkinit-certs/make-certs.sh
++++ b/src/tests/pkinit-certs/make-certs.sh
+@@ -116,17 +116,21 @@ extendedKeyUsage = $CLIENT_EKU_LIST
+ [exts_none]
+ EOF
+ 
+-# Generate a private key.
++# Generate an RSA private key and a password-protected PEM file for it..
+ openssl genrsa $KEYSIZE > privkey.pem
+ openssl rsa -in privkey.pem -out privkey-enc.pem -des3 -passout pass:encrypted
+ 
++# Generate an EC private key.
++openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:P-256 > eckey.pem
++
+ # Generate a "CA" certificate.
+ SUBJECT=ca openssl req -config openssl.cnf -new -x509 -extensions exts_ca \
+     -set_serial 1 -days $DAYS -key privkey.pem -out ca.pem
+ 
+ serial=2
+ gen_cert() {
+-    SUBJECT=$1 openssl req -config openssl.cnf -new -key privkey.pem -out csr
++    keyfile=${4-privkey.pem}
++    SUBJECT=$1 openssl req -config openssl.cnf -new -key $keyfile -out csr
+     SUBJECT=$1 openssl x509 -extfile openssl.cnf -extensions $2 \
+            -set_serial $serial -days $DAYS -req -CA ca.pem -CAkey privkey.pem \
+            -in csr -out $3
+@@ -152,6 +156,9 @@ gen_cert user exts_client user.pem
+ gen_pkcs12 user.pem user.p12
+ gen_pkcs12 user.pem user-enc.p12 encrypted
+ 
++# Generate an EC client certificate.
++gen_cert user exts_client ecuser.pem eckey.pem
++
+ # Generate a client certificate and PKCS#12 bundle with a UPN SAN.
+ gen_cert user exts_upn_client user-upn.pem
+ gen_pkcs12 user-upn.pem user-upn.p12
+diff --git a/src/tests/pkinit-certs/privkey-enc.pem b/src/tests/pkinit-certs/privkey-enc.pem
+index 29d2f3d38c..fd36246ed4 100644
+--- a/src/tests/pkinit-certs/privkey-enc.pem
++++ b/src/tests/pkinit-certs/privkey-enc.pem
+@@ -1,30 +1,30 @@
+------BEGIN RSA PRIVATE KEY-----
+-Proc-Type: 4,ENCRYPTED
+-DEK-Info: DES-EDE3-CBC,5FFF1E71BFFB65E3
+-
+-p89x5YEL+Mb6IPZXEkkr0KC4Wj+JtgE3VKdTT0wEcRD74QVv+dbbZt62WgmpJtId
+-ph0Ial2z5Mws8L/aTkPdW2H/bEroApLu4TfUV+w67KcWgrc8gOg73d6gEObqx8li
+-qGbs7FC1cI1WfDfnNOnCbD66e5+bTI8fDuchaieNRqzROd9RHhmlBHgylTmf55us
+-laGuwLq2cZk/+Xz0M8PPx07uauGkAK0fyfifn/JR3PsGsE9s334osVQMjbjyT0VE
+-rm8HGm3PvZHHDUnkOh7AGKyEtsIa5fJAULUjugp2lQJqOigC4HVn8a33xfLI0F1+
+-2nH9MZ+Ap1rtI1cJX8CDn/Ij9oFt01scLxynYekYej11zFiR6qHC0sspxu0Yi8l0
+-puBPXCI0GzyF9I53ukjGeibTtssz5yw1r+2oVasR4bvfXczPjqTQCBsPSUayNNhw
+-RgT7k4QTY2OlrK/5XdILBzBlsvfndXgGOwEDw4YE7PMzMmz69vPMK7CfedUqtuXq
+-bGBks58tzeOa4NSfVDOuFLI+LMkoYWMSjPGD/I0trX41xCU+O6PZOnDyt5ZWl1Tm
+-klJpsB7rUcwsP8d4w4QGhyyV6Mo2MTlnTILr4CwwvmDMBch3yzwbfKdeywsFQh0S
+-NMrG3aYNO7csRRTD6aGvYcBCbavWq7Ujsb/fV7SOIS26f4VEqewvOFlFEXm66zaz
+-GJ0IcjtNHYNIIIW4690djxPqlGgbIZTblBSBlT+iOW5HrhXvrLeMmwAPxInU5dK+
+-ypk2MGc4SzemkDi8H9jDW3dwbgcvVD9wn0glhVLQKWvP6F73UUdVEXMCZ+960xnR
+-gxeEwDdIpzXNadWdON1kRbqI2KesRY/XQErGHDOvf2gNSM9V2gPz+5humvcu3mXY
+-r4537On4+IdzetEVtI7D0slgojs+jN8waigpkLFB5RVl8PnzblMuWOkHNA86rrp+
+-h6wNqv9kHLgPjpAyB1l/7w4VqXLXeC4PdaGc2fcpdNWOncUnHROmDmYvdTocqhIF
+-bAsEFV7QZoTgDB7J6vLsmbtfawtHMSb81V/wTJWRrtY/gJCrkJXR2pTYAZlPX6vK
+-aK7K2NuhJFMnrQD+kxsrloSEyfsZmHtk0mAVXJw4wSxlH3eGQ+Jphb/M2wtsnWV1
+-w0fehxL2Vd5SyBBctAGhUirhRngbOO/E8IioymrziQ88vJZs2DxvbuNG4WKTuTwj
+-CIggXohCNKdqrwL2HAynm2FVEWhbKrQwe4kjZc64WjccR4cy9vv+dxFfrKl+vZ1o
+-Wvb0WXND7fiSBrPo7OfaYM5HjrcvIRP1AtMuArhuQYVARmawUG0l7dFLN97Rh9M+
+-Ud9vBIfQYlubnTGVVm/5xrUh2isQbp2vrZLfMrUNXMQm0vSxKgGkAxqNUuklJC06
+-LvCtEWMYXiBmB1zP4khwCHmHB+/E1gHBAutCzhpPu86ayEtNHBHIFkqKvZSg/UuZ
+-+ygDdTJV00I2neIdeQcyG+vPg6huIDIHpG5u6eQn5sLqVkhr+apeNcskMWpdkpFS
+-Lo62KUZDR3yB83ne63c3IGex0hWhVojJOAxykpGp6OD9uFn6Xn7x2Q==
+------END RSA PRIVATE KEY-----
++-----BEGIN ENCRYPTED PRIVATE KEY-----
++MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIBw7aG13XYxwCAggA
++MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPWyEPoKz4WhBIIEyKHdx+pkDxax
++dCCUZHsJ54boZxh+7f7xmO9Rjm+6+3cE+WCjPsiGHPUDtOXLxWwcrG0RAmA1GmrE
++yZbclwEMF8LcWQ3EUDMCJXBs7CEtA4XDH+EW1KsZwP+cA53ZFFikGj3sW6Ix5GLi
++Df311Eumhp3GABU57siNn+tMZJAorInth5lXBJFQoE3KJbBrSN9iQKZTOpgr4G3B
++G+qzBwrUKnZrGIp42t8op4VkB8sA6xoHh/huJB5pNygt9OZUQ+xdxvNQq+5/kJ2I
++mP/JRPSuN4GtnNA4fBB6tPv8t0L8hActkWlQ1rSJwWnWge3t4r5/3FBcAbl+zq3k
++t8A0LWgjsiQRmlKRN7GrzorOUKFv+7YAq6rc1Ek79qitUgEiFkwZZySt5+yPstMW
++vpaq2V0yDHf5Ds9uXffprhSAjnfXdT4NTg5eMeH65OEedUpVVzHauoGfFkDGaq8L
++8XgWPZPaz6GQFpU5SGk8FZn0OLLJHnHQDYo+ViL2XSuuqY8Jd7fmpzqVoHOU8k9Q
++/ONKW+E6uvkpNH6NbknceA/ip1bcdfwA/uRBckXjCc5uR0oB18M4UQPuKlcGev39
++mcdlvzQJxl2EWbB8ULazzuzOVfCAEwKc96qOkDAY94CB69f/KhBOd2QqHzdxrQ+3
+++K+YduhbfP49Vxaq4NIklS/kSSv4GEBHzEwtFxX4oqN4Er+UkBSB423nvlkSLd1g
++tR4M30lJyzmHtOEpSOZYLakviz36ZOCV/DsxrfziNG/0RB/mPLm/B5L+StqjJrTY
++Pjo3QHKb+6ShhTi+jZ8tqXa68+TZO3Q7eTgqrcn8mq9jfama0KQF/13kmUsrFXTS
++wk/nbSP10z+MhO68z7o3j+Q0Co/cXkQke4slvc3DqLNvpQdDMPLKQVxtkPBq5czr
++dbk5K2GYFLNWO5Tv2RgBGomznoAGSolz5ozIqxffVHAK4NGfhihgLO/6GujDANVz
++EX/2/IacRg0L0x7//O/GHomiFvWYnDbHhRNicERe/ji1TCxJ5glqntFjOXDumwi6
++f+mQWNWlQWtKq0IOnlHrBB+vqykAj+e+FROqJjuNI6hu4CNnrBK3Hf+NY+rXdn7l
++iCTD3ojdufqo0JDZe8dXea+B7Zu7WNAxnpW8D018DJxR2hoBvT4Po1CBaHLfxAkT
++ZGeXMjp1vZ348xBSppFpIpYjFRQBeBgSezzA66o3YIcDeHu2bTzg73DiUXNgV3RG
++OyJHmsOmN9Gax/Cx4z6/Ff7seisXpIMRU9TDrRCFKAcPHXAl3R4L6guK0I5OGwz3
++GSMxsx3PGitj0x+1ynW/Tf+EJQD33ognc+kuQfNL0XW2tNJoibZIs1WgdbDwD9RD
++X7rbb9GfSJlQUnBFG/EKU7SGmFZUVMz7we8vckZ1PfeIKfH7OWrZ2i1WxIF2WO1K
++BX4TXp0KKt+aCwf1GInQ/6aYgh5g8W2iKuz2HJeZIN+ohciNmpOynsFmHGXdbvnO
++Kw+msZEQb5AvhXf4ToiSwZLSwq3qAILN8fOQQ9ta1DjJuUtITpe6ys9xhlnriUkm
++KrY50GkimLdD6XszC2uNulAuh3o0nZplqxC9IOLh+uasEU/+xqtwTaaYBljTpH2C
++8FPAEFFUVy6lsngJEQvdjw==
++-----END ENCRYPTED PRIVATE KEY-----
+diff --git a/src/tests/pkinit-certs/privkey.pem b/src/tests/pkinit-certs/privkey.pem
+index 007b6275df..2a25dc19cf 100644
+--- a/src/tests/pkinit-certs/privkey.pem
++++ b/src/tests/pkinit-certs/privkey.pem
+@@ -1,27 +1,28 @@
+------BEGIN RSA PRIVATE KEY-----
+-MIIEoAIBAAKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtr
+-vmBIaYcnPq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE
+-1/N4QMrzyKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOC
+-ByG8F44YQTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiW
+-gL0/iO25YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNH
+-uShYa0PeyiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABAoIBAEpnKYMR0h6xyNjo
+-VGIpT6BYB1UHPbVo0N9Ly6TCoIqpPe5DioDVyTye5A4OQlgu1G3ISqPme6478ApA
+-ZZMw7/42QgdlknnOzbKaAWkZK02Sa8RP9hrXL8CvuDisOjzXCHd7RdXevzSmPfsS
+-5sgdK3YFnKqMPwbCcKf61CHXvHJjWGuTIHIRh8P7gJelA4ahO0kYQ8aRXv3ldquO
+-ukSI5gyk9CN+aAHqt25kEmt9oOgk+8kfKpnk+5gkOCY2YOFDDckD7nL1VIIrDxwG
+-SmU598qjVwycDairWUY8uSuPCOLgbvDM9N8cERDMsyNQL63GE8ZZyHZsJ3Pbwdfs
+-JVHh5ekCgYEA/CwhaT9D0WQ49GQdeI7aqazHEYDmqPdE2/qbmr67tPMZzX8AAk9j
+-r4aMT+oIdtIMPdoQNNcBP6NYZLlAoMbLoAzHmWJnF5/YWLnS2Wg9OuXUOBn3jk1l
+-SWelJfAKGeBld5fpSLTdHjRAwJrNCX+mc0IZIiEw2IvGUPgKGX08bX8CgYEA0swx
+-xCDgvfoaKueInw/rUIcKxrSxK3pDhaR01Dg2pwSo7Vj9W01zf33qe+mjma6+U2SB
+-fk+/O2VXDuEOmVDLwvp6PkmUeRE5PyH7urTMEjy5ELNGiZd9zHoG/zJnRgPwTjuW
+-yguvjVGJwI1IvmODuA7Xc7iHFlvGNuxXZjPkS2UCgYA0nFxoIdvbTsaXLl/7rAow
+-xixOGY+GBvil0HYwZcSxrtpeRjXRRZDtqOuTLKeRaqdFLD6fV5AaH9EsSn4STQdk
+-n+XwuVf61M2FTVeRJi9IH3UUM06zsLAGDYqmDJt+5JMmzVnNYnaTe6FazbEjXy9x
+-8oNd3IDdXOQGNomc4cT+rwKBgBbABOr25Wp7cJGK1XrdO/c/69DQNYLMujbVLeqt
+-enCCFz0uaoGNFVcAHutqpsZyToYvha49KxVc9Y1cirfPOX58i+7nAAgk7Lm8kC9x
+-Tcj2Fr8PqiA1YlVMIi8uoGi1Ch1XXwnFQxgMYcKPPPeXQ+L8bxJFKwcltnm8/h3A
+-ofXlAn9AW6fYZLSzOfNQTMnuukhuAtZcEW9NlJHbej305zK89J66S8wroQs5iOla
+-5GG+S4YaZh5sVGw+mnS+FCw7cQCUk40kXwX3yTrxlX1qGSCFCQnFdJow+5NVg4D+
+-dzDKzniH71OZZFxTqiiz76XxiaW/rS1uOfP/WSVR9NBLpV5n
+------END RSA PRIVATE KEY-----
++-----BEGIN PRIVATE KEY-----
++MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCb/Um3NkEmx1p2
++Y5OeSX3jnTxlLJijnE/zewtP9JjkKuLVApoWu57aQaCCXVAQ4TEGsht0B67kF+2q
++ILTsfIaC6C1GjSoMcxGdDi2w0THNjPr0w6QUTiExiNSj70LbYZUuKHKir6gQs3uu
++jfS7n8wI7utQsinQd6QspD64A1VUnH7GdbdswmytEhdnH2QHSMgi6Bi3kPefzS90
++iMdAl/YFOOwFZgZEkPixMSUYW1EiIPqbim6idF1SC0dQdns4IpNjmxTQ9IbEVEuL
++/KSpyA89B10dgJ3kxEmPmrY2883pRgNsx/OqeLS4ND2p0OMePoKZEIc0q+Qpot0F
+++F2oUq5lAgMBAAECggEADwzB9vY6FPa46KE01dm7VqGN+SjzVR24rQIbFkzAD4t/
++tRN6MGVLrz0TsmA0YFyJsV6vvWMcYY9Zc8eSDRr6k1i5PYxTGT5k3aVHjT6xsmY+
++tCzIANmE5FWSRnrIFYh1ry1h2gZejbXzYeT6TrvdIKOEepWl6SIR6eiy0Ggp7G7C
++SjlpT96ZtdE2RnlvcxcACtwhe3vPbkLmTCOEqeZ6LHCHIHiK4KdJgJ08OjU7Kgsr
+++vmnwTJsH5s0b5IIznfWajO4JNOpqjzFDjDctGYBwp5xF4zu3u4bKe9aleM0q/jl
++ZkibxLsFAh3Xkh89nxr3E6oBLm0F8r8M7PK5wpMShQKBgQDAipf6T6XUY+ugkKw+
++301LyoAch6WV9oT6uOJsAttmcUpUr6NXhRT3OM4oqyYsAc5JW2wbz+n6lED3j6Ez
++QEKSIFrYpjrYr9D7hqvISI9JT0PhVSPXECfifEyIR9xmLvV9WQq7NRCJMi26X9ab
++Grqpw1HNlPA/rdcc/dY0p25DlwKBgQDPZqxSnwnTa6X+r0UdR8l6kc9VuESotpbE
++0ziF222bpXmZ2GKiEU1buFORHih/e3yDvKvq+p2apyUKnEEVQg/TL8/Jzya7fEOI
++lTXcNQ/f78ef+nwEAxdRVQkWXFWHvvKUHm1rGCIY7zeOLnQ9JjBQkgG8zhUamAP1
++owLBBTstYwKBgQC+yNX9Du0HvpbdfF1g0025OwekvXiDV0m/UnHxiwcxxDJeJceZ
++0mHK8nu9apGha4ynvbIrAOMdC8gwRh76NMOCHhNGt7h5vAU9Jt2S0OtCPgvJ/N5N
++nVGYJ4iCRYqLqh5QvWlXxSYEfDc5hPuWp26tBsBJEDrbLnuH27JkbD9jMwKBgQCM
++f1VFMw+I9WehvEHpr/PA4H2/5/A7ClXgR+YGZ7s8sUBLA9btSyNIevnBWNi+Y3za
++ETm1GMkjNw9UvL0qFXJ68eylHXtzjp6BK/MslZWHcfudWCYi4aUuJ5jcWPhn2Oaj
++iGk/Hz4Z/hN4cee0dOZN7lrW+BQ7y7cC88at00lfWQKBgQC7YeW02aUPw9jMJh1x
++lDfBh+E5sdRwRQIvh3BuyTd+m/LI+3b9RSy+LIL2KFJucwKm9zR9fy33tHF2S5En
++Q+inhyXfOEygal5Rzxe3Pfx+pGZbzr6IXkhquHtjuFBwJJCrSeR66V2xDmzJfCj4
++TY+CzwOJ/EltH4ZjPwEmE0S7+w==
++-----END PRIVATE KEY-----
+diff --git a/src/tests/pkinit-certs/user-enc.p12 b/src/tests/pkinit-certs/user-enc.p12
+index 1cc3aa3da67160fd9298b9e2d624a80c5225245b..69780bf82d1452d5dcac91e5be550f5eee876583 100644
+GIT binary patch
+delta 2892
+zcmV-S3$yf%7U&itFoFwY0s#Xsf(sf32`Yw2hW8Bt2LYgh3kw8-3kNWQ3j>iNJAYJI
+zdvzN7hNA)k2mpYB1u&JU7+xCwe0Kqqz8d_+6eNN5bCxnq;S}(P;s|YSOhpyniUDCM
+z$(1g#xF>v`h_!Z%^c0Yt!ew3_&P4(J0{#(<etH>9L7ePjfyd?bB;_QXFR7CVbnjKE
+zff_LH>L^0?(6j~#3lev>bjhWkNPqvbKN_||)xXx>C4@AfTFlZU&lEHPKi4d4nj{f+
+zP!qS+8ibCntvC-FbX2Bh1;e5rJ^2HAbUA`MID37ixE)(i7Ff}3>6U!A7&UF;M}TrV
+zs}FygKNP+*;c1FU9mKlF^p}|GEw>3l&8?f;h5;kVci=EJL){2P?KXfBQh!XdFp%kd
+z*Ocb%wx_0U2R5IZ6yZz5d98E>a-~6_Nzx7S^X30+Efi5p^xb?~9+l&zoMeqIyzty9
+zzsz@?=R*_{cx2I*TK8_AuFLy??NA&|dO~=b>}Z8gy-$;V6$A;>=0#FrJ9Jh^u8)2W
+zt?+r<V+wu-wnBmreY0eyPk-vN@Qx;9=@VxI@lWe;Aoeib<)H;5DG=s0euJL+Vhp2;
+z>I1Fh%@eL0#j)BLG)A3wR#E)w3fN%6wZm#@DhR=+YxKGK(9yT*!=-Ns++Ssg0N3T2
+zKq%m4iv@P~LQo^`Mo(vF<$H-+DTiQc__AMQ#@XpYeg-&|lK+0f`+xn?YDUnk!*m-S
+z;3?iZQ;n6bCF)Qt5(ITP`w+u&Ly;u}uQ1cMO&(bc!cfKO(a7W1_to~F^2+x*NgW)a
+zRgZ@G)H!U6`FfcAt1chDfZQqj=#<ngKv9*^d*hnNKev2_Dk2IL4dQwM8%_Sep^kyz
+zY<{^!sbs>Y%;epbIDezJsIK-L+yD*p{<_X+yO+c(edMB^wL)S(YO~>7lcBt24a8iz
+z>BqxgH5kvEzcWp$^y<Ik{vm(^^18n|IHb(t?HW|}Dz0Qr&qg=>>%zfu0v_^AWYG<q
+z+bRNxYQA)<?ZfRHol7Hb<w_k+1xrMgW^F=dxFa3R$8$rHFMrnTr1R+da)w3M^=}T1
+zyOqTh$!Gk+1uM=bLyA{ZM!c}?NVW<T1z#<vN9#&g*R7PrI_dtIb2(i@?|02z$wLhr
+z_A$@;fpNRPkbF>6ydYCMdBu*~jpcY$>CJvKJs_U)yy}@2<g90$!n6+9{=1tpTLCIk
+z!Aov~rOf^k$bV9Lh6PNGC7^0KGVU6{+BPy<yUx^GG?im&JW8@&e@;-l(~F@%Z?*#&
+z3-=#+Y1z1+`!sHuwk$3P@J#v7h8!?O)psh)h`K5?-VMWSzp4~Hct~FSU&`9Qi1>d4
+zseJR~7;BP{vz-tmn*ed*fv=l$4IYo;0VNXLW0o&Q!hbzT8q!Cnf0=w_#lXRiI)uQh
+zV%mHI&J^p_;AT_-H)BKz?DO2vN05+sYJzW4{Ma%7L9plT_fE45Nv3yqwF;+zhVQTO
+zpOQc^lLD9bh12?4t8>L1*vVNL%HEQGQ^g7Iqzw08Z-Z}ai+*rY33XP<cCi&JG9KT)
+z7pc$oAb;f2io=^>O~LIe+^&!Lx#pTd1JNYDu^}<Ot6`90<aW6HG+cMw5cL8R)_Oc3
+z<HT#1aTl~dRQg?UpoXy%c;(g~VPjPk;*7WTk!d9P7(}X$a!xB1o_fMOy;5aP&n)W`
+ziU@4aC?o=dZT7~<oeIz<WF;smX<-9N7q=b#$A5mR<mpGzlmz#fpT=EM!aj0>EZyH0
+z$TBU>AwxbT4nFscHMfohn3#mbtq1>m!CLz7(PkxiHtbu7bgqiuh(zg{?jAs}eZzI%
+zFoFey1_>&LNQU<f0S5t~f(3O1f(3Cff(30bf(2;?3o3?4hW8Bt3<?1Ppn?T4FoFdw
+zFn?DD2`Yw2hW8Bt1r0DtFewHJDuzgg_YDCB3@{u72$k)hX{67MkOBe-05A*&2r7n1
+zhW8Bu2?YQ!9R>+thDZTr0|Wso1Q7OWhVDa0j>1F2`SnsQsFehQ1kfy2Q!4<v1-<52
+zsQ)^m6J`Y4)G);M%p!(nL1cF?tvr$_&3~eFybh+j^dK%K)Ss!=kU}Dh#>pK76IBl`
+z;zFNdALdBbb<1BjS7BgZ(Uvwb_x)%e2gv`eSYyFYtolD-;4XL1$)~RR)=d7Pt9XT2
+z;H%o^nkJ=d$#!Bj@GdAIKg$I2neN|tFeWg{;Q5)7zZpSn;T1olS+KVY_lBjjwSTe)
+zb)VtP1PSkBMrT6Ioku_4UD?1eYXo!w@)n$E=yr0DHeN_iT)WQ6>M^o-i+u>O9PoIg
+zAGit!#=pHqe(^&@p}lf=ph>TGzR7daU+;xp<eRRK(MoBkuke*SThow~)IQJm%Pdbt
+z@T;pCHltXk2ox$_PVekrkgKxH^?zQoiiI!`C;~kR9-L%szRd?QD%qcs9_D0Qnju|f
+zg7}ENOp`kAo^_8;IU4x$vDV_T-qu!Rvg=W&ttV|aIZ1x6HSG-&kZ^m`)S=jhAHNfX
+z&LQATQ4?qt?VFt9{Cje!G6_>%fM56%$^@8^LiN>2W8{#gG*mrwrQTCXiGT6C0P}9P
+zs|HR1en}U7kxre1`Zf~z=zusxmp&0{@$79lWY4|Pg;*&g_Oe+p8NJOzK_L!6qxHN1
+z?Wo5%?qF-5mPXn6j1@^xU2U4-hu3KNU$R*4M1)ga?HW~OZ>B1>f>cal_H>l{EfY<U
+zi2SD9opqb0(UAF4Wwl0t-+$5_!a0^!$jV4a%2qgocrdWJBi;#W9jGt3jT16Fm%H2J
+z{TiklIgd5KE!$M&pUdvIx+zix8{Z`?3_(QRU^>i(x*>vJWha%>%~F<{Y3;G~g=5W0
+zNP;AzGh~ceJN%XEcgTUHj%>^4C#ZxH?6p$Mqsj%0UB(oLJ@l>MUVqg|)dT=|$YBt(
+zu2-yM-d8h1I*-*B1twRw?8)`M&%5?ZL)4|XXI)mEAX@=CT2zIQ?xLXZbZ=q$w|RNc
+zZ>3Z*V+x9d8*W<~L~B*X-R_HY{J-_qK&HaBE?`9LaGp#ZD$Om(@(Ey?#+yaX<RTF{
+zYDUpBP-cZ(7S9OUzJJrZDA#O5De-@z5_n=No&X=59FkrNI-mi$G5R(tmfkEK)~(=a
+z@V#>4a>b#%;z-;9V$w~Zhztczb-lw^6M1A3tw?M@RWNlUS#ne~ROieMk?E65E{^AK
+z7h#?hzu<-)YhJC=Yew$y%NLL*@kQxtPEqNegvafKM+CXxV1H3%kxZd0Z?KMjenWP2
+zDEQZC;eP=48N|TQyell~0OIZYWa1A0K=#U@plX6Lw4tVn=FBwtcl==!VhSZ>7a#GL
+zeLF|Y>4kb43XBgD=c(8lo0cmG5qOT1mNt)#aYl&g8eo(_C@x%x=Z0?)2V4r^U|~%j
+zwef5hK?t&1Cx5gs-#K!O$Fo6@oZR^_4{Us<zaz+0;<qGCcS{I^BfZa+<au3XYfj>I
+z_6exMhy7&>jRUy#zp9Kzw!Qn~s3Tj;OJ%7vk6=QC$ObT%xXiHLaQjioZwiaA<0ClW
+zwggOa)Wf1n<?N=Gkju*DxEqrH^ZHvu@4kV5P>mF08GoHj59|z3`)c&@iDicIM+kgJ
+zRISnBfo4M)P>kfKHzfzj!^f^60#?=KX|!FK2seV>)(=(-F(oh~1_>&LNQU<f0SOf`
+z76cSL%Ns8SY|*L*)~J|09VYrg#ub4uK`=2e4F(BdhDZTr0|WvA1povfAjpr#ert_-
+qvC0|KI3e63dyLWK@o}dvl<LW4m(<rc`UD73ZQ*{cf)PIg0tf)cL~wHe
+
+delta 2800
+zcmV<M3J>+@7L67nFoFvS0s#Xsf(p+D2`Yw2hW8Bt2LYgh3cv({3cN6a3b>IXJAYaW
+zkCdOgiwFV&2mpYB1u!3O<&^}aGBO*zs#A~w5-^3s&_cc&jq;YL57~y$hvIsVoE;K_
+z@z;j^#4S|l0+R+;ItHJprmPBs9a_CK@fJSNtw`GPWz{liz<J!1ehSY>2|+I@@I=qN
+zd*k07Kk-OlQ37X@O=rz$K8j9)sDGPk-J>07oO@p^2gA5p`z<R!9#~pZ1RFJL8vqdD
+z)1wIgXj0*l&_pbC$NaG6L1>!5za|7wrxe^F4OVF>Xh1Hq{RgYQb-)_;_0(RzORrqP
+zH-6>9rCa#pY~43l3lM}D^Of?GJR5SgvoXe*9$n}6%d~(8ikvS`(#B<(zkf$~%Lonm
+zNfw1+O)XYi?faC|BPm2d9_|?t7S{=Ai6*tpKfHTW$n&0tGKGpq#c70A92fv&u=zpl
+zndE=f^VVig+2W8a6z{qV5}E0L^?@yQ(w=_afPb8CzW<$heOh7oL&Bp!JVA(4`j!s%
+zx?fmOzd<+D;8wY*a3Q5ymw&$?>x3h&8^CM`GvEb?bI<46b@_<m2l)Pr45eI#%dA;M
+zz!o(or!@Tn3XWc+@kR!8OJK_iy|JnOg9G34f@+_yJo{z0A*Y{6!1n6CwqXl=M5D6d
+zIy=L(*VGxbMJ)KcRY%+*q?6(f!U%EJ3x~QUu`_yU)Z?EV0+cg<#(xfYa2G9afoFDR
+zxw9bYmTlc&PQ8G0(YQadEJ261nLR%b^&zAsV-XP|3q&`v@7xLflCi+!ncc|RTi73K
+zuH1!v&}DTI<=o6oP#J`cKkE=T&@Y4%R5u-=(z8C+vHQgW;ZG!Jl>&FrCy5mUzL7?O
+z75ZMcP~PA0fwL>T(tjNAt}i#t^{zcGAz$K1>g*LjbfwlZDxSI=f3@WTNBRvsniHoJ
+zrf`Aw?(*vKOp;T9&*{>E?K{SpwH17yQf5N|SCfKDNiq!E!Kg0z0xGTa87-U-d{!(c
+zOck-NH6ki*cGdv_BJYIDt1zG2GRSfp(v|3ukshay-y5XaAb(9oViC?Tq3k5i`Feri
+zttHdosBb8hps5^^GXj>(m2-YD;2H7o=p>1+rtl&MShE!M2?ed!cM9FV+zrx08{dcg
+z$P_4=1NVpARU=pkQzG@(0n8E$!qClc>?KM@^_=a-tr@90VCRgJK0TybnLc+Qssc&Z
+zXfn=HIBPvYFn<LXwl{}WXTBHvZ(1IJm2=Tx-*V&Ln;>0)M_`f4e;hA?uo%xSz0OeW
+zNFM_sq}piLP@uBVmRVni#!=stFR|Ks&x8Q}?A;OK`2ejw&Tj(Xhx_g=L!>2WVRs-z
+zGh6W&y&1fnPPNbM)lHyo;rWG^)bHE>E<DPztjEZmFn@trPVOC_K%z+$c*I7>{|PL^
+zqx$n%KM`zvAgWp^r!U~!wxypufmE8|);fuwpKp5XXz~8Je^dV<O^K0B`}v+UL^1NJ
+zsWg6AYq`WFIYm0s5JFSjdLh%ubE86KD9*XRrYXL@X)y;nh(OQ))7C*wMc_iLP4PyI
+zSV+{NeSb_oqr}A`gddd2%!O}u6lf0wv9qV@QsWS^1NEoTt0OT;pTlNPjy34!vqxJT
+zgxtwuc^`tAX=9yNtaiP|_92hyH;8B-$jNTVsek7pmE$68FM<=;nho~F=m_Ge|MWd5
+zsj?u<CvrHtmiv`W8@LYnN*b7ETC##%bYQm(e}AG&G^j;PIPAc_%}$a+j3D}~R>JD=
+zOMjqU-55=b#50HSV6Y3_+?CRuZf!2M)0P$P%bi%ACPtPF;+gqmM41S)bV{HH*6?l7
+zFoFd+1_>&LNQU<f0S5t~f(0rBf(0fpf(0Tlf(0H13o3?4hW8Bt3<?1Ppn?SEFoFc)
+zFn=5d3Mz(3hW8Bt3;_c$4g?6&=gE6qs{eZe0tf&Ef&{=dK-!Oe7<3snaGs)~4odWq
+zqtt7JVYy`^KLOy?8nBo}1B-nG$J5@jkyA_0j=-{cW1Fuyn_*p%j%W9fiAL*2&3Zz7
+zgBLaGySs_I7fcbR$awyRft5yupoYeR8h;F=@qK%z2Wy;((y7*{q{`3Avh-bIyn3qQ
+zm;(i}O;W`<OpgCY<_|vDj@Nj4FobyM)XH4X4TT7FF%6Z|M&~=hkRu};C8@K3UkGiY
+z6VUiP5+^|Dq5@UWTBk~E>?#%Ea+EPCb^EOHXH_=gdD)Xp+~Q2LY<dGM19NS9g@3qy
+z1RJ_xdwYxcllaTk+oV|nlLSd;#BI|#+~_u5ERIolN*w8@)87P<VxsHSsVa@ISF<#c
+zvMYx>2kYjfS}$1nj95o?56!tflz0;}d?$ieK^6&}s%L3Jl^~}=VgTY4GhW%*_#a|;
+zj@K33^y<y6?aJsE?QPOt=xu2(*nd2gjpz&%dK^{%Bf4(WK4E6bras%(RQ1M;*YTNW
+zaZeN)w-g-n@d{^WF`f2+U$TO+J9|)q;+b|1bYso<YpzkFicc&4D|#x1bOW6K3l>1^
+z<Tit&G^v;XJrXDM74zG#EmYfFh^)e+AcJ7Pm2?!|u7y%#8I0TM;6R(gBYy-VQ_`DB
+zHZ?aqgMTbmk<4gL82cG4a&ZL4fGH=KRyhU>K#A=G{dRZu_!rdMFb6QVMS(Ip`>W|<
+z4z!ekC+@j>Qjlx8(qW-9zHdj|;^B76#Ng{%EWjRq(IuJ6<)&awN4K+UwwNJ;UgX}E
+zcaJ_73k>u#l9eP;Li?1Szkl)Oo#2|EAHYvAy25&G%=FCq2i{a!yl36`>q*b8T+*;s
+zGejdSSpV~R13c(;mCzMMN6iU9ob!=eBh3r+awrj_y=yEp3JoOQx6Z$xK1o|4KRZDM
+zQBnXVwZ>=c$&42g?R^ZF45)g&{)y-{_@gyo?dqxX9ErtT{JxI*8-G*_P}pLrW-1E$
+zHaN5nvDs*jbx_bgcL_D@$4QnDKIv6ws`(`gn9V-+tiyc<cs>OjA@wP5X_WY$OELGX
+z5KUX5YQ@_olJG;^oZ2yRmCnEb1D`a+vxyqG-vy~yGiouy808|&S{<NS;wE7uzHR-J
+z`P7(Uh-6_09AwTpwSOahZdwq=4=C=ja!3eMEInJZ6EV96n5inU$0hq>7?MV?BdI~5
+z$r$t9jm4bXD^b)>rkVn3#X)v{8>DuBwKbv=IxjOWC+r+8lMwH&{W6*4g#n;<AG>A;
+zO4M7AXKtNumgi-Bj**jJ?fCr5H|=aBrlV9HN^WPkhM=+(yMNVi^GonVr&qU7AC9>b
+z49|BZN0T}tH2DM}@daN982O;;XiJbw%m1(>&0zStXTCHiqL~wKB?P27Kz?h){H&yT
+z0a6!f5zd}BisU?Bf9`(d956SlCT>3gvm?yLE<M&zQnc~-4<?YScrT1~;H4ncanYDd
+zhLiHS;2<{;D1W6>EgOHleI(q&4=!s~U)JFb`+L~}IiD*+*g0&iUOsbSGYgzb>NdTp
+zqqUpm?qjji{*LRy^gF1p#_?VHi4*L7pt_M9egYpb2L19^P%~?_Q6MTIso>1niUlBz
+z<PQ#y2Dc5=BM)Z5F(oh~1_>&LNQU<f0SOf`76cT=L`9(EsQ>XqJJ21=NG&!mOU3kJ
+zFflM8FbM_)D-Ht!8U+9Z6sQzP_9i;N@>ZIW53D_<h1>e+>;wo&%Za_$K5C!>0tf)<
+Cv^tIe
+
+diff --git a/src/tests/pkinit-certs/user-upn.p12 b/src/tests/pkinit-certs/user-upn.p12
+index bf47384a8a654fa77d9d9161c801292292ccf4ab..e91cc8a0c04869d6cf9d66f5b1b051e9f3f6ac58 100644
+GIT binary patch
+delta 2884
+zcmV-K3%m4%7T^{lFoFwQ0s#Xsf(sG`2`Yw2hW8Bt2LYgh3j+j#3jZ*I3j2{FJAXS!
+z*@zwch1miE2mpYB1t^994w-1MgeIP0Shaj_WdPD*<`ao4RB4%B;<L_U5J0ERoT_ec
+za!&`=yJ<obqC_)Et`+A7I#Z9tNpSoG49+@MGe#3%s_-uy{Y0a4NKV?|o|z_B6PqA+
+z4T-q&l^op;D)by;0e^YC@<YD-;(v{{P7F*td<A;(>1!qUi4&p(CDJ;S)D+_sG5VV~
+zQ$)uegg-)nY>J@=`X=55yd*|FF1h2T?_^$o;jzHLsjhabCH_1ucm<4^|1)>iEPp)l
+zr`fWM_jd&6^poG?mz%Xq#a40WKPFn(tA{`_dWfKHg0-O<52jv5Q93&va(_@T3CUj<
+z0WY&G7%<~VqQ@)3_!$**I?b)=vizO@^WQRD>b+MudQ}{)4vvgomus3Di-i09fLtc+
+z-@6;hAFAv$JCwV0#Qwkzw4gup&uc9{IQXP*mmZ3|aHIBk1EhHL{5PG-IM}|iqFq*#
+zTzie!)o?eYrcWJV8pynY)qg1cN-hb-i$7d|Xg&|At@X!`uGqu$VvXYj(63TzYiT*e
+zzW?uzBT%#jm7P0PLD3XAQq9F4uLwUsBh?d!2y?u4^5CNAf!qRUU$VQVyK#iF_TP~B
+z#onH-o7tzcO6Q^v7GcM`(gz_*e5VOL8@m5}KSnn=rP`yTs7AlY-G5#76XN2TW%<;|
+zGoyMDsL9-cF4Xpe-W5T+Uth$S-ql98cUnVq>Fu!0m}q&99V|Vo@OB-Jqh;JGF3lTl
+zvmeBJsI*#7V2pY%RTS&g!XUO!Vv>U!_Gxc&XQxd)6Vl|xvPV*NZcZ|!>8=+@_J^zd
+z9wjwHLS)!-9u#h@0DrRg5ix4vy>8NYpgnyo-c>t$;4lh^dK4cFHi5Db5SD*&_r}nE
+zb@WLfb~v1}6lu6hAY|QXKAGFH_e#O)?iYYb%+{9Gb~n3Lw910jG8+H1C+Si~eJNkt
+zy{Cn@nO?tKx*Jc2CypM;3C5Z)4>l}6nPzpM+EoUGx1|H;+JBOrINg(y!@Qtu+=tKH
+zmuO}7joP%Ttf`54n~u$-R@L^0b?dmZ8^S3-NKF-!Xh*$WxmaR*5M;R&u#Fl$H2hD{
+zwIM{B+CWT%(V?I^>Xtm<H|44jq8m@muR4ZZf)&!JtG#!yUmnYOl~5AU*pkCZXr*pY
+zcm|ip$pa}aLVpLqas1j8oZMczvwY8TVlxRfhMY<v&9(wg2=o}uXeGK{nGlF<e*$ZO
+z=@WmV@xtJ$MOIc|=M84tq}Kak5CR~9u9-4KTJWF4WpINir{T;8cDioD2-=Whg3uo0
+zS++hjWZ0=9_imeWvL56X_NUN6H~>qmeR>KDCIFN<A%8ffJ+SSz_Zo%u-(JCMlPE;P
+zZiuOt`)KY0Sre)4rX4!-hiYLTR`5pcLy39_WKeG%cryQP93X%>HWpyaa|`t$5m}*g
+zK>&|Ey{Z|rxBD#9Abq+Up(9cq2#O?&<zP+4XT#UV)^yBQIo0kk3=DZ@1kc47@|xh4
+z2k-1p%YXZ;W)Q(G2DKQjpC7UBg%jbPQy3m`So<yhGb~c-AJdSZ-SlH+O>gp~B8mu@
+zAhNB4+O5c#8OB5Wub0v^<EVCj#ik0THtD4Qe#V27NbV>LYpy+YvD>1~DmyCA^7g%D
+zFAAxaq1oCJ*#e;kqPUvQB?{$)UCWtFos<i9=6}p;LTmx8jh@Jah&`q*GHv_(y@SpL
+zTT&t&)Ure3#jx>&tE6ngi`#J(zz5BT3#jp;8k^KwF}Mx&M%q=hNf(NuFoFey1_>&L
+zNQU<f0S5t~f(3O1f(3Cff(30bf(2;?3o3?4hW8Bt3<?1Ppn?T4FoFdwFjoc%Duzgg
+z_kRrm1r0DtFewHJDuzgg_YDCB3@{u72-vC7Ai~I(V*&yQ05A*&2r7n1hW8Bu2?YQ!
+z9R>+thDZTr0|Wso1Q5U)0W`6LNiYv(7JIIJGrI(W1klCz!q3{|#X5KUyo}{Ke$8*4
+z&z8gsBnxa}BkX@Nu7*?GShxRsy(nf4M1NX$7U7f*_v;_v8QmAi1RA=90>Q6mk>K0H
+z#oV_k5pRI;GVQ3j<_i&6FF@?OiYbr0)nN~B0s-eZp5E>oV_kZd6{)+kM5N6N?Ld3H
+z)wfb0M94{)uRKzoHZUlqQQ{`<fpb7YG9-i_j70sW%E72M$v<>;zEjVeTbOk-Mt}G&
+z!k=6|Mjv480NzyfPdJIgH0@|a0zl$H><vLIlG0q~^KKJ>5Af0Dne8-zz4}2lHd!s3
+zxSf>)2GJi2L?K|q`h_O#om>P@(Vb=sW3vWx9xU|<wd2K<AwtVt#N_)wJvytTY;Izr
+zHmCq;Y2j`osmr@nN|{pul$qCUIDb89{{+Fq0~3p&2V(rx?0qWKyH;x_jmak>H8mxx
+z6`(10w19d!;Gs`p2)_<o|4pX6qTlA@HDl~52KaCtc}#9GIT>6Hl$RK`TEV!p)VPK!
+zaxWY{)O03zer|)d_jRj(krvwkkSyN(Nh-WRmF#Qp>Jy!6>^RCj-Npj)j(_z>y@QU-
+z@ZL#n!*Zsb&e&}8Rg@SJl5p|B7l(u1YJ(<UTa`_0da*t+R8qtg+4-2aIUrD`24~1;
+z&1#D?R%d5ZFR1;&NDxK}#>3tl-#D_t_yL08PNf15V2}X)#%GD2*o9PK3%fNCJ*_+=
+z%xwkK;lE=s`le+~$?pnn34dok-|t4dj=d{~HrZq*Li94h5LRg+?=$WT*{8sh(pWO;
+zx4S(^BW~+)O`Mt*c>{9;je)afv!lqC@}XAxj=mGhXt4NR2R;a7!SOWb$nSJCjeA_^
+z8`)x3k+zM~B(Pl+i3OFdw$_7b0uOA@8<-%=1$m2$wl7Ili8G<kbbnD2WT;Dpe*&XS
+z-OCc*0@ZYH{A|)5eDaN#m}wtGk8W*$&_Sy!tr{a?pfGih)Ko#gfef{uPJV8oYOGRf
+zM?h9e6lAVPM^C*a!u+M)D!c(pYMj+}i}097lcFg1nqa&LD8W~e?b(hFTJptkEt7v&
+zkm2|QU{Y({rwE=<o`3&doqY<(-MD)r66C<bt4)B;xr8)j33Wb&dFOB`KPbQl-Pi0m
+zM(3=%<irOFe2Fck`uUrt&ybehG)uv*ii_JarycTq?Ae+E=iryPOri)_^k<@Fi7X}@
+zK`OC@*{{wm(@JDydF1?7{vep;(94T?8A^(L)N$|qztT$*R(}!RkUWDNV<`-!T3J$j
+zUq#LAYZa33eTjcVpCRkK#EIUs1J6o!4f;O_MvUt8pTh`okhx4Tk1{j=P1>~0T{II*
+z)Mkvjg@<s8o7fqj*}&su#~`<DZ)Ok>Tuz5BIgMk9$ViI62{JqE>~?qz!0*3CZk477
+zouHyH@yBwvdw;FKYYH>yE~}|^QYs(;?8`w5)-WxH@SgoCFK<STdj}Lv6V+pF|B`Z<
+z5?t1VE~bj4XMj-JUI|w>DpSStZV*Oll+`gp<r4y;*;i!u)xoS`{JMW{p4*C^2Bj`D
+zeqM$&do{xSQK(hvDEVev!0&RC0r9;lzciQ|{U{f4oPR_6N8~4b8?lrXcE@<N=qoWb
+z-7462hBI8Q%lAt<$|~&{+o&9)do)Di4wbdKF(oh~1_>&LNQU<f0SOf`76cS?M=g#v
+zjJlE|lG!%}B{8krGU%)@K`=2e4F(BdhDZTr0|WvA1povf*(Tf#z@Uh)XWbN&5_h`5
+ig)=D^#u<@mI4Do1^rU5qBm@XcPZ|kX8BGrY0tf(JWK==`
+
+delta 2792
+zcmV<E3K#X@7KIifFoFvK0s#Xsf(pk52`Yw2hW8Bt2LYgh3b+J<3bZhS3b2tPJAeI2
+zXvsfvbx;BV2mpYB1t><5RG#b4BEJ^04G$AzyQk*SVS?I1uWrC}u~MGWb!KEd3HOLs
+z1vIdCmj9fXy&snurXzgb$5TcD!>K45?spJD`)LcPDS6?a;V`RNpkjf`EoBh??RTlK
+zh#hCXlH;295z7xk!RW`#2Q)Ldjem0>WbPylh7u9DMA``T!d19RnS;bk#uauLlP^WH
+zKr2J}sUw8JM}#iNO|VH<?#^LHcy5b(n=s$}hnK-PZiqD`B+RAoC84U4xT^?t8Gz&>
+zR4xW^b$*AM-mS+(-PO-kX_m@{K<)}Cx}IT^la`VVIVrkTV5%o6Ay#2R8Gm&i@n79z
+zMbt?rY=qLv@A2$}MWsJj7#)`LB6Fc>iB5mgaDRksov6|o?YhvA=5QPUwqt8gPxXm@
+zR_v)ai(Uik*bb`DQSA(I#xt|$#v~V3ot*8sDww1rNSiodn=fVmod!NYECS3>?B`l4
+zC9_gt>z615h!;`Y)47ErO@DLZp?MNZ_5Ff_svYCM@Z87f#e9llSG=s7vqkKA{x@24
+zAVHwi<bmTZ_R!?6VfPoc4=A^9Kvc))U6wyo^U*}k_TI1;w4cAGei&~-$LMA%V<pm=
+zTN}i1x!0KKY>9Lk{D(6=eEA%KS{p?QMBW;vLeF4d(a+;9T5J>N-hUruMt&Th(NZX;
+zg;H3BzJdyILh*xPTJA$FnWa>4#A|v2o(ajRc^g2K@{+AKE$`~-#P(nh!v**PJe7C3
+z5_&Y5eczza5Qm@ocj@WYs%2J6H1Isdq_%)2l)_`knW#8;tT=){0p6u<A}*TkT#Va4
+zlF8Mbh3%{Qvo2;*gMV)EmvCRX##p`cFYDHbmyX+H*{cCJwm+_U>FqfI#J^T298IsQ
+z>I$oO)gY?L%QiQOULxj$9;TxW2Y=Wjja17-rN}yw#1v{vNuhG1XVYTnq3NV0hn?>i
+zO}u9T7vs~SBvUb<YW!iy!b0c_dQ0oPkdDm<9|~&L#K89lJb!?1syip+fM?Mp?L4%^
+z|E`tD(uClz{{F!Ozz*fsSn-&cR{Z!kA5<u>7|BD&zbC>M(@O_=3VZdYIA-K57Xq{W
+zgEb$eyZnkRT?lF3gg`Yn;`GqP_vCc{mR^{i!AHxKO^qcyAr#HKLym1G=Weg&=3^|K
+z>rS<<m3BE|8h`N*9*^xvUcr^EuWRysA6(ht4kvWA@`cCPJDl@TY_)~Al}}(#9}SmG
+z)eyAI^^zCMw?#pQ>d`@~O{(9z`ZiTM?@dR*2yj!7Q3+<X*pbmG#WK912D3S_Ilr@y
+zmG@=Qol>L9Y=oJz<V7v)4uXP!S}19=qp(-LN;D_egMUtZis(H9^3NE>%W-V7M76z?
+z?R_NTw?*Y%k(hWGe-P+8Xyu18Tkzz-&8A65YgT>Eu^NU)aO;dKf+zvIh^!8ssUq`v
+zG>S>q@Zu)SaYQJydZt+TmR>5$RB*L2L)*Iql1J@C5{SP9k06@-k=3HjQN5y=Z!6>M
+z#MH3t|9_5JmWH8lzjUZp;8L7rnh;$az|w6Ql{t|{YprFA_j_1tr^r=ZC0<gj?M&<5
+zQIo=-WUiIy14{)*_PyH;Xqzzf(dS_aJE&Bhd>*U&Vlo(SJ1cWrAPSUH^wc|vrE)kR
+z?cXa(1TcEN!ANk0%zj|K^A`j$w&^r-JHUqN9e==jAPlP4|2}*i-^~N4H&WVuhuT%A
+z4NMZ<wjP<r(OmCxiEPR~+TGVfy`8}*Js9N1a3NK;&~wIwT0etyHUiLyFoFd+1_>&L
+zNQU<f0S5t~f(0rBf(0fpf(0Tlf(0H13o3?4hW8Bt3<?1Ppn?SEFoFc)FdPO7Duzgg
+z_kRrm3;_c$4g?4){%%$>wUr|R0tf&Ef&{?f0joUStwUh9&a46T=}L4X(YEZ)q{^&|
+zq_O=fhFO=twxQ)i)ictPugP1)@GE?0LfiE&BG71HBSVhv4uLQHv@U5l-RAD{8y8ew
+z$5lp>NU4?E)-f#wzD?C0;y)WCTktzeYkxwzZ6!-?eFHm^IZqD~<*I#5Nm>zFieKX4
+zO`ivDk`gO$>PnSjZ?5Mm(X-u4F30DqM2^|IdlXJ&GbBH20*}-6w#G^`AzC{)_^YHP
+zYZO5Hp=lJ6h_}SZDxfLEq+N}72EF?itd)kRNzkGDZ$6hI%(z6HFW0v0u%S(N#D6-K
+z^~oTy%zj-t7kvAJc2uses017pyZX<;A%Boo`8qmbTi-;1Y+P^ZT$r@+d$}-C_11}k
+zfrtB;5(a*fFE1)5s&uvNSj+0tb8mv+xa%9e2KE^w+Ijx)k2w}!L7tY$fzGi}k&=h<
+zHNO?Z#O9U!sJ_o|ao5U3273fijemRY*`f^vpTa)i2!~LXZU(As)(9D_7Y)|eqjCXJ
+zH8YOtem%7=RzGk|{=Hx6<)X^22cHo>GlVeqnJ4Cx@&=xW$QMPWQH|mS>K3e?{2A4V
+zo*wZS(hJ~<K$e-GVJIZ<B(Sn>bzc-m{j=qs!VdsL@a`-J2_N-Q!cSRq)_?OXZ9Cq+
+z&Ips&2Y!=<xv=h)CyGy6!X#1`Z<q|*zfqgwRt^JgwqV<?;bmt~VHch*X(#&y@w^`G
+z6BiifaLk-kah_3>ahQ?`+ayi9Cs0&Erow>HN1Zgtzvp0=9+&N9_eJYxc1dE89j*Yn
+z)|1D*i0XXN?4up^9FyflGJn%K275);(YWZ@?;KEO!*;z)*ooRISbfMiBQXq+%Ya5T
+zJ}?c3Bl?+2vj^j|HI<phOSsX*=`7)wNNsn-wD=p*inCiMVTsKRNWa42yYE&4xHbhu
+zwKLP?*o$x1wfw6c2RHYH?3Fb~`qgaQ!}!=#ooPP?g|i%d9kI7}GJlDz0|4T#oQrH_
+zOul_A?Ut&He=GnIkt7c(EO%p$uSo>{X2Bd}oimixhfqwh;U8G+h2>f0Q?OZ|!sc5U
+zk@CXsqV9GQB7#ZXO#_4Tn4C|v7<mCT4>d;I#TrGIYR-@TSyxZGTI(6;mbh7%m!`Oh
+zp?ib=*@9t{)p*Q@-+$p6e&>}M9yyg&uxh)h!YB_Wx&J(J9Zt>v*YcD7#86EfZ)P}{
+zCieiXHI$g@Tc?Mr?S&DO7lTDtTLZvS1~(hg>zX6ltsNC&M3bF!r(|O1P}3^VN`zT{
+zj0dB54PR&b<-8RtzF0iRs-tOYOm)n?zi-6OiEbwohaba|vVTXOL+zixO!r@D#@Cex
+zyX_Fl^JboqR&${ijvoYRRO~gCD7Uux+4z?Z4iEO6kyED0K!0J(j;{pWhDVT)5y02p
+z(W*ESKWz=@q+Gl;1SZiKkK*Ha*_1VSL(vd1!nf6TIjp87EpQ5&e%;PYJq4CDW2$Zw
+zs|Uo6aqZ?yK!19mroKn~4oT|Yj&p^PpwjvlPv)oF(oKp%i`YpnX`Xl;*rBO(B|=NC
+zcggoj46fA+7bww@VI%k0<<oC>Cb<dWFSaC0A;^D3DOdVvvatv(<pQgZk1^5vmU6P)
+zpmd2WF(oh~1_>&LNQU<f0SOf`76cS+b%)75c-)cnQav+Cs%|)niRIAGFflM8FbM_)
+uD-Ht!8U+9Z6cq)lQ&S+vLMX?rsW}cLIZhIuCIkq;C9&FW{m^s*0tf(Q%TUAs
+
+diff --git a/src/tests/pkinit-certs/user-upn.pem b/src/tests/pkinit-certs/user-upn.pem
+index 14a11831d7..7dcd716cbb 100644
+--- a/src/tests/pkinit-certs/user-upn.pem
++++ b/src/tests/pkinit-certs/user-upn.pem
+@@ -1,28 +1,28 @@
+ -----BEGIN CERTIFICATE-----
+-MIIExTCCA62gAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
++MIIExTCCA62gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+ FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+ A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+ dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+-b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
++b3RoZXJ3aXNlMB4XDTI0MDIxNTA0NTkwN1oXDTM1MDEyODA0NTkwN1owSjELMAkG
+ A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
+ U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+-CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+-Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+-yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+-QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+-YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+-yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFPQX
+-pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+-uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
++CgKCAQEAm/1JtzZBJsdadmOTnkl94508ZSyYo5xP83sLT/SY5Cri1QKaFrue2kGg
++gl1QEOExBrIbdAeu5BftqiC07HyGgugtRo0qDHMRnQ4tsNExzYz69MOkFE4hMYjU
++o+9C22GVLihyoq+oELN7ro30u5/MCO7rULIp0HekLKQ+uANVVJx+xnW3bMJsrRIX
++Zx9kB0jIIugYt5D3n80vdIjHQJf2BTjsBWYGRJD4sTElGFtRIiD6m4puonRdUgtH
++UHZ7OCKTY5sU0PSGxFRLi/ykqcgPPQddHYCd5MRJj5q2NvPN6UYDbMfzqni0uDQ9
++qdDjHj6CmRCHNKvkKaLdBfhdqFKuZQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFJI/
+++nOV5fnNVxn2GkjkYbZ5D6mqMIHUBgNVHSMEgcwwgcmAFJI/+nOV5fnNVxn2Gkjk
++YbZ5D6mqoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+ ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
+ IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
+ aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
+ BAQDAgPoMAwGA1UdEwEB/wQCMAAwKwYDVR0RBCQwIqAgBgorBgEEAYI3FAIDoBIM
+ EHVzZXJAa3JidGVzdC5jb20wEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0B
+-AQsFAAOCAQEAYTW8tzURX2s8vuDawXEJt2as5q2MnvhUmG0YPIvK4n2fODkMW/I9
+-XENFhK8wwQJNdzvBUwXUXzEGjFcGPs672ZVzykRb7sAfGlNu1f15z0KrjyUj82oz
+-/gWoLwdYwZnO8jqtKjGtnLi2MeWjVCoiUW5ypUGwtEdcyZUG0PeRUrdrZu5cm+iZ
+-1B1exR4lepR1iSAPYTNhp5VF6T8BSLf2BO2IKTgFnF4Xx1vyZZTsY10mruZ8S1ZR
+-XiajBVdHkN1BpWWyFKt1BCt0dpRx9W7CihC3Ln9fBCsY8QA969EjRhszG2i09Xxw
+-0M6/UgIQRU6hy7QTlcmehDKY0zvVJ2/RLw==
++AQsFAAOCAQEAbe5/xDlFplE/h6BSqXSftjyiPgRlmPPkuTwiKHfmHYHv+KXHBDFY
++wuGDu4Tdh/qisskXJGoKYfRsOox6AW3ZTcklkjvVw0V73nPo+98USWYTzKq7NriF
++rJ9skYALu/Yv6q8iEoziOyDG55LppWne5KH0Of5ctikZVthxDnjm/saSR1lNa+8A
++gB6x9uid73qw+seg1/DoOdb+uHGnKBeSUrJC9vtdfodYdeatNFDDNoxqjGPajDNT
++TGI2ace2yZAgD/ic1MzI/s2eTHfzzO+puJIPzLScdy80RYMeILQs9g+x5NhOUuMz
++YMVFE0PAQLshVggtJ9l8fmHmrrJXP9BAWw==
+ -----END CERTIFICATE-----
+diff --git a/src/tests/pkinit-certs/user-upn2.p12 b/src/tests/pkinit-certs/user-upn2.p12
+index 69ca648aab9f1c5ffe34387459d45eb45bb04922..e29ff5412baae7789086283866a5c44bf2419ea3 100644
+GIT binary patch
+delta 2868
+zcmV-43(NHN70?zUFoFwA0s#Xsf(rr$2`Yw2hW8Bt2LYgh3iAYl3hyw23hR*~JAXN}
+zv)@C`|Azts2mpYB1sKm5FE99S3CJ?GZ7q&#p(W5pK0GRZk{WEvpMe~$gEqHJc~+uC
+zF+^`j013Tqb$ISyEK%E+TB|Bp7CI&uh;Fgpf%@mNNgFmv(tez+00y2Z)-V4TA<ys=
+z`dv$#J)$-+K5T-ag3cIi<Tg#Tu74rh4$Tmxy{RTg-}ATBopcR^@VZ~c)Yq$Wd?|8n
+zAgs0Ru}@~hj?1#j=nXQ>ZgIobWQ|@8X)gWKEkQls>5bGm<JD426e;Cd(&j?n5;#Qk
+zrk@vU2F+F^dF}03Hx0S;&VaC~N`polG!Sz^>j`vYHd#Y+?jX9h9+CF}@qc4jy(~E9
+zpC_weF&>28nIZ!*fA{&swafGQ*5rKdRYOSQdo8_GT-n@a>i2Yojm{FE2EOp-w)#9^
+z+aT%9DN95w(w!}IyA{L&Xyz6qPM(ESsd9zoJPs6@lICqC2}?Z4=_`B}1$DpDXlR6Z
+zSTB419!46STDltqpl^sfG=FbYlwneSTp_q?8}f)xbZ9{O9-Wb>tHawa_MLqYC|2J(
+zX)OGzDQLN~OEm}F`&j#osd(ZVMA*NvLxKFU0)G;xk^mpU!-s%mf}lN)*%Ltli!tr9
+zE2P3!^=Y1X$0i=iokHU795Xm8+ZSG3jrI$D6OR#Gi_?zXobn~Dh<^rWm1JEZEg?$5
+z2jamsVE$12jr9St4^>^4sZxh>LgApOHi}EckX77*F=0pDc-U~>y%iu+NFU#)8Rix%
+zj&nnj7M?bw8Alfcj!W)BJm(gb?6>s(XYaUQ_e0D;+psl*K~&|egZI(KmpbQq0wwT9
+zu+AcxvTNZN-+??(+J80aN;}ltl455DT(q0J%D+wlDj+y7L=8bgAq=WQ>L{sB0*YzN
+z^+)0y0b6gxGG?EN6$SD>CA-H2V0K*v!X1fNu4(}Oi)O+bk6x#Iq!&*=9o00PU5=iV
+z9MlzT!gs<O|0G$V+!}x?Q3@gH7l-1IJBLM#pUHZ=6x;aAJb#b*n)|?ReF5Q#OPZbz
+zhZwQxsBmO;KF$1pycbEZhBQ^~3NG&{a03_<kk7o2KpmT&m`fk|BI=*g^m$O&RS~Dd
+zrdHvR?R2kAXMh7}r*`?2Ok1DN%dvIJ5P*REL&||NEg_I&f3a)cDh9G=15;j-rSwMy
+zMfqEJZ@P;iHGju0jD-{008Atdd$4Tubc_X9^a^F9TSd!olKd-UsM8Ugtg;W9c_B6n
+zp&D;lZDHTFow&48O>3Lwxzi2AqC_9Br94g*UekyjX?7ZvMchRD&Y$WAyF$_0r*Rfw
+zziFU*CGJps%QP4;8Fg?z(0J};G!9N(iOJ`lZqJ1!R)6#f9>qS&!Y@bPO-Ok?W#xQW
+zfQA(`0ap?-cEq|o^9&yEt}k?4XkTLsZ#KZVcj^jx#{>xi(zUS;nlI2x9N{&<`LL++
+zcAEvFpE{Y%E#pxg!Od}^K)d-hGcmHExdQLw*v@q5`nes|RvFM|#ilZYbPU4$p^@y}
+z&z#I@bANa=I5gyY{59I)|8d1yw6UzTq9rOIjx8o9I;El`(POGpLu=+>{f#2MwaY_3
+z7^25e>dIDS{ZBt#ai!_n5yXH~^tOBhr_@$CKi44oqzJAHl}~@&t0VqulbPSEcBF;k
+z>2$wH5qqPbKawRqB4j9ttg?JOiH+o9>s|1qzke!$9d*3<Zn#6?h)=0TlU&j>;%M7g
+z29-{jz*kZ+Kcq{SjLN;n4Ber1K4yDXYzWr+FoFey1_>&LNQU<f0S5t~f(3O1f(3Cf
+zf(30bf(2;?3o3?4hW8Bt3<?1Ppn?T4FoFdwFjoc%Duzgg_YDCB4KPYDDFz8DhDe6@
+z4SxXz3@{u72=&k4)C*sWX95BU05A*&2r7n1hW8Bu2?YQ!9R>+thDZTr0|Wso1Q6z?
+zUxJolb~{rn@ALfyA$A0U1kj)Bvt1ZK@Ci6CVTSS$(6{2;mb9_6ogc%2c%FRB0Na)r
+z*%_E<-(<riBCaVc{u#|RCC%%+Gt!08sec;p!pOoa=(-Q>3CfoWq-JeM2LC3qAF09L
+zg{J|A1^Xaq=e<sM$B{g!>pb>O)~!z=%%-`<y6U6{)kS{VJtAHqKryUfQNUktL<5@Z
+zFqo?-`@*#0OB+b~+QK%o<EcP5YJc!m<T`NSk&fDEp4kUmiA+8*jlTwyEaCn3$A7p)
+zq%o$2#uS>yOXl3%PjAvF)FBpL%PQ8wTn<)p=DR)-dB<J~y$LVpUCxcCH35G(wT=J)
+zqG=n>_0il)sdbjsGpBc)#n@$o$#SnZI(Vvx(l2?*rJ%SpcdNjjQlrd=@Beh+$_|6F
+z8@Tz~KUJ!eZqW~?AV$XyLUVIO%YSv(JkC{tT#X%aYc-b9(YI*AI#<KirOg118fc>|
+z@MwIoBm5eV<Kf?<>k#W`oKz6qodHvmIS>8*z%=9UmJ|M-{*v1k`kwThPN|G=ssmY6
+zdlK$V$NK_C^k`Q0!lno85{Vus_qos^`Lp0zfxv(h17en6C*u(a08qe@1AkqVn0)b}
+z_Xt97qce$VS@%W<r7xc^*aPV4`3-!1hszF8)Bs90Uk&Ny0wD6eVPFK&j+;TIhl{F^
+ziJW`&v%*=_1x!{22IH1JYy)m2w0rFDHN}&mIoetHRJT{1RZds9f__Kp-C#rTW4Sqb
+zTNkbxsmu9JSeoQLm-K+>K!5l~<&G+JOPggXM5_*(NH(7lp8{Jpo+{LndeBBFeK|Qn
+z9UGVTdha8uxo_%X9MFciV&krC4;DpRftzbyI!nYxd{sPcCixi!0qFJckW+X*!~7dN
+z#qLCJS{#C^lb%_p>cE3Gff5>B7@+UaH2G|x!e5o5P%R%B6vqemlYj0D+)w-FeI>(*
+z0Z%64=+!6EARd(`dHMu&ZEii^ztJXgr@}do_>hq1`p{HS5F~=?zcN*LufsI<wTu*&
+zKx8%#DG4um-Y~;H^=S9eA@#4w(>udMT_~!-%1k2Z3CDO0m;OS8?o*&w56(0V%Y*=|
+z&6KdgoIuBBWarFK(|-&5b6I2rue5K;BNY@TV|7>-A62B=7|2=;u_KME9kfRGO7R!8
+zk!=M>VYHe3w$voveBEaD`6q1-Cq1zx1)QL{#hAICUqkOdQrii@<%vvEX91z>D9Io3
+z3%c+cI9lYE^hh^AiBrSmRh~J=uQ6BwGHyUW)6{>GMKCjH$A4cY;o4ZsWe1;L-{B`)
+zTrX5nB)#PSQGLx(y_o<iP`$)ITC2863xI|}Ox3WL5D*t~$QMyE4o3^|v*{s%bcS&z
+zwPZFtRxDwO4efS$U5^{yMnEt<NRRs@C1iUV%of0MV<^!2C>sNPd*Bwj48Brqm=*ep
+z7?tQkxb##(<A34NE=Me>ZQ^)93Wc5!#dewm80kEjmklRcG6?}+<?U#hj-_@{RHk5X
+zC-Ds;w>1z!$p^Jk2Oe_JMX8L;k`RGGFE7$_Hv%ZKPxRiZAvez?hfXPXwNwRuE|3@d
+zdj-&lv42j6S5hNDUC;L)_JH0QA@L78%wofg%ep^s#(#TzP%4Z8>ZGBHIXyyhuf+Yi
+zM3xX3mKikVT7r?YF(oh~1_>&LNQU<f0SOf`76cT){n{KF??v1$)!`?L`7h_-s&P>;
+zK`=2e4F(BdhDZTr0|WvA1povfY+(!i_~~rbp^C#yt5i7iN(PLf-J39FdDrAamk=e%
+S1PFt)bqU_LN^6M%0tf&&^grJK
+
+delta 2776
+zcmV;}3Mci@7WEY(FoFv40s#Xsf(o|=2`Yw2hW8Bt2LYgh3aA8v3ZyWC3ZRi9JAWcz
+zf~^6<D9i!^2mpYB1sMDodj3HjylxKOoIx(X)1vYQKP#0MI?mvod<%a5G4uDE_y0@U
+zAqOi}4d$$W8E6aQZ-~SC&{rB10B4^~O=x~hwkA+E8W()U&Fl4bKmM(E)xnTYs*?{V
+zYiyj6i?G_Gzj}qz3dQ2kmj>)AbAJ<VTRDNHM?+4S2hh;vr{_pQ(jzJc6sQ~~X$q4q
+z@Q$+6%KPgeBpxJd+4$~s<%!r!O?*kX=xLbu-)zl@>`;A0$m*A;RX;&9P-0dy)<6ic
+zG=h9$G2!QdbYEt*c?gO$3`@bOmrgFTNbozB-NlAbC*A{yONXB%C_apWVt=m9^0h7*
+z*?3em;(mZ;7{UgE*^=bjWp>G~J#?Y+fR&bKO<P24MmVqR+6)Pkfh_QA$zY4CC|2Qd
+zxp7&LWcN0UTg|x^1hmP{Wr~{%AIRwgxFRBLUWEol33yQFpl}_^3ubE~Ez?AM#<04_
+zWo_mLT{cVJ%FZq}(TPh`KY#oAIWQdIYtP1)cdg;A5!J?8<rD{{2ti6psvxMuMY`-J
+zJLZ>al3mkO%VC^-Ez^Tk8yxwt7m@$;k^;0mt_~ybp!1<G;#mT>yQU@#i`pO1MtTs{
+zHabcX7Ry$2vhmv`Raz3Nzo_aqaaVrklIl$iB97R)5GILb_*Bm3(tkzSOZ)b5IhLV7
+z18HncR{#Q20j`Stv^2^zY5kap#QcGe)b@%+qc}wgP6{)5*#!`fl6PU3Upn+Y_>xI?
+zfsjk#HF2&lV3}zfBU)o)!zbAoc4>XEe{teOdJ`-fdj_FqS(o2cJn=r>OJ5eFGs^UA
+zapCv&3$#-VW8S6m_kSVO^*h@>eY1IxY_S>As<^a_01O26Sx}H}kyWj$Cxaw<tFBBz
+z%0Ns0+hPihN2xUy8K{)05@Qga*bhn1UvII(jukS#xQ%~UvIOY+N@(B-#gT(=*-Id;
+z;f$f<9<CH^o6A6hU(}4LZ9c;&ow^Di3AhQMLlhM$3OF#!3xB&4QXeeP=IYpKk#IJA
+zAhv0UQkecv_eZ^@<gLVLUG#S`3%+eX)js+h(_^Bhq0Unq&f{M=PQz6|J|(pq^?S&x
+z5ghFdpqit=c{-gDZaHFaA71$rz<R2nOb9p2GS@%-&@-(tJJ<WM+nhU%{xhP|6^B?n
+zoAew&!k_!v{eKMX49R7e+k4sc*sX5BzVj0sWk`|~e117&!42uz{ZQ>Scc*|AAAe{9
+zE+JcamabwG8GPkvRP>l1i1{nU9ta}Wl71H(N-t0As?rI_ioj9#*!5o~ENbw6tO5hG
+z$96!&YHs%wueZBZZw~*KH!_B$eD!={Sx&YtHN9{DcYo_^N`ke0kAu4+P79utHa89c
+z)AD9LSXCcQk>ILDAq!Cfu$AR&MFu_<Q==mYd@PUy6XyfL16C-InLG*4xTNHA0Ik|m
+z1ctldAUwWe6}1H@9xnn<?ui1o1Zf^a?X33}<)LZO<)|ReI3{g(<~wMhM55*4VpF^F
+zB=jwi{eR$~9eGeG-6z-bcM(J-TJPp>)?2$ppSyA%@PB`#*g44cDw0%9-HQGd1v3Py
+z!ce6Hu^TKIN5~#rt1B%m&$NZYd9MrmQl4b$k2uObMpm28DcZrrFKb0Ttm4Z2?`Q(F
+zY^;>9Q8MHLYey(85vpj4+l32cdPWo+D)#OH>VIitq~FY;9jCJ6a<5avCVO;E08r5D
+zSG1l{Im&na{@&BN_g=`GVh&oM-8}MDDtLe6FoFd+1_>&LNQU<f0S5t~f(0rBf(0fp
+zf(0Tlf(0H13o3?4hW8Bt3<?1Ppn?SEFoFc)FdPO7Duzgg_YDCI0Ru1&1PJ~szxYR<
+z(|->F0tf&Ef&{<-evNXlq#YlqN^2`ojQQ9HmKs6}GRF+G2Q)*HSg$iMnU<^r9LrFn
+zxi_;d5j$8#-aZkrIi>3j7q|(a0XUem=tm>Nb}nNxMG>I*-+F&f%b8U(1IS|gXKI0z
+zFqNT6(Uj?AS^2AJmXzFr2W;!B{>^Vx&VLDIh>r(e)E6P<!w0SYw>|2-iR>d>%7cst
+z)|fk0e>A-5)~Ixb{jf)u9d~a@$;Ue2b^hwuq!?WlOW8*!jho)y!_O^q<UVj~f~HV6
+zog(FKnkYpFoF|fQhnefJt=MYlA)_0Gw)u%{nt00Uw4ImFmvxYW0eex>*bU7c_<yqf
+zgU>&t<0|Hy@G1@YR$7(n^F&19)$qXKz?Bqhq@W8l>{Q&u<#ZCP82KH)Zf>7(T?yuy
+zXGoA2<9<3(Utt;Q&~`^Cg8(aT@!^O2o{iyARMlt@BwEh=#p{5sNEwe>u@1xM!xTPf
+z{cjB@R6p(a@P3Tzkch>oX42R~BYzdsH}hF&%B1a4xaXUzQeob>0h-;WoL>f`C=2-_
+z+?HS_8A~=i`NAu?^bO3bj5;Q9@Gq7~^Ezf+@(rSg07VgwuECIbZu9FRm7ybGqUAL?
+zR7yl-`Mf>i#7>75pi=AqG=Igf3~}5q2<2ovXnup<p_VAebJHm7KE+s->woF<{75Ez
+zcV`RFb)ap&F4!IxgZ}Me7&#1xPecHIT$;Q6FA-BMHlMvro#iGlRxRNtMA?I}Nif~s
+z4xB9LTy+J=1(d(NNEkKNHx!^IF!m3CTL_mzG|Lm+qD#hqIO$qkUa<6w>vOZJ&Ak)9
+zN9Gi+Vr<uCK&p^(&^yehh=2U_@m(&UbpIQ?SO)9Xc;%<W;_PsztINY`W?t%llmZTC
+zquALH1bx>#_!jC`(#_W~`|?DPU%e!rq@$nOpuW~Fb(C(B{$pmqr(1<fNbeNy_S<HS
+zfXN*kMucnKF}lx=G%~FtR^?%+rID9Um$O_-<*pliDnSG;GVv|~zJF8EFH-;sm9sZj
+z!Uq<jw8_dS1b5Y-r&E~Y^YTPMVWUMI`!1jVC*;qI&8x{eOBygp=>4Jj*1voMah#X2
+zmbl}dO-0R!J+{rgTo_kufNZGxL%bD_65DP2ItQG>BBz|#;LGers8fS6-vgfP3riv2
+zIZ5_@26Y$`o!RCwn1Axwp*XLPl>P=SHk2ynIw={bF+x}_sPmTws$a&G)P=(L9xEf;
+zLPH|=&mn<~cDxN6=Po497XG1E?JW*UhV{X1RCR1iD1=jyWv0E3aE>pobEv=0<_32+
+zfoWJj=tC~)VmD*yV*N{+a=kfqsTn~yI}%5e#(gjwrk&Dk34dHu2g3JU_0P{wwL5KT
+zZ@2G(NB2WIg(L2M;cy}50ifkZ_}n54Y{8^Ua&N;Qj_?d(r3t?4b6YK*80jMHh03Qu
+zi&_K*!^0bGY=gwLu&4S_qj}z*{LmQ_iVGA~-#u+1D@-*0F=c?J48^)^MHR#YRH$6}
+zb>a!@^}Ar-RDX?L8!uaR;urhhC76Vioep{Xi+w@7ilod#-zzV7IhLo*t)6x^n*!>%
+z1_9G$)o=iRWiOWc!_9H_>^;Ksn0YIJakz9$%BFxPdh@PzCrU2PF(oh~1_>&LNQU<f
+z0SOf`76cSSbTi+QXbhs`Z!*V?s%i9Q)2+lXF)$%82`vT%D-Ht!8U+9Z6rJ3?9Vaxi
+emy~v{H@UIThGtFrh6D&{*p$#w0DTw&0tf))A1##t
+
+diff --git a/src/tests/pkinit-certs/user-upn2.pem b/src/tests/pkinit-certs/user-upn2.pem
+index baef41a5ac..b2d8c1dd81 100644
+--- a/src/tests/pkinit-certs/user-upn2.pem
++++ b/src/tests/pkinit-certs/user-upn2.pem
+@@ -1,28 +1,28 @@
+ -----BEGIN CERTIFICATE-----
+-MIIEuTCCA6GgAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
++MIIEuTCCA6GgAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+ FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+ A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+ dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+-b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
++b3RoZXJ3aXNlMB4XDTI0MDIxNTA0NTkwN1oXDTM1MDEyODA0NTkwN1owSjELMAkG
+ A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
+ U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+-CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+-Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+-yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+-QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+-YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+-yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBSjCCAUYwHQYDVR0OBBYEFPQX
+-pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+-uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
++CgKCAQEAm/1JtzZBJsdadmOTnkl94508ZSyYo5xP83sLT/SY5Cri1QKaFrue2kGg
++gl1QEOExBrIbdAeu5BftqiC07HyGgugtRo0qDHMRnQ4tsNExzYz69MOkFE4hMYjU
++o+9C22GVLihyoq+oELN7ro30u5/MCO7rULIp0HekLKQ+uANVVJx+xnW3bMJsrRIX
++Zx9kB0jIIugYt5D3n80vdIjHQJf2BTjsBWYGRJD4sTElGFtRIiD6m4puonRdUgtH
++UHZ7OCKTY5sU0PSGxFRLi/ykqcgPPQddHYCd5MRJj5q2NvPN6UYDbMfzqni0uDQ9
++qdDjHj6CmRCHNKvkKaLdBfhdqFKuZQIDAQABo4IBSjCCAUYwHQYDVR0OBBYEFJI/
+++nOV5fnNVxn2GkjkYbZ5D6mqMIHUBgNVHSMEgcwwgcmAFJI/+nOV5fnNVxn2Gkjk
++YbZ5D6mqoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+ ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
+ IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
+ aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
+ BAQDAgPoMAwGA1UdEwEB/wQCMAAwHwYDVR0RBBgwFqAUBgorBgEEAYI3FAIDoAYM
+-BHVzZXIwEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0BAQsFAAOCAQEAAsGC
+-LvikD/nW3eOym4f/uuKBscOGSByP9/HoP8QwvnLYU00i5n+zXSTQctotHIifsRc4
+-xHLO8xemJp7rm0h/27C1Wo5AVxJ0cmnDKQf8Ast+QXsz9ZeaeKLa5D8sDOfnZXJB
+-aMTb8ChjyZz+KLjXV0VbaVkY95mfqsOoJQcl9wHhNdDOygnSucvA5Svlrbo2rlKt
+-75OJZJJWrZxuaBuuSYNpCKyyg61t69hPoDKDQZ8QJZHGugWqQ2swYe9dZpUYy5xV
+-CGTLCAk9ZOn8hTCC6xbNaJFjflIjcjpwabw0r986/9GeAF6KqSNbMXKaY4LLuk/8
+-5FH9S8/3F56ZCNxbZQ==
++BHVzZXIwEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0BAQsFAAOCAQEAFN2R
++gVMM5HNoXuwBPcpNsP5AVSoQRTAv6UUxAjTPLGH5mE6LGW8/JxM0R5x0PdVyU3u7
++zq4qa10XdGJpSt94cD6m7R61Sw6ru9PBtHmB0oUfkWRa2+SJpjmcwyc86W0XRBhr
++OhD0QGOnF1hGyTYzPViGxRZFVMiqXsWuAJ4i6uTyyPeeN+UuehQ3SsVEA1csrKMy
++dNT7FKQBvUTBnSZ9rxphGBrw/NZQyG74KxG5W3Nsnq89VK6+ESJcsUOT55WrHRwE
++CwKoeX+otyj8ptOwKaaje0DZnSXTXqEag4G4PgH4ovd+ehad0JaE4jtQTm+Vy15W
++cwHSMGSA+Kq1Hsqhhw==
+ -----END CERTIFICATE-----
+diff --git a/src/tests/pkinit-certs/user-upn3.p12 b/src/tests/pkinit-certs/user-upn3.p12
+index 9aabc3a897b48600e25bd7513579b258bc1d46ed..93a30422bde5576dd03b9b04cb4686b470ba4292 100644
+GIT binary patch
+delta 2884
+zcmV-K3%m4%7T^{lFoFwQ0s#Xsf(sG`2`Yw2hW8Bt2LYgh3j+j#3jZ*I3j2{FJAduA
+zDnqkos{8^12mpYB1t=BVzC~9MA%D@drQNw$b(d{B1fZOVs9xYew1s#ISC0(X6M>gB
+z!rN`BrcJ^Ohe`m!y#xb>NQ{#(`z%T5F!2#O*G>G~9Y1B$tAF^=D7^!~(#BjZx-F{G
+z^x3%g?|7?Hkd{-0YH5t*Rdo2X?|+3mcuxvN;&S>5_1eT(qT(x52zq^KY|HMES@+&E
+zp!Oqh18~73Vp*Jp3(0&@a@|uNWKk>z{D%AcItdZY^Q#tZFXI%q0IEm0FKXhy*5b$9
+z+GasSZ7Fl=*a3g~>TXLBMNrC1VdF*^x+r|ZH_Gzcqm)*qrnyv-YX?aX*MDZ~tFG0`
+z^Ke2l!1Q9x;ujYQwbTgiZxgrgH`#P(qDO`2T*ft8T4RjoRc83{mS8JoxEB~7#0gjx
+z+tive>B*VgSOs(>1U%w4T=s!cQ1y~?fv+v$>AJGg8w`s<(0GUVEe>-f_*GXPbEwZJ
+z@TMDrtzx^BDv>4R!-4YvFn`WcgvasTcH1OTNqcoV8kt$B82tUtpRiX$PQ)wkp5{t}
+z)?p3fYtv6h{E7BP@YDq^^hGRwEr+;3?2}{(tSvt7&zZ^>#H`F!949k<-xpr{{;9zp
+zDtV?e)Ry1e!i7Jg&*k>7dmwW#q#n;eOt8Mx%Rd2aKpl4~ym)!RCx2F~-z|>d?Q54S
+zbh=;Es8wX9H~AcxB!gd`Yv{dKYv3SYZtJFuhy-=%I~N%?7_12a2`8#qO9;)}q}s|?
+z6Yq8WI{r_8M%lK?@{uRJ*8bV(rwV?^+S5(8s<q|(u=W)i7#Ji;nW@=c#v|c^L08nz
+zb9J>az4Wa{@(sx!?tewL#bxkvN$jInMZ<~N077QsX0f*s0n@MRO0ggV)O{+MYL52|
+zD_Qu^Iq=$v;`lIbEE}^!yO4Pu2NTKNpCM~vyDd#ZW{_f=T68I`1G!n9V|6E;0xWK$
+zMVJJi5@$HHpOZKnrm+wnGJ%P0|5h5YAJ}NwwC8lGJ&%vDG=GT=<j0kA!b5uMG<wH6
+zq80{}@FpkW%dBL_*yaDQ_?=a?;AHed_#cRLJ5|*vPYg8;yk7z3{p-W~xyJ=&@q$GX
+zJ1E#6CA}&ClB3XwY|;PxXxjP4UyK$X-gQ4~hm_p}4r+*lOu`i?u+0;7`mw0C#2uYc
+z<pr*qWm3|6QhzFrCENv98Rah!VXY205$+qV{AqFPy`cIv8VJs5?|!Q>v(9PE(Uw7P
+z0!+ZeJmezUaISwf0TkR2jcE8>$`w#S7f_v0R974kk%QiJp8inpuCXe~j&U$j#DPM;
+zvba{UI+?eG*q-}vzr1$h?MM(Ib<qQ@t>!)FpJS;+BY&HpTa%DiJgy~x$CJp7`XQi8
+z*lml!5T65{Op0>wuHAP*c>)PwVIyE2gb)~?eZWlbJ!p2-RLHg)RE>m|lR|}Q{=U%0
+zo}D~Q!ZtM}jTp-co<U__KRlX4ohb4}$wOZdn^F=BhjXZl#=GCOifU~vLS1)`r6yOg
+z+*C_~9e)bS_Z|HFOC!rdw%BVpyora7>>k#HE^0ZnM*G{j*Xs{zpJAwD_6*z5T?7Wi
+zypIqyqWoQX1?O<$<GXqYkP|^i91I0~;Fi$xs=f-pUAL2dQX9zr^(R$tzh3NWVtsWW
+zaQkmdB-%r?MC;=nrsD`1VUwppaj@zZ%%k#)k$*PnWMQ=`jujA9fNYe;IRK|eTl(72
+zIxqr%VlR_O@a^%emKTu>Oww!WKN@+P0NUjRx;gnk&KISm<5rUiP7k`UFoFey1_>&L
+zNQU<f0S5t~f(3O1f(3Cff(30bf(2;?3o3?4hW8Bt3<?1Ppn?T4FoFdwFjoc%Duzgg
+z_kRrm1r0DtFewHJDuzgg_YDCB3@{u72(le_b~zw}{sICB05A*&2r7n1hW8Bu2?YQ!
+z9R>+thDZTr0|Wso1P~jF*+0)PkEs!3QR2j6R$>H#1kglS1&YtSg;OpOm6~N<GLtEd
+zMW?VF9-4V-i-w~(CK1$j+A+YVi$XmPD1RdTYDjvZ#97a=|2K?_iysrrz{lFQ3L|)7
+zP(Is^iIC4k^VosskP%eZRbZ?^zMYJNmTekqzIgnBAp-(z-KCD&w=K1$cMw7o(XPw3
+zJ#&aqa&jHv4r2-r3uJ5_g|ZGeaJD=x5G%#*A5Mdnu<}KWd-bI}`<KxC#3j{31AlLO
+zXa2voVG@KbMN;bdW)MbGFJQA#es@<)WtK`xC({o08DiA+;GhY1iz4i*7&Y6fXwc^s
+zY2>rtV4vPWlld2Ews(yNbZ<xM5%r1#&IC$KeGImA&XFCUwU^@2_VPV|k^@guzky^2
+zFU9qOOB|x5&T#<2D7aM%MTl6oL4SRiI~USyX~jOJ<Zy1+efcvFk0n2EU;z?5z+)kK
+zrkpX0tmbeiKpl)CIBAtr_CD5K&dC;guEA@K$(Acf^nV6CnEgyPI#^VSUUxyymii{;
+z51PsDotc}Tp-wx+Wx#u=OmVG!NHH3E-9<7VrDz^mg~uw68zb9uGe~=rO@D)#M-}LA
+zGXHCOLZD5ojdv@}(Eepdzl}bf`ZKHTD5j>xe(4nR+$T))-e8N?d$b$9^!ypWdooRD
+z6pI1Qs15?;T?5@i>UJA=nyNu0m?ps+lm98_Zo0A+t+e}RpX+!f>G3{Hg^u6fo4LT1
+z4Y{a#T+mMYnY#W{qU{X@B!6T|m%Isc9UEo8>zV^Z9L9?17w>9Ujg30PUkpbf5*il)
+z&|Zg>8MV)WoRDJd#ewUABq5SACj~6S38u#ULT-rG&N*DdJ@Hn+EX<9U)cEl5v2mVi
+zmqUCjZU-u2d&A^l<elDN29_w$R)KxX4vgY%eYbETrt8e``3Au^pMMID>!nNL>Tjtf
+zJkzy;9b{e}lVX%pscpa}CD|T&4_lG8*YS?dpSkncWepv2e&;2HS{*4*!|BT*m2A?f
+zyjVW1HUQ(_M3rpp5R3I>q#~s-)|9FwJ%rOTwxl2FMp&4tsCFbTVXO2tVoG)vz`fmN
+z)R<$E#pT35KAYbTw|@bc<QpqplPG$^JqV_BjwpU%XphvAk?~pd!sK4IrFzcZM=Vox
+zmE`o52$E{)Q++@&;(eKil9?7Wmd$hK(Rwf%*5XjJHEQuzihq7f3zOR~Lu!NIK9}ls
+zWW`W%%dn*_%2j{|oH)M*(Kvb9BHY0vFTx{4Od$^djDv9*iGS{c*77Dd6zXxuclH0%
+z7h<`tC^-53eR<DELGj-n>x$u3h{1odhts-|_3YJ4Ayla(y0OOI4`C7W%+BMtMu9DR
+zLN@8T_7`usWF{4ezK+d|fuB@k4tw^8R!x#XZ^&}mz29aP_raW@!^P-{vLMa|@PF|S
+zhs(}tr|&S{zJE{7YU?ak8o<!8=}82kvr!u({u*_R?>Nr`=W`fgsS4~&^0h#~(VJRT
+zNzH~lq@$yZ<Qa4v*Sh_=>(W^@?`c_n0MVf0+f4^>KZJcWBRpBJ1NoZM-&i&-9Xoe!
+zmv9ed<U*QU`>P|3x)fnY^m)?k@H>w04+$h`_@j98wtxMb_Y2{QVtv2Vhjf7qLrz^P
+zzfCU6R%@{mG9Yn6kX(&PQbCcl4jzWK;LKYtF(oh~1_>&LNQU<f0SOf`76cSql)L>g
+zWkVjqlI}v+>hWZNZUj*<K`=2e4F(BdhDZTr0|WvA1povfLm8syc_F<3ka!`b3`tdD
+i)2#3$p&40-cg^1tk8$>Kq67$ty|isR%^-9F0tf)%!(&YV
+
+delta 2792
+zcmV<E3K#X@7KIifFoFvK0s#Xsf(pk52`Yw2hW8Bt2LYgh3b+J<3bZhS3b2tPJAZf9
+zI=UuMTHFEx2mpYB1t=3txK!FOZvGINz!^t~^pShD-<Eqzi`e#g5K#q@!I4NI3qaG2
+z*qD=hc1{@;%M2?2EVndQsh5U2FU2y>_>MN{htcbO{qC=J&uM?~NGanbgE-J*^bff<
+zUL85U4k$LojjclJ{^#hk69ix0P=6p3{W=cW@;J}jXSEPY*K)tO<RY~btdV5Mp0mEi
+zd-BTF-exYG?Tc)i@%b4z-?T+5qBB$NXunnu7W!j)gY~GHuT^v~OQJhguRE#>5KXO=
+zDp34gOZf$JI>T(od;fQLTl{d}D?LMSYm|boNM<?~$LJ`%{=d#9I|(Jj@_#=LD<y_~
+zPG(YC4aeuj$}4&S8Ms)oAIi-Y$FwNY*~e8x?gX>-&DpOI*gNxdhZ}bdPsP-V3jIx6
+zS#YC|Y%#Qcz2<ygbGI-oR&uHuuIoTtgDWYC{r;wfp<^gdgozK3aw-!>$cGZXgSwA(
+zp^gh0BF&;oP;t5r`vDq}MSpv(oTT?XWo$BF3HTfG#Cm-G$X#COyar;r`l_yWRsuyp
+zjrLZxM$<L0lY0-2|JicpodEhW-KIA(I*oC@?3bTiPH<*_SJa>trJR(FC|;&F1_fvv
+zlT~jFp~Eovc#$rZ%#NJT+P;E<dxrqN4lUeDZ@Qu@BLHFc*DM}4%YW9#>f80Oaf9R{
+zOpW_P@)6@t2VYKWW}3x8$#CYa;%anc&G^~Ur2V-rd#L>n7J)~*jORUD0N#m1LiDFl
+zB&?Q*64N(fqjrGx*oF|qZ|R<>da*~kLSkj=XRG<@r3LG9Z`*3FTNX%lmC5B4T~(J>
+zFv-n}iKXB3?7ZeYuYc&9GS74XBxDCRdBBF|yIE$fUxbe0K(Obu;3tumH)59PWVH*+
+zz+FmMZ^+~l+V!l1r0ZO}N2<6B_PMH&?VYqs=-<hSIPDKQ?7~$?6Iu4+B+^H7(}Q~{
+zt;xxa>LS%mX1X@sp)x{beSD;A)~7{YY~TU-k$-{C;hMVpNq;mVqC$gb{2Xtz#6@FT
+z{VWSY?mme#0Q8+1Z2R$5&R0^uNckWNtn&l62raaz_Rv@fJ}H`<mZK@33>6N<Gz5T8
+z5o!$^TOKwIEV_!?rBCl2B57S!w&DtV@@T=n&(;yfV7HPHv>6&t$-qmQZi<VqWQ&4i
+zU%vLxsY^{qY=5$tN%ovTxH&bfW$Js*hdi3y&p)tR!WjC*)|Ds<_<NGx+?`gs=dx&X
+zPAQ8HZtYf<v<GLcOMnbMo%C?{+YCtCznX5u+sCadPaAGVt+vhmleJqNWYE>`0V~WS
+z!noU8xPAZ|(OodN!Y_ylW^%s>!I$n`^*O|{`Nql$VSjtzYgo;WtVGwfOGr;9?$|xB
+zcs%xxE&&}izyxcgm)2gfVyWCAT`*z4tvURt&T~Yv;4D~@cMQ$sbGeT!7+;p0p5QBw
+zMU{9IVf{eaHyT}&Q{kmv1!msC>y;CP;=8GdD!=>6MDu6%gpdLzN`zEs=jdV7SuMgm
+zSef9I4u8xGa&@P0{hVpaizD*w9ysr@;s~)?UPY$$=xMStm%-8_cVQq(W*E)bMfTx~
+ztiPTUhk1JJr{K03M<MKdz$Z-NM0`c}jkS!E*rjZ6hyZgL;))|jj$a3W!v7P<{&XdS
+za1RpAGt7afGNo?`XZ|&sUB3vWe9T$^=c4qEr+>HZ?_uNADjS{qhZS>Plq2pIDcZSe
+zpdVNTFx+6=J0GuhMj`dM%6hP<l<u!iusF_Bdbx<=ACp;@Y`s8x$D&CzFoFd+1_>&L
+zNQU<f0S5t~f(0rBf(0fpf(0Tlf(0H13o3?4hW8Bt3<?1Ppn?SEFoFc)FdPO7Duzgg
+z_kRrm3;_c$4g?7K%`T3l<@I6$0tf&Ef&{>r;S>kF`=lUV`cN+L-;%3g5Ai66u6H%n
+zyfg~`$Gs>R{QVz)tROl(k}JU-jqD62a~NzC212U{n)$nAgsnGjoPsM7R6NMA=VGH`
+z1j%@$TqOIpqreVYF{_P#Ld?sZIQVS;Qh)J`TkyOxjU_HwSFW=@1+yU&O+4(~e1pZW
+zdrC+`8zsTaGDfQt#7I&Pa#$O{DyBOl>_Jl1(9c*lL@BH;OO#5bXtm5nX3C~*Pn69s
+z(^4r6qXFwhf*ZDy)ZtW;)ENRkjc|#NpZ6iL<woUVtHh&|R?8g_qU5m-MkNYTet$(#
+zyJ!4TWt&hjHjmf%`BsYr73?qnuue8m>J2cnU$Z46(*w{@+^tC{nR=N4%9T-0{S0Vv
+zuITX0>W_bbsp#~8>rIdGj%n76kYuf?>yX)bEPeHczbHA2m#H;(n|w!Q4IVX6sU98{
+zOlrpj6Q_77iXS2=oFm3wmI_q=!GG|ZxMyJfm@W36)BqdDmFEysiCoWFs0h{Aeqqmk
+z8T93$tHeqtTnPI#ZNj;&P@qq&2+!E8(q%k0HF{#(jwR}m)3Lz()!)7BPi*u-*p#b3
+zrLNe1(4tB%&d^e8d{#t$ImMt?Vq-)VFbRK@T_Yiahm~7)-B&pd8gxPtU4O8w+P>aQ
+zP9X72&~lV9$Qpdl3;-#jyHYb%NM)NxL<bMhDMv%<wE4YutMjd%1W2hj`&XnAwJ8EC
+z*Agtv+loQIAh}><$lo(9#%8c!mweqK8`i&|Ky0)}^G8PW(W%*6#;qkrM4%*TGa!?K
+zU|cE2f76znLD#xzxyn;rmw)6%EH1ek2QS*J((#_RgTyYO#?@-CqoKDk8tM{t+BZ0R
+zg9e9H38hKach1c+6Xf9Da}2?$V5Rk*R98)aLVp2^8bXx7{A@Q2pHfZvEV%u|jMOGg
+z|5PWJ_$G1qmwVcOOVwerb<|Tx^TT^v%SaCo(O%3gTXbk?e!y16>VF;94g#dwH|PI-
+z&D1MMKVRu0{ryL$acyjbc`LtxcnT{VX0HU%g2@&XrH+ZW=-~P<pXDDe7JrPgw6)Mw
+zL68)m{RjfF?Tf2z7A{H+4d=U_y<XWLtalg9u+mwq72ZFFuJ_mu?ec1LlwlG<8~rER
+zcfn0S*cHAy8#iSU{eQ)swmP0(GgZjkY3S<li1kWcpx{dTu^UhU60?jCk_~3ugA1M{
+zPtaKDYH1~KB?jPDbrDBZt`FKM_*9D)kmSq$^Kc`Xg`XFY+J(Ua+`QY%x$2F8RJ%F?
+zd2?E|L^=KVN@V<v6=CRo;2@0XDY2W6LlNx@eh2eU%8n)_Xn#*49_%2NEFw7iei(x9
+z!-j441`ti6SA&WV`GV9+k*=c-<fuV!7f{)$mRgRj-F421B`EEbqo4*aE{bxUex6`M
+z6pJlov0XmMh$ToDRQne77!tmuWn3Yk<10lX8pTX>-Jc7{3rh)|t*!EFi!P9*YBAtW
+zbu`)yVVz9dAb+fy*IJEkVq7w={{*u3gh?3@!<u+^AmxIeZFVKT;=*CHnNqiJXxxR@
+zK;GVvS>K+(YG^T3vjiU}7w=Z08`s6Gaw5p<uny@|Zyi$#Hy4lH@z#IQJda-vcya@^
+zI;-6KF(oh~1_>&LNQU<f0SOf`76cS9@g^tl=&liDBR#MNfw;BX$Xi4$FflM8FbM_)
+uD-Ht!8U+9Z6v!4MIfn!wLYbfw(;^ds(gM9-V+07Ul!P?WIu(in0tf(rB|=XC
+
+diff --git a/src/tests/pkinit-certs/user-upn3.pem b/src/tests/pkinit-certs/user-upn3.pem
+index 000d567d87..618f005267 100644
+--- a/src/tests/pkinit-certs/user-upn3.pem
++++ b/src/tests/pkinit-certs/user-upn3.pem
+@@ -1,28 +1,28 @@
+ -----BEGIN CERTIFICATE-----
+-MIIExTCCA62gAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
++MIIExTCCA62gAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+ FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+ A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+ dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+-b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
++b3RoZXJ3aXNlMB4XDTI0MDIxNTA0NTkwN1oXDTM1MDEyODA0NTkwN1owSjELMAkG
+ A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
+ U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+-CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+-Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+-yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+-QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+-YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+-yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFPQX
+-pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+-uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
++CgKCAQEAm/1JtzZBJsdadmOTnkl94508ZSyYo5xP83sLT/SY5Cri1QKaFrue2kGg
++gl1QEOExBrIbdAeu5BftqiC07HyGgugtRo0qDHMRnQ4tsNExzYz69MOkFE4hMYjU
++o+9C22GVLihyoq+oELN7ro30u5/MCO7rULIp0HekLKQ+uANVVJx+xnW3bMJsrRIX
++Zx9kB0jIIugYt5D3n80vdIjHQJf2BTjsBWYGRJD4sTElGFtRIiD6m4puonRdUgtH
++UHZ7OCKTY5sU0PSGxFRLi/ykqcgPPQddHYCd5MRJj5q2NvPN6UYDbMfzqni0uDQ9
++qdDjHj6CmRCHNKvkKaLdBfhdqFKuZQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFJI/
+++nOV5fnNVxn2GkjkYbZ5D6mqMIHUBgNVHSMEgcwwgcmAFJI/+nOV5fnNVxn2Gkjk
++YbZ5D6mqoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+ ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
+ IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
+ aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
+ BAQDAgPoMAwGA1UdEwEB/wQCMAAwKwYDVR0RBCQwIqAgBgorBgEEAYI3FAIDoBIM
+ EHVzZXJAS1JCVEVTVC5DT00wEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0B
+-AQsFAAOCAQEApwXjFJ86RLM4MzbScqk0JGqm+jzaFZ6h5oyt0rlaxdhOl7kqOmIE
+-sLhXtvZm75roA+UULZHumB6xg3Y0p7cc6VBAYYycWoNkhWXZMdQ8Q33vMos5cwLY
+-kXjl4oTDK53goh8IlriRMV7Tv/QpJ8wh+7iqQn3lak0Tv51JexYGwp5sJREYm8q5
+-rr3ChlgH7SWF8mhbu2EEiipm0whEqA4tlNKGBsTQBslnm8sK0VfVDcmLOGbMNjRs
+-r+Hkd8yVvhIJ9M+WAp/OeF2vUzPBJtAfIaJBxcZmKtNI5Jk8cK/vScJZboa0qAAz
+-2Y1uC9rP830mpOe0juhV2mMPron0hi1HaA==
++AQsFAAOCAQEASLN4+MiZUQwBzQ3ezt1B8Zx8jHL7a16s1H5v1J2Dwne/pM/risjg
++ZAlv65IlKEp2E6cqcmCPajlZ967vJr1qC+OSV2AZuL8HZlg+ISacoII9T97X9/UJ
++AJfOWBN6y0DQ7s6OLSunf0+mAw+LKmFoIQeO5+DvU4chEYkcs6NbbAos/He1Wgq/
++RTz9J3EhGuoDVgqq/avrTsgW9HyrHsG+Y/6n4cX2lq+VV7h8fG91hC073Rz9QMFY
++q/pBqFqIE/FrgA4YbpOrSx6m+eOyFSAWTLtmlJmROiNYo4ZuGmBtrDntet+YK75A
++8Rsfbapjn4SKJzgJseVgUbEEMOFcugQBfQ==
+ -----END CERTIFICATE-----
+diff --git a/src/tests/pkinit-certs/user.p12 b/src/tests/pkinit-certs/user.p12
+index e5520110248530c55338c80fd44414eaa262c4a8..0f854cae6f033d0630e8f49ad14e11f330c0ad6b 100644
+GIT binary patch
+delta 2892
+zcmY+^XEfW50>^P7i4fG53N5i(Gig<+?Lnz6wQE*r&6Z2;KdIR$HEXY^tyJwjg4on9
+zMJuYqtgX~N&$;(J_uQAi7vJB@&r8m4oG3IN?nn)yLF3`vP&&~_t;i!r5G^PV4~K*C
+za9T7TPLqI=2dt3wb<B!a5Y*H#s!%)x4HbuGtuhvMOCzXu@BiE?e=uf4CPZD(e=!wq
+zr4c7R^V^>?!M|9Ta8@$m(?5~;_Tn(<8A}joBO+BcSlahN)>Sb`>t<Pm1zL7h-b=jf
+z9H&*w!M){6)I@jPyco1%sk1>=)-(^SR2L)<H%Ey9s^={!$g-uS&%%pR0ZFw6z5b&)
+z^7y%K3kM8{HM0KXmgVN$rXTRTojNF~UMNOva@$egRhz<GWfi1i)))U(*<8ANm_;sx
+zY<$z{$h0k-V5zRTQ2aj1UM9=<OeUTRdk;E+>txY=xAE~PHoHBCf4M{bH>2S9jw`4h
+zp*y-jx&|=Tq_=vX$0AY-B-pr{O3}~!a^QKw^rZP3r!8E~<4%RzRnXkH>9XmKSZbP{
+zaaJ*AU$QA*L~%RS_EQGj1G`WJ7DmgunlvxDG={jJ?-epJse!y@ZR4+bx9Q?#sdYwy
+z(7k9q)PNjgxszN|6iPwU<V3Az+|Q%FiAM@3S@aCrCDE0>knCR*%y^Qb?DE%DYvjQ3
+z;KupDH-(s?Jv+im0i-zOqS_h7X4{%q6B3|6&!@UWm^wW2r4xF|mkdEx<wiDgRg7^<
+zR=7al&dYr5^}_QLIkN(Fyy$~%_dZbKw!O7hWyJFxKhXt7?FjdaYJcx5Ib$Un2j2v8
+z%5%2`t-gMuy!%db-A&$qt<!@eXY4yEGs&LX$Z=@KgM_g`DpF&Uc4aUbh^CeUv9d_j
+zN@$tnmTWEq>n4~66{`CzT4_Ik**^1`!x}fTzV|8m{TK6!0MWB(ZeY4tK0dLjcMvPD
+z8=e*&*4XH*4v{Q1h2g%3Fjv;yT>}EoVd?9-HI&GSk%Pt~SySOzU&y5j-YW|H(ymTw
+z1G_2NB0UR=mJj{oPOpv^O!d8MXu(!8&w(wML`8o+#dIfwKC>RJ9>RAeghupBEai$e
+zDAKej36GGn{2TIG%!~-Q_PI^YR3oQST)AK%A#{^(z(2e>rf&a3&by;mOTa8+PRRHa
+z-^wA_U+>r+QFr5+>p5s|pY~>EwSm#>qOt)Nqf@6CP_M$KA*G}bcej!gwJ3*zQPO)Q
+zcE!oFOtiDpne0?jxphVJByH8c!ib0&g7|*$$1HXsrD_TF<y%3uzG~s$9=skXBue=$
+zC<$y5nR-%KMXc5?_1xZd0M1`=nYy@~qYVm78#ARF35kDd7YuUq6Qcx&1+EleUT>zB
+zrG_#(dx(zjH@7`{%)6&?2CWGV#oyFiC}F9*)?V`SkA$n6*urPvef#ZVsuY@aE~mwi
+zfLZVOxpYs34^{3ih{Iwt3J%MBwsDN@US3n{4IdSbxOu_vBq_M10eI@=J1FX`4=u}h
+z7b!WZmn^TKx7NOwvR(EQJ?-AwVb|>(+HxQ(@}fss)htL6&IySIxFV|d4-b9Yvz_(c
+zePf1g3;EKwCW`Pgu}r&Nwiw5>4p0$1R|F@Ad*9EUAwqU`H_$DzHS;+yy>Dy~SPv!$
+zmkq}>$Zz^V(#udwpnHpk)p-ziT_zvT@iwpeM(IX2<l=1<Nl2{mx&JFt*dS3jrT;PY
+zFthLdWaIhhL!MMpVXR5CS?Ne&5VEW#2Zn7-al7}9@*6}_siUmwh)zf-f5I%sB)f75
+zZb+MS1Z?$<8lQK8Re1Te!IPvW8knK@{wg<eV;$}Chb<NuDr789lR?tV)Iy@;N!1PX
+zvq<w?`_g~O!-F4HH47X{6-O<zjr`&!&L|<ma$E^Z0CiWyZuaSGyXU+KB!OQB+2GnL
+zbw5V^Lo^-|{(sOye870fQ#2mpj>bbCL*f55n1LQdori~D(0GUh8Zi4OfiR-)p|AgM
+zGN5_DFy>1zgV-~<sK0qeGeBYg`JkqQP@#FDbas(iARG-CBnoDhTHtDZ`M&ygm*J}p
+zcv|ol7!Mxj%Z9Q0gjbE|MP)nJo8UAhZfhN0?H%bok%_bGTwAb%s{8@ilH5&b73*8%
+zn?~vO)!7y7Lj*?UZ5qZ?)nyNAjb3oz?2PGlw&}HOvO1`1Wwac=eYU`sxEQghC@ZE*
+z1w@#ajEoSL1j0HX8}<}`+fc*1nxY1sElLmO6ZMsC__iS7_dQ(`M$XS2esWS}oKa}n
+zIh;@lg-$!--KngXYomds8?&A#I~9ShhEw*n5wUp{ewUsh=l#s8O<YP=+cvxnx0!Z9
+zLmYwFY}9A?<yDw6R;$PQyr<{qYf(2@VguTzBR`XmCp(%xUcha-Q@k8GqS!C#!(Qnq
+z$2F}~K9C?Y|9&7Pz%$O*uatAoeT^D*q>8AVb3azHBo_up_yK-RX|#8f(whe3lu~8=
+z>Rlx#>}5YmM<S$f;e6dLTk#=#J$c>^rEltM^1$Xx)9`wo{qb10o*m>Xy`;bHRtlM}
+zZ;NN)^q}BNTvndhQ?@$yS|;Tr^u4BaFvdS%HZ>EM%wHSflx2KCj%7vqE=Pto+rN*9
+z21WA>{xOJ{T7d8o7MV7X>L|Ta>(!)@?25=6nd{r1Bn1O;w^^R6q@iNUl@~<5k`Grt
+zt4cy_*okVY%WdtrNQM1KuBWpb4Qesv1*;K^T|9@TnSs3eA(Cz^54=Z((46M|;%oLh
+zsGs_@Lgj^K@yCR&!=s>ti(hn0WJ!%oQvB59o(Pc&NTW!ES)k-IY(7i~q|CgZoa^hR
+zQpq1!Sdc(15I4h>i5jn(4Ky68x6iUWOuL_jt-H+BCnoZ@!V6GiN0MNg=y}@`g*u-V
+zC)cuzj#&nkk&<;b>Wyz$fnuR;6uI%S@#E=E`^qe-8I#gnaKxnOFO0(}fzq(wH~hi+
+zdekEzl#@Io`zB#+ajLT>%~{Ny&d-aFH~-)&gKw0$UWsSsw6{_YrsbR_+(F>MMOwP2
+zv?S-H0J1o)Pna!}jc7d%4wbSOX;bOs>ThE@)4%djgrNvZ>mhajjy`1?f&q|iuLRhg
+zehh18kl}yP!G|X@Gm`KYlGDk1(~HZc=c<6J@dww{aY6Qrty97R-B72@4@2yDEvsVN
+zO4TxnDDsD0ykJu8oaM>2W3)f`ZQz-jz(%KYh03WnD*OU=$~!l(X{Fk9?CXlr$jMxw
+z&4YBg{$w3lr2MG!+jmk%$X#1C8hxEuGbq80I?zu!86*YbN3dx1@2fmAim6hvO+bIU
+z#eRn3Ab^rg46S~M7s6vR<;i88WSP<^qe8v(HjtYp^i7<5*IA5%6fE#3@S1XdAl86m
+zcpPdhk!Is}%eVyhaMQ}v|MGKVO_?U$M<;JZw1H8T)I+1KkgCQz*|>4xv5+eESa~~w
+zV(ssuMzr>CN1hjN$@^xrtY35-fSQH~hi%0jk0IU8K<iJ=j!cLNX^M5_WlGc%n$Xc9
+zcFY$hpd7(i;qS>N60+SAoZC8d-GF!Wx7^TelGeO~Jnmk|pA+8J`#v2b8;L#Ri&lNt
+zFZi?Wu)s7TQiBF!^rGT_I1$NYEv&1L-zUwHU&}h&7dNZD3|-tI&0n9m0L_9i2rN6l
+zDRGS|<JPCQxn{O@t)567-*;8_xT%bVwhZH5tRL*E|1f&`cxu}u_IZo-b~rGM5kd?6
+zBPAUNh7-)LFocwXx=obP&XlAn@(Q1-_Hl%vRnZtU<3CPPgCJC3zPt5x&N$lsbg5RJ
+ntLFUE%6Dz;6jaHQOxyz(FBBk_lLKJb5UI2r^Vyl|Z*~6-`|w^%
+
+delta 2800
+zcmV<M3J>+@7L67nFoFvS0s#Xsf(p+D2`Yw2hW8Bt2LYgh3cv({3cN6a3b>IXJAc~$
+z04;L?h2;VQ2mpYB1u#k{e>HFuQb-0@)w8+8*DP{D$KG=;=xRl2uvKUP-SRRE%$NKP
+z_D;2NCAhd^?|QhcbJ5E7c`-26TMzdlG-H?6^IBeoE0#e|QM2rw&&DIM3C+3&2a0ll
+zpPL`9ji3aw?(A~Q_bH5QAB`Hf<A2kh#Q6kWS>T~I=G`cK>^k-~8=RAs!fh8npjTx1
+zio`$Z>ZF=$DSVbD4xi;!NC!?`eIqF<HO_^vw$W1cC%-d}4qkh{VE@0KSIVK7b?JTT
+zq-RRUs;gsXhg6l9mL=uhMes&x2tEw<m^@#u`j8PeMKq6|w`i=T^yfz%AAicj>D35=
+zQc<VpQ`VnLg+g_VM)Cmrnf^!Yv5L{a3WRi*zEf?6^=})hnn7ACMASEjS~Se1n7qt<
+zOgiZJYKzi`R-bhVt$?~$BP+8on`rvT1uUM3gi{>_8A~;(#IIWCvOKf`P&2)Js($WT
+z1z-??Ow@SVupz2ChgP2^Y=0o#*~e?*$0TAcDcl<G_XeQ>j?IADVt8o^gntLJZBu=o
+zlRp{i%IZDaPfUE-$LP%)Ua~T(Bdt0G=DGbexi&hghHP;^^f<}zRlnJ3GgV60GtOPk
+zcib>&Ab~e+Z6==732Fcs!<-3gh>(3UIWk_h>u`vv-;vJv<B0+QL4S5)9R$cj+w{^_
+zO*tVWU)aZpkN8|jJG~#J?D{&(6rMHFD&OvA&2Wz5pq^>M|KhjTN9G*@n5_xbZnmMK
+zlqp0G!V<X?fv_ES2bY>*18sL0-95F*8PQnOybN@p#c%kb*&^aa55JSKbSAd@qO=Ht
+z422<UXz~4$`-S^Gtbf$flLsG_ECz?!qldH?4Ne5$aO&-tg4ZqVY1i0OaLxWLVG{>L
+zEQT%EbQpx1<?JaH8`ziq<`WMK6D23sNVrd_V)JAI9-u=?x+SfR{?RAMk>)#*Gv)47
+z!L`_0ZJB+>X&W4?m4Xpk&GUR45OCpS-Ac@br?bG$K5WOH27l@cvz6M|^4ikdCcj~?
+z@A&ePKz3o=>_;pjNUjLI{a*i~A2Cm`&wy=Wnk}HZ!)%{@qd4Cdgv0<!v7Fp(g?ef!
+z*v^GpdJ@x9(F{%#S4`1dh-vGR8TE|#G}0d$8~NyOCt8>g1#?}yCqq93|4$^$^+_&k
+zJa~z}zH{53ynke+y3lMnjQq2xp0Aelu-HmWXLFfn2Zo%7n87xsG^uG}b2CZ*u1s9Z
+zdy6l*(2{|l#uH(Fg~MQyrygWvH^>pmCkM|1n_(Oa%d6l_c*y)EJe|rcT48Q$4-q9{
+zd;$`4t5f-+&fM5}8vs44&d`E*VzZ!Kx~GhFv9KFoMt^WQmMpIlho1dt%_BO(+`2Lp
+zatNwfJ+p4vZMjP*m8(};v7%^J>Z;rDPy{%kK4LhfuLy_D30LYt***zyVP-NnNeD<@
+zGY~g=yXsBrn_X=!tmk!)LM6?HS%;t(HMJ%Q_8-enJgcrn_sO6=M%6GmrD<R&rHySM
+zyFwJ9w|{x{Q?F^`5tqnGoK0lGp`$AxK4Y3vwL!F-?(OYJg%@tw<#dfe8DU84Oy0jA
+z>CuouDW~1p-LREA&0BHSeEKQnj3ME3_){Ru4kMWs9nx6eJ4`1vHrOoBO6WNZGR{?^
+zEfRoM=%swpDejYTaEFI0cJp^Ht@L%c+@lQy^nXs75zrK4$%sP!y)m<*xW9H%@<Ogb
+zC2^|mE<uQkFld?mPDpo2xt#a*MK|8AE=rDVj}pK|<3_Ffwj3p#o&X`3;NZ>fLjRzS
+zFoFd+1_>&LNQU<f0S5t~f(0rBf(0fpf(0Tlf(0H13o3?4hW8Bt3<?1Ppn?SEFoFc)
+zFn=5d3Mz(3hW8Bt3;_c$4g?6%Tk1xTiUJ)10tf&Ef&{>eJ7Gnm8p68cPkyaMp;ydm
+z;5`lZ-8TBOTClg<PYxV`BO%f&+dEvMl0#$)@5Cr;=QE@M*NtG)9E!|x8`cAxg&%-v
+zfePOOjdeqgjMHONN;KHA=qrt=lx=G^N`Ge58}MK0n>{8b2gEfR$AC$(l*<$HmjXkv
+zk2XU*+fTwXqcsMYaZ3q-p;<f}MP~X<D;Eir>PK((Pr<aG&fFFm94*g>SVUOgD!_f+
+zxEwhbf?;sTV<seOV5mIkylyR?*G0KgX0a+q>9;{2qj=e+thV<s50qa!Oi?_WNPj5p
+z*~)2#V_FjvS%FyoNBPpK$_gFCZ_}9~`PNLGq-TGGVD(eUGTI_d$tQzI;~iMVBmoJ0
+zA;XN^Y^^`viz`p50^CQx)SY5!Dvg_i2*r%1^OKmN0rQ*9{>m4&q+rqRZvI3E$OX<G
+z?9oF+GP@B&!lR1#!mj2S*LFT~i+?XSTRyu1Z?0}$dK=0PkU>DELB<0qt8X4|WJgR&
+zA;mly>0fgus?*HuYZkDa8&PzLYY`{)VN|6AD5DVz9hPB0H|cXeKd~iK$$60*1@6KW
+z6781`Wt^~gq(V@LHV`!^8UF^$=qzP9Z~St~brXD2cffcLQ)%SW+3k{*m46rbsM@(z
+zVmdvB5fH3}m=m^<CJb&xVynQM=D6;wvPlWhHlBt%pZP)L1Vp#J4sk{)`TZ?Oj%g~&
+zi3EE>afNN7hu#6Tv465|&pl|0QVo8cOgDzsf96G6OAIc1>JH)_kiJ%CKS4>>XVItK
+z0df&%Ir0A#%dzm{a-{xL-+y}K1k-jf%0*=Wi*tj00J0}10?%6)ypUZJ9ksJA^uCwA
+zU5oo_<nP<(sK-n^!au0J>6hE*n7H%zwo}j{S>kk<DKaR0M2{r`>C#VGo5P%uaH-y;
+z9xeJ!zLp4E-us08h0F``IjL9Q%D-E<6S*Z@f^7;~n+PU-j1vc-W`Anul8%C=xSb5u
+z7r0>5j^Of_V(=`5Jkb~jw{)rQzSz?lmA1B5fIF^AldA0&srn(q6$tx(<>kN35n4cE
+z?Y`#QJY`_$YGKyHz0lTxyY@^*MkI>@K_P<$huaWnmtRl$s=QCNW>Q)%O~1<vI-B0r
+znnG8;aJ;bf%Odr3t$!AVRGa|mdh2#tw4H>b7x8OZa>s!LI}xafM<eM_nwKqqqyQLj
+z`1Qx@C$dIuzBgLyGw+T2S0~>3IiiEeV1X6v0v^m&_bRB7S;B9{kMdqBpB#o;WHIcK
+zXZti{8yqh{hTB(4Q&s{4ZNd91F&>cQH%{n1i;7|BuXezD%73<t|N6a?-kNtNkI(Ws
+z&I+>Buu9D%H$?>u=EQI*3@^(1e84N*6QZYbr+~cRYKueVXW#rd?}8~s6XVg0MS^}l
+z>j!&zJjkZ0C0Bijh>6a2w@ocN@A@brXHXZn+AJ3kASY`zaQm-BZ>L{LVlV^$8R&lo
+z$7k~Gs8nAN#(&H;;d!1sK~d<KC9YPUgFYTCu{D9rH<0o@89~{}RWd!dLNxtx_I!5m
+z6I(i@<;K6lvm3TLP^2a!1oe~Ghsz?Q`4TSakLr){Z`~DVKX5KPxjwgWlOlh-m5$$x
+zyo=6Eb?HWFHB*j`F(oh~1_>&LNQU<f0SOf`76cT=L`9(EsQ>XqJJ21=NG&!mOU3kJ
+zFflM8FbM_)D-Ht!8U+9Z6sSLOY_+{}*ZArxG2W!WZkmtKW&{Xzdz-Lrn>2+20tf&?
+Cp*q$8
+
+diff --git a/src/tests/pkinit-certs/user.pem b/src/tests/pkinit-certs/user.pem
+index 182ea599ac..7493de52c1 100644
+--- a/src/tests/pkinit-certs/user.pem
++++ b/src/tests/pkinit-certs/user.pem
+@@ -3,26 +3,26 @@ MIIE0zCCA7ugAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+ FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+ A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+ dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+-b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMFoXDTMyMDkyMDIxMTEzMFowSjELMAkG
++b3RoZXJ3aXNlMB4XDTI0MDIxNTA0NTkwN1oXDTM1MDEyODA0NTkwN1owSjELMAkG
+ A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
+ U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+-CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+-Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+-yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+-QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+-YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+-yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBZDCCAWAwHQYDVR0OBBYEFPQX
+-pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+-uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
++CgKCAQEAm/1JtzZBJsdadmOTnkl94508ZSyYo5xP83sLT/SY5Cri1QKaFrue2kGg
++gl1QEOExBrIbdAeu5BftqiC07HyGgugtRo0qDHMRnQ4tsNExzYz69MOkFE4hMYjU
++o+9C22GVLihyoq+oELN7ro30u5/MCO7rULIp0HekLKQ+uANVVJx+xnW3bMJsrRIX
++Zx9kB0jIIugYt5D3n80vdIjHQJf2BTjsBWYGRJD4sTElGFtRIiD6m4puonRdUgtH
++UHZ7OCKTY5sU0PSGxFRLi/ykqcgPPQddHYCd5MRJj5q2NvPN6UYDbMfzqni0uDQ9
++qdDjHj6CmRCHNKvkKaLdBfhdqFKuZQIDAQABo4IBZDCCAWAwHQYDVR0OBBYEFJI/
+++nOV5fnNVxn2GkjkYbZ5D6mqMIHUBgNVHSMEgcwwgcmAFJI/+nOV5fnNVxn2Gkjk
++YbZ5D6mqoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+ ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
+ IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
+ aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
+ BAQDAgPoMAwGA1UdEwEB/wQCMAAwOQYDVR0RBDIwMKAuBgYrBgEFAgKgJDAioA0b
+ C0tSQlRFU1QuQ09NoREwD6ADAgEBoQgwBhsEdXNlcjASBgNVHSUECzAJBgcrBgEF
+-AgMEMA0GCSqGSIb3DQEBCwUAA4IBAQAOBeCDK6Eg6Cu8TZ7xeAw2AbTpaW04nNSV
+-Fmm0aIskMgLl2a5KEmalG7rnArRXv5IZVYFjJ6X0MzjOx+BgaGUCvN8jz1fuO3Hp
+-iGhxPDzKjFMWJeY/z5bQRueSI6RCC8DzH8iPdlPUQ8ZhnukhY1Vt47wqraf197uT
+-0XP21qQr1uRY+ZcLSBKZuKe9ZP3ijh57MOLvYDdAFxVp77JLznpk+oU18ujAtYgZ
+-7naIGYtSQRkIi970jk82hSpc9B/KN8UcDuo+DQHWPQaDf39s30qoxooZBoue5ipp
+-LQHuVaX5Hoi83cWbsVluce/JsW8GfbuC8+8CosAmzJly183f8++9
++AgMEMA0GCSqGSIb3DQEBCwUAA4IBAQBRWsxPb9miF9xf8rEIfVko0qBy8doEJsPE
++IVD9Jz/Ml/TBZRLbi1b94l15Fto/Z6XKf8jrnBs4krf6tU2D5PUZXZYZ6tr/2kkY
++IpmoOkEoQX8gtcZfaq2OJzsKHnAJT159EVydyYahHU66i4aNvho74oAafrVTyk8B
++PHCHFs0MUct8DoNwrbnfH0cjqEdVOmjjvBN0yA+RxOa543XnQqkSmCuIJKoD6pUa
++07rE372iERgIjDnzCogiEo9cCBBqDfgsbr0ah1QbWJTJvnsFuxT43tBNurRjNPoX
++Jj6xAzhQLCuvqtKtWlAUOHut18YbVGXVT+3tm7+C6iA44JvMl9m1
+ -----END CERTIFICATE-----
+diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py
+index 4435746429..91d4630a0a 100755
+--- a/src/tests/t_pkinit.py
++++ b/src/tests/t_pkinit.py
+@@ -7,8 +7,10 @@ if not pkinit_enabled:
+ 
+ # Construct a krb5.conf fragment configuring pkinit.
+ user_pem = os.path.join(pkinit_certs, 'user.pem')
++ecuser_pem = os.path.join(pkinit_certs, 'ecuser.pem')
+ privkey_pem = os.path.join(pkinit_certs, 'privkey.pem')
+ privkey_enc_pem = os.path.join(pkinit_certs, 'privkey-enc.pem')
++privkey_ec_pem = os.path.join(pkinit_certs, 'eckey.pem')
+ user_p12 = os.path.join(pkinit_certs, 'user.p12')
+ user_enc_p12 = os.path.join(pkinit_certs, 'user-enc.p12')
+ user_upn_p12 = os.path.join(pkinit_certs, 'user-upn.p12')
+@@ -42,6 +44,7 @@ alias_kdc_conf = {'realms': {'$realm': {
+ 
+ file_identity = 'FILE:%s,%s' % (user_pem, privkey_pem)
+ file_enc_identity = 'FILE:%s,%s' % (user_pem, privkey_enc_pem)
++ec_identity = 'FILE:%s,%s' % (ecuser_pem, privkey_ec_pem)
+ dir_identity = 'DIR:%s' % path
+ dir_enc_identity = 'DIR:%s' % path_enc
+ dir_file_identity = 'FILE:%s,%s' % (os.path.join(path, 'user.crt'),
+@@ -177,6 +180,11 @@ for g in ('4096', 'P-256', 'P-384', 'P-521'):
+     realm.pkinit(realm.user_princ, expected_trace=('PKINIT using ' + g,),
+                  env=group_env)
+ 
++# Test with an EC client cert.
++mark('EC client cert')
++realm.kinit(realm.user_princ,
++            flags=['-X', 'X509_user_identity=%s' % ec_identity])
++
+ # Try using multiple configured pkinit_identities, to make sure we
+ # fall back to the second one when the first one cannot be read.
+ id_conf = {'realms': {'$realm': {'pkinit_identities': [file_identity + 'X',
+@@ -446,4 +454,16 @@ realm.run(['./responder', '-X', p11_attr,
+ realm.klist(realm.user_princ)
+ realm.run([kvno, realm.host_princ])
+ 
++mark('PKCS11 identity, EC client cert')
++shutil.rmtree(softhsm2_tokens)
++os.mkdir(softhsm2_tokens)
++realm.run(tool_cmd + ['--init-token', '--label', 'user',
++                      '--so-pin', 'sopin', '--init-pin', '--pin', 'userpin'])
++realm.run(tool_cmd + ['-w', ecuser_pem, '-y', 'cert'])
++realm.run(tool_cmd + ['-w', privkey_ec_pem, '-y', 'privkey',
++                      '-l', '--pin', 'userpin'])
++realm.kinit(realm.user_princ, flags=['-X', p11_attr], password='userpin')
++realm.klist(realm.user_princ)
++realm.run([kvno, realm.host_princ])
++
+ success('PKINIT tests')
+-- 
+2.47.1
+
diff --git a/0032-Improve-PKCS11-error-reporting-in-PKINIT.patch b/0032-Improve-PKCS11-error-reporting-in-PKINIT.patch
new file mode 100644
index 0000000..b529921
--- /dev/null
+++ b/0032-Improve-PKCS11-error-reporting-in-PKINIT.patch
@@ -0,0 +1,599 @@
+From e43c05e7b0b93401dd68fc3ec3186c3a455b04ea Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Fri, 23 Feb 2024 13:51:26 -0500
+Subject: [PATCH] Improve PKCS11 error reporting in PKINIT
+
+Create a helper p11err() to set extended error message for failed
+PKCS11 operations, and use it instead of pkiDebug() and pkcs11error().
+
+ticket: 9113 (new)
+(cherry picked from commit 98afb314d13939cbee19c69885dcb655db8460da)
+---
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 262 ++++++++++--------
+ src/plugins/preauth/pkinit/pkinit_trace.h     |   9 -
+ 2 files changed, 142 insertions(+), 129 deletions(-)
+
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 4accfc2664..402bf1b9b3 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -161,9 +161,11 @@ static krb5_error_code pkinit_create_sequence_of_principal_identifiers
+  int type, krb5_pa_data ***e_data_out);
+ 
+ #ifndef WITHOUT_PKCS11
+-static krb5_error_code pkinit_find_private_key
+-(pkinit_identity_crypto_context, CK_ATTRIBUTE_TYPE usage,
+- CK_OBJECT_HANDLE *objp);
++static krb5_error_code
++pkinit_find_private_key(krb5_context context,
++                        pkinit_identity_crypto_context id_cryptoctx,
++                        CK_ATTRIBUTE_TYPE usage,
++                        CK_OBJECT_HANDLE *objp);
+ static krb5_error_code pkinit_login
+ (krb5_context context, pkinit_identity_crypto_context id_cryptoctx,
+  CK_TOKEN_INFO *tip, const char *password);
+@@ -180,6 +182,8 @@ static krb5_error_code pkinit_sign_data_pkcs11
+ (krb5_context context, pkinit_identity_crypto_context id_cryptoctx,
+  unsigned char *data, unsigned int data_len,
+  unsigned char **sig, unsigned int *sig_len);
++
++static krb5_error_code p11err(krb5_context context, CK_RV rv, const char *op);
+ #endif  /* WITHOUT_PKCS11 */
+ 
+ static krb5_error_code pkinit_sign_data_fs
+@@ -197,9 +201,6 @@ create_krb5_invalidCertificates(krb5_context context,
+ static krb5_error_code
+ create_identifiers_from_stack(STACK_OF(X509) *sk,
+                               krb5_external_principal_identifier *** ids);
+-static const char *
+-pkcs11err(int err);
+-
+ 
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 
+@@ -944,8 +945,9 @@ cleanup:
+ 
+ #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */
+ 
++#ifndef WITHOUT_PKC11
+ static struct pkcs11_errstrings {
+-    short code;
++    CK_RV code;
+     char *text;
+ } pkcs11_errstrings[] = {
+     { 0x0,      "ok" },
+@@ -1035,6 +1037,7 @@ static struct pkcs11_errstrings {
+     { 0x200,    "function rejected" },
+     { -1,       NULL }
+ };
++#endif
+ 
+ MAKE_INIT_FUNCTION(pkinit_openssl_init);
+ 
+@@ -1563,6 +1566,8 @@ pkinit_fini_pkcs11(pkinit_identity_crypto_context ctx)
+     free(ctx->token_label);
+     free(ctx->cert_id);
+     free(ctx->cert_label);
++    ctx->p11_module_name = ctx->token_label = ctx->cert_label = NULL;
++    ctx->cert_id = NULL;
+ #endif
+ }
+ 
+@@ -3344,48 +3349,53 @@ pkinit_pkcs7type2oid(pkinit_plg_crypto_context cryptoctx, int pkcs7_type)
+ }
+ 
+ #ifndef WITHOUT_PKCS11
+-static struct plugin_file_handle *
++static krb5_error_code
+ load_pkcs11_module(krb5_context context, const char *modname,
+-                   CK_FUNCTION_LIST_PTR_PTR p11p)
++                   struct plugin_file_handle **handle_out,
++                   CK_FUNCTION_LIST_PTR_PTR p11_out)
+ {
+     struct plugin_file_handle *handle = NULL;
+-    CK_RV (*getflist)(CK_FUNCTION_LIST_PTR_PTR);
++    CK_RV rv, (*getflist)(CK_FUNCTION_LIST_PTR_PTR);
+     struct errinfo einfo = EMPTY_ERRINFO;
+-    const char *errmsg = NULL;
++    const char *errmsg = NULL, *failure;
+     void (*sym)(void);
+     long err;
+-    CK_RV rv;
+ 
+     TRACE_PKINIT_PKCS11_OPEN(context, modname);
+     err = krb5int_open_plugin(modname, &handle, &einfo);
+     if (err) {
+-        errmsg = k5_get_error(&einfo, err);
+-        TRACE_PKINIT_PKCS11_OPEN_FAILED(context, errmsg);
++        failure = _("Cannot load PKCS11 module");
+         goto error;
+     }
+ 
+     err = krb5int_get_plugin_func(handle, "C_GetFunctionList", &sym, &einfo);
+     if (err) {
+-        errmsg = k5_get_error(&einfo, err);
+-        TRACE_PKINIT_PKCS11_GETSYM_FAILED(context, errmsg);
++        failure = _("Cannot find C_GetFunctionList in PKCS11 module");
+         goto error;
+     }
+ 
+     getflist = (CK_RV (*)(CK_FUNCTION_LIST_PTR_PTR))sym;
+-    rv = (*getflist)(p11p);
++    rv = (*getflist)(p11_out);
+     if (rv != CKR_OK) {
+-        TRACE_PKINIT_PKCS11_GETFLIST_FAILED(context, pkcs11err(rv));
++        failure = _("Cannot retrieve function list in PKCS11 module");
+         goto error;
+     }
+ 
+-    return handle;
++    *handle_out = handle;
++    return 0;
+ 
+ error:
+-    k5_free_error(&einfo, errmsg);
++    if (err) {
++        errmsg = k5_get_error(&einfo, err);
++        k5_setmsg(context, err, _("%s: %s"), failure, errmsg);
++    } else {
++        err = KRB5KDC_ERR_PREAUTH_FAILED;
++        k5_setmsg(context, err, "%s", failure);
++    }
+     k5_clear_error(&einfo);
+     if (handle != NULL)
+         krb5int_close_plugin(handle);
+-    return NULL;
++    return err;
+ }
+ 
+ static krb5_error_code
+@@ -3393,12 +3403,13 @@ pkinit_login(krb5_context context,
+              pkinit_identity_crypto_context id_cryptoctx,
+              CK_TOKEN_INFO *tip, const char *password)
+ {
++    krb5_error_code ret = 0;
++    CK_RV rv;
+     krb5_data rdat;
+     char *prompt;
+     const char *warning;
+     krb5_prompt kprompt;
+     krb5_prompt_type prompt_type;
+-    int r = 0;
+ 
+     if (tip->flags & CKF_PROTECTED_AUTHENTICATION_PATH) {
+         rdat.data = NULL;
+@@ -3407,7 +3418,7 @@ pkinit_login(krb5_context context,
+         rdat.data = strdup(password);
+         rdat.length = strlen(password);
+     } else if (id_cryptoctx->prompter == NULL) {
+-        r = KRB5_LIBOS_CANTREADPWD;
++        ret = KRB5_LIBOS_CANTREADPWD;
+         rdat.data = NULL;
+     } else {
+         if (tip->flags & CKF_USER_PIN_LOCKED)
+@@ -3431,31 +3442,28 @@ pkinit_login(krb5_context context,
+ 
+         /* PROMPTER_INVOCATION */
+         k5int_set_prompt_types(context, &prompt_type);
+-        r = (*id_cryptoctx->prompter)(context, id_cryptoctx->prompter_data,
+-                                      NULL, NULL, 1, &kprompt);
++        ret = (*id_cryptoctx->prompter)(context, id_cryptoctx->prompter_data,
++                                        NULL, NULL, 1, &kprompt);
+         k5int_set_prompt_types(context, 0);
+         free(prompt);
+     }
+ 
+-    if (r == 0) {
+-        r = id_cryptoctx->p11->C_Login(id_cryptoctx->session, CKU_USER,
+-                                       (u_char *) rdat.data, rdat.length);
+-
+-        if (r != CKR_OK) {
+-            TRACE_PKINIT_PKCS11_LOGIN_FAILED(context, pkcs11err(r));
+-            r = KRB5KDC_ERR_PREAUTH_FAILED;
+-        }
++    if (!ret) {
++        rv = id_cryptoctx->p11->C_Login(id_cryptoctx->session, CKU_USER,
++                                        (uint8_t *)rdat.data, rdat.length);
++        if (rv != CKR_OK)
++            ret = p11err(context, rv, "C_Login");
+     }
+     free(rdat.data);
+ 
+-    return r;
++    return ret;
+ }
+ 
+ static krb5_error_code
+ pkinit_open_session(krb5_context context,
+                     pkinit_identity_crypto_context cctx)
+ {
+-    CK_ULONG i, pret;
++    CK_ULONG i, rv;
+     unsigned char *cp;
+     size_t label_len;
+     CK_ULONG count = 0;
+@@ -3469,30 +3477,35 @@ pkinit_open_session(krb5_context context,
+         return 0; /* session already open */
+ 
+     /* Load module */
+-    cctx->p11_module = load_pkcs11_module(context, cctx->p11_module_name,
+-                                          &cctx->p11);
+-    if (cctx->p11_module == NULL)
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
++    ret = load_pkcs11_module(context, cctx->p11_module_name, &cctx->p11_module,
++                             &cctx->p11);
++    if (ret)
++        goto cleanup;
+ 
+     /* Init */
+-    pret = cctx->p11->C_Initialize(NULL);
+-    if (pret != CKR_OK) {
+-        pkiDebug("C_Initialize: %s\n", pkcs11err(pret));
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
++    rv = cctx->p11->C_Initialize(NULL);
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_Initialize");
++        goto cleanup;
+     }
+ 
+     /* Get the list of available slots */
+-    if (cctx->p11->C_GetSlotList(TRUE, NULL, &count) != CKR_OK)
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
++    rv = cctx->p11->C_GetSlotList(TRUE, NULL, &count);
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_GetSlotList");
++        goto cleanup;
++    }
+     if (count == 0) {
+         TRACE_PKINIT_PKCS11_NO_TOKEN(context);
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
++        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        goto cleanup;
+     }
+-    slotlist = calloc(count, sizeof(CK_SLOT_ID));
++    slotlist = k5calloc(count, sizeof(CK_SLOT_ID), &ret);
+     if (slotlist == NULL)
+-        return ENOMEM;
+-    if (cctx->p11->C_GetSlotList(TRUE, slotlist, &count) != CKR_OK) {
+-        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        goto cleanup;
++    rv = cctx->p11->C_GetSlotList(TRUE, slotlist, &count);
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_GetSlotList");
+         goto cleanup;
+     }
+ 
+@@ -3503,19 +3516,17 @@ pkinit_open_session(krb5_context context,
+             continue;
+ 
+         /* Open session */
+-        pret = cctx->p11->C_OpenSession(slotlist[i], CKF_SERIAL_SESSION,
+-                                        NULL, NULL, &cctx->session);
+-        if (pret != CKR_OK) {
+-            pkiDebug("C_OpenSession: %s\n", pkcs11err(pret));
+-            ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        rv = cctx->p11->C_OpenSession(slotlist[i], CKF_SERIAL_SESSION,
++                                      NULL, NULL, &cctx->session);
++        if (rv != CKR_OK) {
++            ret = p11err(context, rv, "C_OpenSession");
+             goto cleanup;
+         }
+ 
+         /* Get token info */
+-        pret = cctx->p11->C_GetTokenInfo(slotlist[i], &tinfo);
+-        if (pret != CKR_OK) {
+-            pkiDebug("C_GetTokenInfo: %s\n", pkcs11err(pret));
+-            ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        rv = cctx->p11->C_GetTokenInfo(slotlist[i], &tinfo);
++        if (rv != CKR_OK) {
++            ret = p11err(context, rv, "C_GetTokenInfo");
+             goto cleanup;
+         }
+ 
+@@ -3577,6 +3588,10 @@ pkinit_open_session(krb5_context context,
+ 
+     ret = 0;
+ cleanup:
++    /* On error, finalize the PKCS11 fields to ensure that we don't mistakenly
++     * short-circuit with success on the next call. */
++    if (ret)
++        pkinit_fini_pkcs11(cctx);
+     free(slotlist);
+     free(p11name);
+     return ret;
+@@ -3598,16 +3613,17 @@ cleanup:
+  * If there are more than one, we just take the first one.
+  */
+ 
+-krb5_error_code
+-pkinit_find_private_key(pkinit_identity_crypto_context id_cryptoctx,
++static krb5_error_code
++pkinit_find_private_key(krb5_context context,
++                        pkinit_identity_crypto_context id_cryptoctx,
+                         CK_ATTRIBUTE_TYPE usage,
+                         CK_OBJECT_HANDLE *objp)
+ {
+     CK_OBJECT_CLASS cls;
+     CK_ATTRIBUTE attrs[4];
+     CK_ULONG count;
++    CK_RV rv;
+     unsigned int nattrs = 0;
+-    int r;
+ #ifdef PKINIT_USE_KEY_USAGE
+     CK_BBOOL true_false;
+ #endif
+@@ -3637,18 +3653,21 @@ pkinit_find_private_key(pkinit_identity_crypto_context id_cryptoctx,
+     attrs[nattrs].ulValueLen = id_cryptoctx->cert_id_len;
+     nattrs++;
+ 
+-    r = id_cryptoctx->p11->C_FindObjectsInit(id_cryptoctx->session, attrs, nattrs);
+-    if (r != CKR_OK) {
+-        pkiDebug("krb5_pkinit_sign_data: C_FindObjectsInit: %s\n",
+-                 pkcs11err(r));
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
+-    }
++    rv = id_cryptoctx->p11->C_FindObjectsInit(id_cryptoctx->session, attrs,
++                                              nattrs);
++    if (rv != CKR_OK)
++        return p11err(context, rv, _("C_FindObjectsInit"));
+ 
+-    r = id_cryptoctx->p11->C_FindObjects(id_cryptoctx->session, objp, 1, &count);
++    rv = id_cryptoctx->p11->C_FindObjects(id_cryptoctx->session, objp, 1,
++                                          &count);
+     id_cryptoctx->p11->C_FindObjectsFinal(id_cryptoctx->session);
+-    pkiDebug("found %d private keys (%s)\n", (int)count, pkcs11err(r));
+-    if (r != CKR_OK || count < 1)
++    if (rv != CKR_OK)
++        return p11err(context, rv, _("C_FindObjects"));
++    if (count < 1) {
++        k5_setmsg(context, KRB5KDC_ERR_PREAUTH_FAILED,
++                  _("Found no private keys in PKCS11 token"));
+         return KRB5KDC_ERR_PREAUTH_FAILED;
++    }
+     return 0;
+ }
+ #endif
+@@ -3796,34 +3815,32 @@ pkinit_sign_data_pkcs11(krb5_context context,
+     CK_FUNCTION_LIST_PTR p11;
+     CK_ATTRIBUTE attr;
+     CK_KEY_TYPE keytype;
++    CK_RV rv;
+     EVP_MD_CTX *ctx;
+     const EVP_MD *md = EVP_sha256();
+     unsigned int mdlen;
+     uint8_t mdbuf[EVP_MAX_MD_SIZE], *dinfo = NULL, *sigbuf = NULL, *input;
+     size_t dinfo_len, input_len;
+-    int r;
+ 
+     *sig = NULL;
+     *sig_len = 0;
+ 
+-    if (pkinit_open_session(context, id_cryptoctx)) {
+-        pkiDebug("can't open pkcs11 session\n");
+-        return KRB5KDC_ERR_PREAUTH_FAILED;
+-    }
++    ret = pkinit_open_session(context, id_cryptoctx);
++    if (ret)
++        return ret;
+     p11 = id_cryptoctx->p11;
+     session = id_cryptoctx->session;
+ 
+-    ret = pkinit_find_private_key(id_cryptoctx, CKA_SIGN, &obj);
++    ret = pkinit_find_private_key(context, id_cryptoctx, CKA_SIGN, &obj);
+     if (ret)
+         return ret;
+ 
+     attr.type = CKA_KEY_TYPE;
+     attr.pValue = &keytype;
+     attr.ulValueLen = sizeof(keytype);
+-    r = p11->C_GetAttributeValue(session, obj, &attr, 1);
+-    if (r) {
+-        pkiDebug("C_GetAttributeValue: %s\n", pkcs11err(r));
+-        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++    rv = p11->C_GetAttributeValue(session, obj, &attr, 1);
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_GetAttributeValue");
+         goto cleanup;
+     }
+ 
+@@ -3865,10 +3882,9 @@ pkinit_sign_data_pkcs11(krb5_context context,
+     mech.pParameter = NULL;
+     mech.ulParameterLen = 0;
+ 
+-    r = p11->C_SignInit(session, &mech, obj);
+-    if (r != CKR_OK) {
+-        pkiDebug("C_SignInit: %s\n", pkcs11err(r));
+-        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++    rv = p11->C_SignInit(session, &mech, obj);
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_SignInit");
+         goto cleanup;
+     }
+ 
+@@ -3881,18 +3897,17 @@ pkinit_sign_data_pkcs11(krb5_context context,
+     if (sigbuf == NULL)
+         goto cleanup;
+ 
+-    r = p11->C_Sign(session, input, input_len, sigbuf, &len);
+-    if (r == CKR_BUFFER_TOO_SMALL || (r == CKR_OK && len >= PK_SIGLEN_GUESS)) {
++    rv = p11->C_Sign(session, input, input_len, sigbuf, &len);
++    if (rv == CKR_BUFFER_TOO_SMALL ||
++        (rv == CKR_OK && len >= PK_SIGLEN_GUESS)) {
+         free(sigbuf);
+-        pkiDebug("C_Sign realloc %d\n", (int) len);
+         sigbuf = k5alloc(len, &ret);
+         if (sigbuf == NULL)
+             goto cleanup;
+-        r = p11->C_Sign(session, input, input_len, sigbuf, &len);
++        rv = p11->C_Sign(session, input, input_len, sigbuf, &len);
+     }
+-    if (r != CKR_OK) {
+-        pkiDebug("C_Sign: %s\n", pkcs11err(r));
+-        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_Sign");
+         goto cleanup;
+     }
+ 
+@@ -4348,13 +4363,14 @@ reassemble_pkcs11_name(pkinit_identity_opts *idopts)
+ }
+ 
+ static krb5_error_code
+-load_one_cert(CK_FUNCTION_LIST_PTR p11, CK_SESSION_HANDLE session,
+-              pkinit_identity_opts *idopts, pkinit_cred_info *cred_out)
++load_one_cert(krb5_context context, CK_FUNCTION_LIST_PTR p11,
++              CK_SESSION_HANDLE session, pkinit_identity_opts *idopts,
++              pkinit_cred_info *cred_out)
+ {
+     krb5_error_code ret;
+     CK_ATTRIBUTE attrs[2];
+     CK_BYTE_PTR cert = NULL, cert_id = NULL;
+-    CK_RV pret;
++    CK_RV rv;
+     const unsigned char *cp;
+     CK_OBJECT_HANDLE obj;
+     CK_ULONG count;
+@@ -4364,8 +4380,8 @@ load_one_cert(CK_FUNCTION_LIST_PTR p11, CK_SESSION_HANDLE session,
+     *cred_out = NULL;
+ 
+     /* Look for X.509 cert. */
+-    pret = p11->C_FindObjects(session, &obj, 1, &count);
+-    if (pret != CKR_OK || count <= 0)
++    rv = p11->C_FindObjects(session, &obj, 1, &count);
++    if (rv != CKR_OK || count <= 0)
+         return 0;
+ 
+     /* Get cert and id len. */
+@@ -4375,10 +4391,9 @@ load_one_cert(CK_FUNCTION_LIST_PTR p11, CK_SESSION_HANDLE session,
+     attrs[1].type = CKA_ID;
+     attrs[1].pValue = NULL;
+     attrs[1].ulValueLen = 0;
+-    pret = p11->C_GetAttributeValue(session, obj, attrs, 2);
+-    if (pret != CKR_OK && pret != CKR_BUFFER_TOO_SMALL) {
+-        pkiDebug("C_GetAttributeValue: %s\n", pkcs11err(pret));
+-        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++    rv = p11->C_GetAttributeValue(session, obj, attrs, 2);
++    if (rv != CKR_OK && rv != CKR_BUFFER_TOO_SMALL) {
++        ret = p11err(context, rv, "C_GetAttributeValue");
+         goto cleanup;
+     }
+ 
+@@ -4393,10 +4408,9 @@ load_one_cert(CK_FUNCTION_LIST_PTR p11, CK_SESSION_HANDLE session,
+     attrs[0].pValue = cert;
+     attrs[1].type = CKA_ID;
+     attrs[1].pValue = cert_id;
+-    pret = p11->C_GetAttributeValue(session, obj, attrs, 2);
+-    if (pret != CKR_OK) {
+-        pkiDebug("C_GetAttributeValue: %s\n", pkcs11err(pret));
+-        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++    rv = p11->C_GetAttributeValue(session, obj, attrs, 2);
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_GetAttributeValue");
+         goto cleanup;
+     }
+ 
+@@ -4406,7 +4420,8 @@ load_one_cert(CK_FUNCTION_LIST_PTR p11, CK_SESSION_HANDLE session,
+     cp = (unsigned char *)cert;
+     x = d2i_X509(NULL, &cp, (int)attrs[0].ulValueLen);
+     if (x == NULL) {
+-        ret = KRB5KDC_ERR_PREAUTH_FAILED;
++        ret = oerr(context, 0,
++                   _("Failed to decode X509 certificate from PKCS11 token"));
+         goto cleanup;
+     }
+ 
+@@ -4444,7 +4459,7 @@ pkinit_get_certs_pkcs11(krb5_context context,
+     int i;
+     unsigned int nattrs;
+     krb5_error_code ret;
+-    CK_RV pret;
++    CK_RV rv;
+ 
+     /* Copy stuff from idopts -> id_cryptoctx */
+     if (idopts->p11_module_name != NULL) {
+@@ -4516,16 +4531,16 @@ pkinit_get_certs_pkcs11(krb5_context context,
+         nattrs++;
+     }
+ 
+-    pret = id_cryptoctx->p11->C_FindObjectsInit(id_cryptoctx->session, attrs,
+-                                                nattrs);
+-    if (pret != CKR_OK) {
+-        pkiDebug("C_FindObjectsInit: %s\n", pkcs11err(pret));
++    rv = id_cryptoctx->p11->C_FindObjectsInit(id_cryptoctx->session, attrs,
++                                              nattrs);
++    if (rv != CKR_OK) {
++        ret = p11err(context, rv, "C_FindObjectsInit");
+         return KRB5KDC_ERR_PREAUTH_FAILED;
+     }
+ 
+     for (i = 0; i < MAX_CREDS_ALLOWED; i++) {
+-        ret = load_one_cert(id_cryptoctx->p11, id_cryptoctx->session, idopts,
+-                            &id_cryptoctx->creds[i]);
++        ret = load_one_cert(context, id_cryptoctx->p11, id_cryptoctx->session,
++                            idopts, &id_cryptoctx->creds[i]);
+         if (ret)
+             return ret;
+         if (id_cryptoctx->creds[i] == NULL)
+@@ -5510,19 +5525,26 @@ print_pubkey(BIGNUM * key, char *msg)
+ }
+ #endif
+ 
+-static const char *
+-pkcs11err(int err)
++#ifndef WITHOUT_PKCS11
++static krb5_error_code
++p11err(krb5_context context, CK_RV rv, const char *op)
+ {
++    krb5_error_code code = KRB5KDC_ERR_PREAUTH_FAILED;
+     int i;
++    const char *msg;
+ 
+-    for (i = 0; pkcs11_errstrings[i].text != NULL; i++)
+-        if (pkcs11_errstrings[i].code == err)
++    for (i = 0; pkcs11_errstrings[i].text != NULL; i++) {
++        if (pkcs11_errstrings[i].code == rv)
+             break;
+-    if (pkcs11_errstrings[i].text != NULL)
+-        return (pkcs11_errstrings[i].text);
++    }
++    msg = pkcs11_errstrings[i].text;
++    if (msg == NULL)
++        msg = "unknown PKCS11 error";
+ 
+-    return "unknown PKCS11 error";
++    krb5_set_error_message(context, code, _("PKCS11 error (%s): %s"), op, msg);
++    return code;
+ }
++#endif
+ 
+ /*
+  * Add an item to the pkinit_identity_crypto_context's list of deferred
+diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
+index 1c1ceb5a41..1faa6816d7 100644
+--- a/src/plugins/preauth/pkinit/pkinit_trace.h
++++ b/src/plugins/preauth/pkinit/pkinit_trace.h
+@@ -98,21 +98,12 @@
+ #define TRACE_PKINIT_OPENSSL_ERROR(c, msg)              \
+     TRACE(c, "PKINIT OpenSSL error: {str}", msg)
+ 
+-#define TRACE_PKINIT_PKCS11_GETFLIST_FAILED(c, errstr)                  \
+-    TRACE(c, "PKINIT PKCS11 C_GetFunctionList failed: {str}", errstr)
+-#define TRACE_PKINIT_PKCS11_GETSYM_FAILED(c, errstr)                    \
+-    TRACE(c, "PKINIT unable to find PKCS11 plugin symbol "              \
+-          "C_GetFunctionList: {str}", errstr)
+-#define TRACE_PKINIT_PKCS11_LOGIN_FAILED(c, errstr)             \
+-    TRACE(c, "PKINIT PKCS11 C_Login failed: {str}", errstr)
+ #define TRACE_PKINIT_PKCS11_NO_MATCH_TOKEN(c)                   \
+     TRACE(c, "PKINIT PKCS#11 module has no matching tokens")
+ #define TRACE_PKINIT_PKCS11_NO_TOKEN(c)                                 \
+     TRACE(c, "PKINIT PKCS#11 module shows no slots with tokens")
+ #define TRACE_PKINIT_PKCS11_OPEN(c, name)                       \
+     TRACE(c, "PKINIT opening PKCS#11 module \"{str}\"", name)
+-#define TRACE_PKINIT_PKCS11_OPEN_FAILED(c, errstr)                      \
+-    TRACE(c, "PKINIT PKCS#11 module open failed: {str}", errstr)
+ #define TRACE_PKINIT_PKCS11_SLOT(c, slot, len, label)            \
+     TRACE(c, "PKINIT PKCS#11 slotid {int} token {lenstr}",       \
+           slot, len, label)
+-- 
+2.47.1
+
diff --git a/0033-Set-missing-mask-flags-for-kdb5_util-operations.patch b/0033-Set-missing-mask-flags-for-kdb5_util-operations.patch
new file mode 100644
index 0000000..71b30d1
--- /dev/null
+++ b/0033-Set-missing-mask-flags-for-kdb5_util-operations.patch
@@ -0,0 +1,61 @@
+From 946f7dba8cea3d2ed0e68c5e7594cbd7e1364609 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 1 Aug 2024 10:56:07 +0200
+Subject: [PATCH] Set missing mask flags for kdb5_util operations
+
+Set KADM5_TL_DATA for the use_mkey and update_princ_encryption
+commands.  (Commit c877f13c8985d820583b0d7ac1bb4c5dc36e677e did this
+for the add_new_mkey and purge_mkeys commands.)  Set appropriate flags
+for the add_random_key command.
+
+[ghudson@mit.edu: combined two commits; pruned out proposed mask flag
+additions for values represented within key data or tl-data (like
+KADM5_MKVNO), as those flags are currently only used in the kadm5
+protocol, not to communicate with the KDB module]
+
+ticket: 9158 (new)
+(cherry picked from commit 4ed7da378940198cf4415f86d4eb013de6ac6455)
+---
+ src/kadmin/dbutil/kdb5_mkey.c | 4 +++-
+ src/kadmin/dbutil/kdb5_util.c | 3 +++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
+index aceb0a9b80..ac5c51d05e 100644
+--- a/src/kadmin/dbutil/kdb5_mkey.c
++++ b/src/kadmin/dbutil/kdb5_mkey.c
+@@ -525,6 +525,8 @@ kdb5_use_mkey(int argc, char *argv[])
+         goto cleanup_return;
+     }
+ 
++    master_entry->mask |= KADM5_TL_DATA;
++
+     if ((retval = krb5_db_put_principal(util_context, master_entry))) {
+         com_err(progname, retval,
+                 _("while adding master key entry to the database"));
+@@ -814,7 +816,7 @@ update_princ_encryption_1(void *cb, krb5_db_entry *ent)
+         goto fail;
+     }
+ 
+-    ent->mask |= KADM5_KEY_DATA;
++    ent->mask |= KADM5_KEY_DATA | KADM5_TL_DATA;
+ 
+     if ((retval = krb5_db_put_principal(util_context, ent))) {
+         com_err(progname, retval, _("while updating principal '%s' key data "
+diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
+index 55d529fa4c..afc817891b 100644
+--- a/src/kadmin/dbutil/kdb5_util.c
++++ b/src/kadmin/dbutil/kdb5_util.c
+@@ -600,6 +600,9 @@ add_random_key(int argc, char **argv)
+         exit_status++;
+         return;
+     }
++
++    dbent->mask |= KADM5_ATTRIBUTES | KADM5_KEY_DATA | KADM5_TL_DATA;
++
+     ret = krb5_db_put_principal(util_context, dbent);
+     krb5_db_free_principal(util_context, dbent);
+     if (ret) {
+-- 
+2.47.1
+
diff --git a/0034-Prevent-overflow-when-calculating-ulog-block-size.patch b/0034-Prevent-overflow-when-calculating-ulog-block-size.patch
new file mode 100644
index 0000000..d288951
--- /dev/null
+++ b/0034-Prevent-overflow-when-calculating-ulog-block-size.patch
@@ -0,0 +1,64 @@
+From 9b669dd42b28e7900f5ccac2816204e7d04ea23c Mon Sep 17 00:00:00 2001
+From: Zoltan Borbely <Zoltan.Borbely@morganstanley.com>
+Date: Tue, 28 Jan 2025 16:39:25 -0500
+Subject: [PATCH] Prevent overflow when calculating ulog block size
+
+In kdb_log.c:resize(), log an error and fail if the update size is
+larger than the largest possible block size (2^16-1).
+
+CVE-2025-24528:
+
+In MIT krb5 release 1.7 and later with incremental propagation
+enabled, an authenticated attacker can cause kadmind to write beyond
+the end of the mapped region for the iprop log file, likely causing a
+process crash.
+
+[ghudson@mit.edu: edited commit message and added CVE description]
+
+ticket: 9159 (new)
+tags: pullup
+target_version: 1.21-next
+
+(cherry picked from commit 78ceba024b64d49612375be4a12d1c066b0bfbd0)
+---
+ src/lib/kdb/kdb_log.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c
+index e9b95fce59..c805ebd988 100644
+--- a/src/lib/kdb/kdb_log.c
++++ b/src/lib/kdb/kdb_log.c
+@@ -183,7 +183,7 @@ extend_file_to(int fd, unsigned int new_size)
+  */
+ static krb5_error_code
+ resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd,
+-       unsigned int recsize)
++       unsigned int recsize, const kdb_incr_update_t *upd)
+ {
+     unsigned int new_block, new_size;
+ 
+@@ -195,6 +195,12 @@ resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd,
+     new_block *= ULOG_BLOCK;
+     new_size += ulogentries * new_block;
+ 
++    if (new_block > UINT16_MAX) {
++        syslog(LOG_ERR, _("ulog overflow caused by principal %.*s"),
++               upd->kdb_princ_name.utf8str_t_len,
++               upd->kdb_princ_name.utf8str_t_val);
++        return KRB5_LOG_ERROR;
++    }
+     if (new_size > MAXLOGLEN)
+         return KRB5_LOG_ERROR;
+ 
+@@ -291,7 +297,7 @@ store_update(kdb_log_context *log_ctx, kdb_incr_update_t *upd)
+     recsize = sizeof(kdb_ent_header_t) + upd_size;
+ 
+     if (recsize > ulog->kdb_block) {
+-        retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize);
++        retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize, upd);
+         if (retval)
+             return retval;
+     }
+-- 
+2.48.1
+
diff --git a/0035-Don-t-issue-session-keys-with-deprecated-enctypes.patch b/0035-Don-t-issue-session-keys-with-deprecated-enctypes.patch
new file mode 100644
index 0000000..4c2ba40
--- /dev/null
+++ b/0035-Don-t-issue-session-keys-with-deprecated-enctypes.patch
@@ -0,0 +1,327 @@
+From c617915958a5cb05463713adcf03b6a0e0512ac3 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Fri, 16 Dec 2022 18:31:07 -0500
+Subject: [PATCH] Don't issue session keys with deprecated enctypes
+
+A paper by Tom Tervoort noted that rc4-hmac pre-hashes the input for
+its checksum and GSS operations before applying HMAC, and is therefore
+potentially vulnerable to hash collision attacks if a protocol
+contains a restricted signing oracle.
+
+In light of these potential attacks, begin the functional deprecation
+of DES3 and RC4 by disallowing their use as session key enctypes by
+default.  Add the variables allow_des3 and allow_rc4 in case
+negotiability of these enctypes for session keys needs to be turned
+back on, with the expectation that in future releases the enctypes
+will be more comprehensively deprecated.
+
+ticket: 9081
+(cherry picked from commit 1b57a4d134bbd0e7c52d5885a92eccc815726463)
+---
+ doc/admin/conf_files/krb5_conf.rst | 12 ++++++++++++
+ doc/admin/enctypes.rst             | 23 +++++++++++++++++++---
+ src/include/k5-int.h               |  4 ++++
+ src/kdc/kdc_util.c                 | 10 ++++++++++
+ src/lib/krb5/krb/get_in_tkt.c      | 31 +++++++++++++++++++-----------
+ src/lib/krb5/krb/init_ctx.c        | 10 ++++++++++
+ src/tests/gssapi/t_enctypes.py     |  5 +++--
+ src/tests/t_etype_info.py          |  5 +++--
+ src/tests/t_sesskeynego.py         | 28 +++++++++++++++++++++++++--
+ src/util/k5test.py                 |  9 ++++++++-
+ 10 files changed, 116 insertions(+), 21 deletions(-)
+
+diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
+index dca52e1426..d51fd3ce7e 100644
+--- a/doc/admin/conf_files/krb5_conf.rst
++++ b/doc/admin/conf_files/krb5_conf.rst
+@@ -95,6 +95,18 @@ Additionally, krb5.conf may include any of the relations described in
+ 
+ The libdefaults section may contain any of the following relations:
+ 
++**allow_des3**
++    Permit the KDC to issue tickets with des3-cbc-sha1 session keys.
++    In future releases, this flag will allow des3-cbc-sha1 to be used
++    at all.  The default value for this tag is false.  (Added in
++    release 1.21.)
++
++**allow_rc4**
++    Permit the KDC to issue tickets with arcfour-hmac session keys.
++    In future releases, this flag will allow arcfour-hmac to be used
++    at all.  The default value for this tag is false.  (Added in
++    release 1.21.)
++
+ **allow_weak_crypto**
+     If this flag is set to false, then weak encryption types (as noted
+     in :ref:`Encryption_types` in :ref:`kdc.conf(5)`) will be filtered
+diff --git a/doc/admin/enctypes.rst b/doc/admin/enctypes.rst
+index c4d5499d3b..2b4ed7da0b 100644
+--- a/doc/admin/enctypes.rst
++++ b/doc/admin/enctypes.rst
+@@ -48,12 +48,15 @@ Session key selection
+ The KDC chooses the session key enctype by taking the intersection of
+ its **permitted_enctypes** list, the list of long-term keys for the
+ most recent kvno of the service, and the client's requested list of
+-enctypes.
++enctypes.  Starting in krb5-1.21, all services are assumed to support
++aes256-cts-hmac-sha1-96; also, des3-cbc-sha1 and arcfour-hmac session
++keys will not be issued by default.
+ 
+ Starting in krb5-1.11, it is possible to set a string attribute on a
+ service principal to control what session key enctypes the KDC may
+-issue for service tickets for that principal.  See :ref:`set_string`
+-in :ref:`kadmin(1)` for details.
++issue for service tickets for that principal, overriding the service's
++long-term keys and the assumption of aes256-cts-hmac-sha1-96 support.
++See :ref:`set_string` in :ref:`kadmin(1)` for details.
+ 
+ 
+ Choosing enctypes for a service
+@@ -87,6 +90,20 @@ affect how enctypes are chosen.
+     acceptable risk for your environment and the weak enctypes are
+     required for backward compatibility.
+ 
++**allow_des3**
++    was added in release 1.21 and defaults to *false*.  Unless this
++    flag is set to *true*, the KDC will not issue tickets with
++    des3-cbc-sha1 session keys.  In a future release, this flag will
++    control whether des3-cbc-sha1 is permitted in similar fashion to
++    weak enctypes.
++
++**allow_rc4**
++    was added in release 1.21 and defaults to *false*.  Unless this
++    flag is set to *true*, the KDC will not issue tickets with
++    arcfour-hmac session keys.  In a future release, this flag will
++    control whether arcfour-hmac is permitted in similar fashion to
++    weak enctypes.
++
+ **permitted_enctypes**
+     controls the set of enctypes that a service will permit for
+     session keys and for ticket and authenticator encryption.  The KDC
+diff --git a/src/include/k5-int.h b/src/include/k5-int.h
+index b7789a2dd8..d0a263aa7d 100644
+--- a/src/include/k5-int.h
++++ b/src/include/k5-int.h
+@@ -181,6 +181,8 @@ typedef unsigned char   u_char;
+  * matches the variable name.  Keep these alphabetized. */
+ #define KRB5_CONF_ACL_FILE                     "acl_file"
+ #define KRB5_CONF_ADMIN_SERVER                 "admin_server"
++#define KRB5_CONF_ALLOW_DES3                   "allow_des3"
++#define KRB5_CONF_ALLOW_RC4                    "allow_rc4"
+ #define KRB5_CONF_ALLOW_WEAK_CRYPTO            "allow_weak_crypto"
+ #define KRB5_CONF_AUTH_TO_LOCAL                "auth_to_local"
+ #define KRB5_CONF_AUTH_TO_LOCAL_NAMES          "auth_to_local_names"
+@@ -1241,6 +1243,8 @@ struct _krb5_context {
+     struct _kdb_log_context *kdblog_context;
+ 
+     krb5_boolean allow_weak_crypto;
++    krb5_boolean allow_des3;
++    krb5_boolean allow_rc4;
+     krb5_boolean ignore_acceptor_hostname;
+     krb5_boolean enforce_ok_as_delegate;
+     enum dns_canonhost dns_canonicalize_hostname;
+diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
+index 93415ba862..c7b6e4090d 100644
+--- a/src/kdc/kdc_util.c
++++ b/src/kdc/kdc_util.c
+@@ -1108,6 +1108,16 @@ select_session_keytype(krb5_context context, krb5_db_entry *server,
+         if (!krb5_is_permitted_enctype(context, ktype[i]))
+             continue;
+ 
++        /*
++         * Prevent these deprecated enctypes from being used as session keys
++         * unless they are explicitly allowed.  In the future they will be more
++         * comprehensively disabled and eventually removed.
++         */
++        if (ktype[i] == ENCTYPE_DES3_CBC_SHA1 && !context->allow_des3)
++            continue;
++        if (ktype[i] == ENCTYPE_ARCFOUR_HMAC && !context->allow_rc4)
++            continue;
++
+         if (dbentry_supports_enctype(context, server, ktype[i]))
+             return ktype[i];
+     }
+diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
+index 1b420a3ac2..ea089f0fcc 100644
+--- a/src/lib/krb5/krb/get_in_tkt.c
++++ b/src/lib/krb5/krb/get_in_tkt.c
+@@ -1582,22 +1582,31 @@ warn_pw_expiry(krb5_context context, krb5_get_init_creds_opt *options,
+     (*prompter)(context, data, 0, banner, 0, 0);
+ }
+ 
+-/* Display a warning via the prompter if des3-cbc-sha1 was used for either the
+- * reply key or the session key. */
++/* Display a warning via the prompter if a deprecated enctype was used for
++ * either the reply key or the session key. */
+ static void
+-warn_des3(krb5_context context, krb5_init_creds_context ctx,
+-          krb5_enctype as_key_enctype)
++warn_deprecated(krb5_context context, krb5_init_creds_context ctx,
++                krb5_enctype as_key_enctype)
+ {
+-    const char *banner;
++    krb5_enctype etype;
++    char encbuf[128], banner[256];
+ 
+-    if (as_key_enctype != ENCTYPE_DES3_CBC_SHA1 &&
+-        ctx->cred.keyblock.enctype != ENCTYPE_DES3_CBC_SHA1)
+-        return;
+     if (ctx->prompter == NULL)
+         return;
+ 
+-    banner = _("Warning: encryption type des3-cbc-sha1 used for "
+-               "authentication is weak and will be disabled");
++    if (krb5int_c_deprecated_enctype(as_key_enctype))
++        etype = as_key_enctype;
++    else if (krb5int_c_deprecated_enctype(ctx->cred.keyblock.enctype))
++        etype = ctx->cred.keyblock.enctype;
++    else
++        return;
++
++    if (krb5_enctype_to_name(etype, FALSE, encbuf, sizeof(encbuf)) != 0)
++        return;
++    snprintf(banner, sizeof(banner),
++             _("Warning: encryption type %s used for authentication is "
++               "deprecated and will be disabled"), encbuf);
++
+     /* PROMPTER_INVOCATION */
+     (*ctx->prompter)(context, ctx->prompter_data, NULL, banner, 0, NULL);
+ }
+@@ -1848,7 +1857,7 @@ init_creds_step_reply(krb5_context context,
+     ctx->complete = TRUE;
+     warn_pw_expiry(context, ctx->opt, ctx->prompter, ctx->prompter_data,
+                    ctx->in_tkt_service, ctx->reply);
+-    warn_des3(context, ctx, encrypting_key.enctype);
++    warn_deprecated(context, ctx, encrypting_key.enctype);
+ 
+ cleanup:
+     krb5_free_pa_data(context, kdc_padata);
+diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
+index 582a2945ff..a32f8dbf03 100644
+--- a/src/lib/krb5/krb/init_ctx.c
++++ b/src/lib/krb5/krb/init_ctx.c
+@@ -220,6 +220,16 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
+         goto cleanup;
+     ctx->allow_weak_crypto = tmp;
+ 
++    retval = get_boolean(ctx, KRB5_CONF_ALLOW_DES3, 0, &tmp);
++    if (retval)
++        goto cleanup;
++    ctx->allow_des3 = tmp;
++
++    retval = get_boolean(ctx, KRB5_CONF_ALLOW_RC4, 0, &tmp);
++    if (retval)
++        goto cleanup;
++    ctx->allow_rc4 = tmp;
++
+     retval = get_boolean(ctx, KRB5_CONF_IGNORE_ACCEPTOR_HOSTNAME, 0, &tmp);
+     if (retval)
+         goto cleanup;
+diff --git a/src/tests/gssapi/t_enctypes.py b/src/tests/gssapi/t_enctypes.py
+index 2f95d89967..e6bde47afc 100755
+--- a/src/tests/gssapi/t_enctypes.py
++++ b/src/tests/gssapi/t_enctypes.py
+@@ -10,8 +10,9 @@ d_rc4 = 'DEPRECATED:arcfour-hmac'
+ 
+ # These tests make assumptions about the default enctype lists, so set
+ # them explicitly rather than relying on the library defaults.
+-supp='aes256-cts:normal aes128-cts:normal rc4-hmac:normal'
+-conf = {'libdefaults': {'permitted_enctypes': 'aes rc4'},
++supp='aes256-cts:normal aes128-cts:normal des3-cbc-sha1:normal rc4-hmac:normal'
++conf = {'libdefaults': {'permitted_enctypes': 'aes des3 rc4',
++                        'allow_des3': 'true', 'allow_rc4': 'true'},
+         'realms': {'$realm': {'supported_enctypes': supp}}}
+ realm = K5Realm(krb5_conf=conf)
+ shutil.copyfile(realm.ccache, os.path.join(realm.testdir, 'save'))
+diff --git a/src/tests/t_etype_info.py b/src/tests/t_etype_info.py
+index a6f538b66d..75d9621dd6 100644
+--- a/src/tests/t_etype_info.py
++++ b/src/tests/t_etype_info.py
+@@ -1,7 +1,8 @@
+ from k5test import *
+ 
+-supported_enctypes = 'aes128-cts rc4-hmac'
+-conf = {'realms': {'$realm': {'supported_enctypes': supported_enctypes}}}
++supported_enctypes = 'aes128-cts des3-cbc-sha1 rc4-hmac'
++conf = {'libdefaults': {'allow_des3': 'true', 'allow_rc4': 'true'},
++        'realms': {'$realm': {'supported_enctypes': supported_enctypes}}}
+ realm = K5Realm(create_host=False, get_creds=False, krb5_conf=conf)
+ 
+ realm.run([kadminl, 'addprinc', '-pw', 'pw', '+requires_preauth',
+diff --git a/src/tests/t_sesskeynego.py b/src/tests/t_sesskeynego.py
+index 9024aee838..5a213617b5 100755
+--- a/src/tests/t_sesskeynego.py
++++ b/src/tests/t_sesskeynego.py
+@@ -25,6 +25,8 @@ conf3 = {'libdefaults': {
+         'default_tkt_enctypes': 'aes128-cts',
+         'default_tgs_enctypes': 'rc4-hmac,aes128-cts'}}
+ conf4 = {'libdefaults': {'permitted_enctypes': 'aes256-cts'}}
++conf5 = {'libdefaults': {'allow_rc4': 'true'}}
++conf6 = {'libdefaults': {'allow_des3': 'true'}}
+ # Test with client request and session_enctypes preferring aes128, but
+ # aes256 long-term key.
+ realm = K5Realm(krb5_conf=conf1, create_host=False, get_creds=False)
+@@ -54,10 +56,12 @@ realm.run([kadminl, 'setstr', 'server', 'session_enctypes',
+            'aes128-cts,aes256-cts'])
+ test_kvno(realm, 'aes128-cts-hmac-sha1-96', 'aes256-cts-hmac-sha1-96')
+ 
+-# 3b: Negotiate rc4-hmac session key when principal only has aes256 long-term.
++# 3b: Skip RC4 (as the KDC does not allow it for session keys by
++# default) and negotiate aes128-cts session key, with only an aes256
++# long-term service key.
+ realm.run([kadminl, 'setstr', 'server', 'session_enctypes',
+            'rc4-hmac,aes128-cts,aes256-cts'])
+-test_kvno(realm, 'DEPRECATED:arcfour-hmac', 'aes256-cts-hmac-sha1-96')
++test_kvno(realm, 'aes128-cts-hmac-sha1-96', 'aes256-cts-hmac-sha1-96')
+ realm.stop()
+ 
+ # 4: Check that permitted_enctypes is a default for session key enctypes.
+@@ -67,4 +71,24 @@ realm.run([kvno, 'user'],
+           expected_trace=('etypes requested in TGS request: aes256-cts',))
+ realm.stop()
+ 
++# 5: allow_rc4 permits negotiation of rc4-hmac session key.
++realm = K5Realm(krb5_conf=conf5, create_host=False, get_creds=False)
++realm.run([kadminl, 'addprinc', '-randkey', '-e', 'aes256-cts', 'server'])
++realm.run([kadminl, 'setstr', 'server', 'session_enctypes', 'rc4-hmac'])
++test_kvno(realm, 'DEPRECATED:arcfour-hmac', 'aes256-cts-hmac-sha1-96')
++realm.stop()
++
++# 6: allow_des3 permits negotiation of des3-cbc-sha1 session key.
++realm = K5Realm(krb5_conf=conf6, create_host=False, get_creds=False)
++realm.run([kadminl, 'addprinc', '-randkey', '-e', 'aes256-cts', 'server'])
++realm.run([kadminl, 'setstr', 'server', 'session_enctypes', 'des3-cbc-sha1'])
++test_kvno(realm, 'DEPRECATED:des3-cbc-sha1', 'aes256-cts-hmac-sha1-96')
++realm.stop()
++
++# 7: default config negotiates aes256-sha1 session key for RC4-only service.
++realm = K5Realm(create_host=False, get_creds=False)
++realm.run([kadminl, 'addprinc', '-randkey', '-e', 'rc4-hmac', 'server'])
++test_kvno(realm, 'aes256-cts-hmac-sha1-96', 'DEPRECATED:arcfour-hmac')
++realm.stop()
++
+ success('sesskeynego')
+diff --git a/src/util/k5test.py b/src/util/k5test.py
+index d823653aa0..8e5f5ba8e9 100644
+--- a/src/util/k5test.py
++++ b/src/util/k5test.py
+@@ -1338,9 +1338,16 @@ _passes = [
+     # No special settings; exercises AES256.
+     ('default', None, None, None),
+ 
++    # Exercise the DES3 enctype.
++    ('des3', None,
++     {'libdefaults': {'permitted_enctypes': 'des3 aes256-sha1'}},
++     {'realms': {'$realm': {
++                    'supported_enctypes': 'des3-cbc-sha1:normal',
++                    'master_key_type': 'des3-cbc-sha1'}}}),
++
+     # Exercise the arcfour enctype.
+     ('arcfour', None,
+-     {'libdefaults': {'permitted_enctypes': 'rc4'}},
++     {'libdefaults': {'permitted_enctypes': 'rc4 aes256-sha1'}},
+      {'realms': {'$realm': {
+                     'supported_enctypes': 'arcfour-hmac:normal',
+                     'master_key_type': 'arcfour-hmac'}}}),
+-- 
+2.49.0
+
diff --git a/0036-downstream-Remove-3des-support-cumulative-1.patch b/0036-downstream-Remove-3des-support-cumulative-1.patch
new file mode 100644
index 0000000..4911619
--- /dev/null
+++ b/0036-downstream-Remove-3des-support-cumulative-1.patch
@@ -0,0 +1,260 @@
+From b0993b57dbe584f9308cc7773b930efe76e19ba3 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Fri, 4 Apr 2025 15:08:36 +0200
+Subject: [PATCH] [downstream] Remove 3des support (cumulative 1)
+
+Remove mentions for the triple-DES encryption type which were added
+since the previous downstream patch.
+---
+ README                             | 15 +++++++--------
+ doc/admin/conf_files/krb5_conf.rst |  6 ------
+ doc/admin/enctypes.rst             | 11 ++---------
+ doc/mitK5features.rst              |  5 ++---
+ src/include/k5-int.h               |  2 --
+ src/kdc/kdc_util.c                 |  2 --
+ src/lib/krb5/krb/init_ctx.c        |  5 -----
+ src/man/krb5.conf.man              |  6 ------
+ src/tests/gssapi/t_enctypes.py     |  5 ++---
+ src/tests/t_etype_info.py          |  4 ++--
+ src/tests/t_sesskeynego.py         |  8 --------
+ src/util/k5test.py                 |  7 -------
+ 12 files changed, 15 insertions(+), 61 deletions(-)
+
+diff --git a/README b/README
+index 6d6f7f16e3..9341bd3dd8 100644
+--- a/README
++++ b/README
+@@ -81,11 +81,11 @@ Triple-DES and RC4 transitions
+ ------------------------------
+ 
+ Beginning with the krb5-1.21 release, the KDC will not issue tickets
+-with triple-DES or RC4 session keys unless explicitly configured using
+-the new allow_des3 and allow_rc4 variables in [libdefaults].  To
+-facilitate the negotiation of session keys, the KDC will assume that
+-all services can handle aes256-sha1 session keys unless the service
+-principal has a session_enctypes string attribute.
++with RC4 session keys unless explicitly configured using the new
++allow_rc4 variable in [libdefaults].  To facilitate the negotiation of
++session keys, the KDC will assume that all services can handle
++aes256-sha1 session keys unless the service principal has a
++session_enctypes string attribute.
+ 
+ Beginning with the krb5-1.19 release, a warning will be issued if
+ initial credentials are acquired using the des3-cbc-sha1 encryption
+@@ -164,9 +164,8 @@ Developer experience:
+ 
+ Protocol evolution:
+ 
+-* The KDC will no longer issue tickets with RC4 or triple-DES session
+-  keys unless explicitly configured with the new allow_rc4 or
+-  allow_des3 variables respectively.
++* The KDC will no longer issue tickets with RC4 session keys unless
++  explicitly configured with the new allow_rc4 variable.
+ 
+ * The KDC will assume that all services can handle aes256-sha1 session
+   keys unless the service principal has a session_enctypes string
+diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
+index d51fd3ce7e..d20dcf18e3 100644
+--- a/doc/admin/conf_files/krb5_conf.rst
++++ b/doc/admin/conf_files/krb5_conf.rst
+@@ -95,12 +95,6 @@ Additionally, krb5.conf may include any of the relations described in
+ 
+ The libdefaults section may contain any of the following relations:
+ 
+-**allow_des3**
+-    Permit the KDC to issue tickets with des3-cbc-sha1 session keys.
+-    In future releases, this flag will allow des3-cbc-sha1 to be used
+-    at all.  The default value for this tag is false.  (Added in
+-    release 1.21.)
+-
+ **allow_rc4**
+     Permit the KDC to issue tickets with arcfour-hmac session keys.
+     In future releases, this flag will allow arcfour-hmac to be used
+diff --git a/doc/admin/enctypes.rst b/doc/admin/enctypes.rst
+index 2b4ed7da0b..6ce4638d5e 100644
+--- a/doc/admin/enctypes.rst
++++ b/doc/admin/enctypes.rst
+@@ -49,8 +49,8 @@ The KDC chooses the session key enctype by taking the intersection of
+ its **permitted_enctypes** list, the list of long-term keys for the
+ most recent kvno of the service, and the client's requested list of
+ enctypes.  Starting in krb5-1.21, all services are assumed to support
+-aes256-cts-hmac-sha1-96; also, des3-cbc-sha1 and arcfour-hmac session
+-keys will not be issued by default.
++aes256-cts-hmac-sha1-96; also, arcfour-hmac session keys will not be
++issued by default.
+ 
+ Starting in krb5-1.11, it is possible to set a string attribute on a
+ service principal to control what session key enctypes the KDC may
+@@ -90,13 +90,6 @@ affect how enctypes are chosen.
+     acceptable risk for your environment and the weak enctypes are
+     required for backward compatibility.
+ 
+-**allow_des3**
+-    was added in release 1.21 and defaults to *false*.  Unless this
+-    flag is set to *true*, the KDC will not issue tickets with
+-    des3-cbc-sha1 session keys.  In a future release, this flag will
+-    control whether des3-cbc-sha1 is permitted in similar fashion to
+-    weak enctypes.
+-
+ **allow_rc4**
+     was added in release 1.21 and defaults to *false*.  Unless this
+     flag is set to *true*, the KDC will not issue tickets with
+diff --git a/doc/mitK5features.rst b/doc/mitK5features.rst
+index cad0855724..64d746b0af 100644
+--- a/doc/mitK5features.rst
++++ b/doc/mitK5features.rst
+@@ -659,9 +659,8 @@ Release 1.21
+ 
+ * Protocol evolution:
+ 
+-  - The KDC will no longer issue tickets with RC4 or triple-DES
+-    session keys unless explicitly configured with the new allow_rc4
+-    or allow_des3 variables respectively.
++  - The KDC will no longer issue tickets with RC4 session keys unless
++    explicitly configured with the new allow_rc4 variable.
+ 
+   - The KDC will assume that all services can handle aes256-sha1
+     session keys unless the service principal has a session_enctypes
+diff --git a/src/include/k5-int.h b/src/include/k5-int.h
+index d0a263aa7d..82a763298d 100644
+--- a/src/include/k5-int.h
++++ b/src/include/k5-int.h
+@@ -181,7 +181,6 @@ typedef unsigned char   u_char;
+  * matches the variable name.  Keep these alphabetized. */
+ #define KRB5_CONF_ACL_FILE                     "acl_file"
+ #define KRB5_CONF_ADMIN_SERVER                 "admin_server"
+-#define KRB5_CONF_ALLOW_DES3                   "allow_des3"
+ #define KRB5_CONF_ALLOW_RC4                    "allow_rc4"
+ #define KRB5_CONF_ALLOW_WEAK_CRYPTO            "allow_weak_crypto"
+ #define KRB5_CONF_AUTH_TO_LOCAL                "auth_to_local"
+@@ -1243,7 +1242,6 @@ struct _krb5_context {
+     struct _kdb_log_context *kdblog_context;
+ 
+     krb5_boolean allow_weak_crypto;
+-    krb5_boolean allow_des3;
+     krb5_boolean allow_rc4;
+     krb5_boolean ignore_acceptor_hostname;
+     krb5_boolean enforce_ok_as_delegate;
+diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
+index c7b6e4090d..bafcf5f728 100644
+--- a/src/kdc/kdc_util.c
++++ b/src/kdc/kdc_util.c
+@@ -1113,8 +1113,6 @@ select_session_keytype(krb5_context context, krb5_db_entry *server,
+          * unless they are explicitly allowed.  In the future they will be more
+          * comprehensively disabled and eventually removed.
+          */
+-        if (ktype[i] == ENCTYPE_DES3_CBC_SHA1 && !context->allow_des3)
+-            continue;
+         if (ktype[i] == ENCTYPE_ARCFOUR_HMAC && !context->allow_rc4)
+             continue;
+ 
+diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
+index a32f8dbf03..82aba64c5e 100644
+--- a/src/lib/krb5/krb/init_ctx.c
++++ b/src/lib/krb5/krb/init_ctx.c
+@@ -220,11 +220,6 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
+         goto cleanup;
+     ctx->allow_weak_crypto = tmp;
+ 
+-    retval = get_boolean(ctx, KRB5_CONF_ALLOW_DES3, 0, &tmp);
+-    if (retval)
+-        goto cleanup;
+-    ctx->allow_des3 = tmp;
+-
+     retval = get_boolean(ctx, KRB5_CONF_ALLOW_RC4, 0, &tmp);
+     if (retval)
+         goto cleanup;
+diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
+index 6c0e9aff8c..4b53988712 100644
+--- a/src/man/krb5.conf.man
++++ b/src/man/krb5.conf.man
+@@ -178,12 +178,6 @@ kdc.conf(5), but it is not a recommended practice.
+ The libdefaults section may contain any of the following relations:
+ .INDENT 0.0
+ .TP
+-\fBallow_des3\fP
+-Permit the KDC to issue tickets with des3\-cbc\-sha1 session keys.
+-In future releases, this flag will allow des3\-cbc\-sha1 to be used
+-at all.  The default value for this tag is false.  (Added in
+-release 1.21.)
+-.TP
+ \fBallow_rc4\fP
+ Permit the KDC to issue tickets with arcfour\-hmac session keys.
+ In future releases, this flag will allow arcfour\-hmac to be used
+diff --git a/src/tests/gssapi/t_enctypes.py b/src/tests/gssapi/t_enctypes.py
+index e6bde47afc..1bb8c40b6b 100755
+--- a/src/tests/gssapi/t_enctypes.py
++++ b/src/tests/gssapi/t_enctypes.py
+@@ -10,9 +10,8 @@ d_rc4 = 'DEPRECATED:arcfour-hmac'
+ 
+ # These tests make assumptions about the default enctype lists, so set
+ # them explicitly rather than relying on the library defaults.
+-supp='aes256-cts:normal aes128-cts:normal des3-cbc-sha1:normal rc4-hmac:normal'
+-conf = {'libdefaults': {'permitted_enctypes': 'aes des3 rc4',
+-                        'allow_des3': 'true', 'allow_rc4': 'true'},
++supp='aes256-cts:normal aes128-cts:normal rc4-hmac:normal'
++conf = {'libdefaults': {'permitted_enctypes': 'aes rc4', 'allow_rc4': 'true'},
+         'realms': {'$realm': {'supported_enctypes': supp}}}
+ realm = K5Realm(krb5_conf=conf)
+ shutil.copyfile(realm.ccache, os.path.join(realm.testdir, 'save'))
+diff --git a/src/tests/t_etype_info.py b/src/tests/t_etype_info.py
+index 75d9621dd6..e82ff7ff07 100644
+--- a/src/tests/t_etype_info.py
++++ b/src/tests/t_etype_info.py
+@@ -1,7 +1,7 @@
+ from k5test import *
+ 
+-supported_enctypes = 'aes128-cts des3-cbc-sha1 rc4-hmac'
+-conf = {'libdefaults': {'allow_des3': 'true', 'allow_rc4': 'true'},
++supported_enctypes = 'aes128-cts rc4-hmac'
++conf = {'libdefaults': {'allow_rc4': 'true'},
+         'realms': {'$realm': {'supported_enctypes': supported_enctypes}}}
+ realm = K5Realm(create_host=False, get_creds=False, krb5_conf=conf)
+ 
+diff --git a/src/tests/t_sesskeynego.py b/src/tests/t_sesskeynego.py
+index 5a213617b5..c7dba0ff5b 100755
+--- a/src/tests/t_sesskeynego.py
++++ b/src/tests/t_sesskeynego.py
+@@ -26,7 +26,6 @@ conf3 = {'libdefaults': {
+         'default_tgs_enctypes': 'rc4-hmac,aes128-cts'}}
+ conf4 = {'libdefaults': {'permitted_enctypes': 'aes256-cts'}}
+ conf5 = {'libdefaults': {'allow_rc4': 'true'}}
+-conf6 = {'libdefaults': {'allow_des3': 'true'}}
+ # Test with client request and session_enctypes preferring aes128, but
+ # aes256 long-term key.
+ realm = K5Realm(krb5_conf=conf1, create_host=False, get_creds=False)
+@@ -78,13 +77,6 @@ realm.run([kadminl, 'setstr', 'server', 'session_enctypes', 'rc4-hmac'])
+ test_kvno(realm, 'DEPRECATED:arcfour-hmac', 'aes256-cts-hmac-sha1-96')
+ realm.stop()
+ 
+-# 6: allow_des3 permits negotiation of des3-cbc-sha1 session key.
+-realm = K5Realm(krb5_conf=conf6, create_host=False, get_creds=False)
+-realm.run([kadminl, 'addprinc', '-randkey', '-e', 'aes256-cts', 'server'])
+-realm.run([kadminl, 'setstr', 'server', 'session_enctypes', 'des3-cbc-sha1'])
+-test_kvno(realm, 'DEPRECATED:des3-cbc-sha1', 'aes256-cts-hmac-sha1-96')
+-realm.stop()
+-
+ # 7: default config negotiates aes256-sha1 session key for RC4-only service.
+ realm = K5Realm(create_host=False, get_creds=False)
+ realm.run([kadminl, 'addprinc', '-randkey', '-e', 'rc4-hmac', 'server'])
+diff --git a/src/util/k5test.py b/src/util/k5test.py
+index 8e5f5ba8e9..b953827018 100644
+--- a/src/util/k5test.py
++++ b/src/util/k5test.py
+@@ -1338,13 +1338,6 @@ _passes = [
+     # No special settings; exercises AES256.
+     ('default', None, None, None),
+ 
+-    # Exercise the DES3 enctype.
+-    ('des3', None,
+-     {'libdefaults': {'permitted_enctypes': 'des3 aes256-sha1'}},
+-     {'realms': {'$realm': {
+-                    'supported_enctypes': 'des3-cbc-sha1:normal',
+-                    'master_key_type': 'des3-cbc-sha1'}}}),
+-
+     # Exercise the arcfour enctype.
+     ('arcfour', None,
+      {'libdefaults': {'permitted_enctypes': 'rc4 aes256-sha1'}},
+-- 
+2.49.0
+
diff --git a/0037-Add-PKINIT-paChecksum2-from-MS-PKCA-v20230920.patch b/0037-Add-PKINIT-paChecksum2-from-MS-PKCA-v20230920.patch
new file mode 100644
index 0000000..2d9a6cc
--- /dev/null
+++ b/0037-Add-PKINIT-paChecksum2-from-MS-PKCA-v20230920.patch
@@ -0,0 +1,692 @@
+From 9d03713af124c2096d071ba36893018da8d71655 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Tue, 14 Jan 2025 13:31:11 +0100
+Subject: [PATCH] Add PKINIT paChecksum2 from MS-PKCA v20230920
+
+In 2023, Microsoft updated MS-PKCA to add the optional paChecksum2
+element in the PKAuthenticator sequence.  This checksum accepts SHA-1,
+SHA-256, SHA-384, and SHA-512 digests.
+
+In Windows Server 2025, this checksum becomes mandatory when using
+PKINIT with FFDH (but strangely not with ECDH if SHA-1 is configured as
+allowed).
+
+[ghudson@mit.edu: refactored crypto interfaces to reduce complexity of
+calling code]
+
+ticket: 9166 (new)
+(cherry picked from commit 310793ba63782af5ffa3a95d20e41f8f03ca7e00)
+---
+ src/include/k5-int-pkinit.h                   |  25 ++--
+ src/lib/krb5/asn.1/asn1_k_encode.c            |  18 ++-
+ src/plugins/preauth/pkinit/pkinit.h           |   1 +
+ src/plugins/preauth/pkinit/pkinit_clnt.c      |  41 +++----
+ src/plugins/preauth/pkinit/pkinit_constants.c |  42 +++++--
+ src/plugins/preauth/pkinit/pkinit_crypto.h    |  24 +++-
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 116 +++++++++++++++++-
+ src/plugins/preauth/pkinit/pkinit_kdf_test.c  |   4 +-
+ src/plugins/preauth/pkinit/pkinit_lib.c       |  16 ++-
+ src/plugins/preauth/pkinit/pkinit_srv.c       |  38 ++----
+ src/plugins/preauth/pkinit/pkinit_trace.h     |   5 +-
+ src/tests/asn.1/krb5_decode_test.c            |   2 +-
+ src/tests/asn.1/ktest.c                       |   7 +-
+ src/tests/asn.1/ktest_equal.c                 |   2 +-
+ src/tests/asn.1/pkinit_encode.out             |   2 +-
+ src/tests/asn.1/pkinit_trval.out              |   2 +-
+ 16 files changed, 250 insertions(+), 95 deletions(-)
+
+diff --git a/src/include/k5-int-pkinit.h b/src/include/k5-int-pkinit.h
+index 915904e518..cf6b1f99c5 100644
+--- a/src/include/k5-int-pkinit.h
++++ b/src/include/k5-int-pkinit.h
+@@ -36,21 +36,28 @@
+  * pkinit structures
+  */
+ 
+-/* PKAuthenticator */
+-typedef struct _krb5_pk_authenticator {
+-    krb5_int32      cusec;  /* (0..999999) */
+-    krb5_timestamp  ctime;
+-    krb5_int32      nonce;  /* (0..4294967295) */
+-    krb5_checksum   paChecksum;
+-    krb5_data      *freshnessToken;
+-} krb5_pk_authenticator;
+-
+ /* AlgorithmIdentifier */
+ typedef struct _krb5_algorithm_identifier {
+     krb5_data algorithm;      /* OID */
+     krb5_data parameters; /* Optional */
+ } krb5_algorithm_identifier;
+ 
++/* PAChecksum2 */
++typedef struct _krb5_pachecksum2 {
++    krb5_data checksum;
++    krb5_algorithm_identifier algorithmIdentifier;
++} krb5_pachecksum2;
++
++/* PKAuthenticator */
++typedef struct _krb5_pk_authenticator {
++    krb5_int32        cusec;  /* (0..999999) */
++    krb5_timestamp    ctime;
++    krb5_int32        nonce;  /* (0..4294967295) */
++    krb5_data         paChecksum;
++    krb5_data        *freshnessToken; /* Optional */
++    krb5_pachecksum2 *paChecksum2; /* Optional */
++} krb5_pk_authenticator;
++
+ /** AuthPack from RFC 4556*/
+ typedef struct _krb5_auth_pack {
+     krb5_pk_authenticator       pkAuthenticator;
+diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c
+index 5378b5c23b..cf7b500837 100644
+--- a/src/lib/krb5/asn.1/asn1_k_encode.c
++++ b/src/lib/krb5/asn.1/asn1_k_encode.c
+@@ -1394,20 +1394,30 @@ DEFSEQTYPE(pkinit_supp_pub_info, krb5_pkinit_supp_pub_info,
+ MAKE_ENCODER(encode_krb5_pkinit_supp_pub_info, pkinit_supp_pub_info);
+ MAKE_ENCODER(encode_krb5_sp80056a_other_info, sp80056a_other_info);
+ 
+-/* A krb5_checksum encoded as an OCTET STRING, for PKAuthenticator. */
+-DEFCOUNTEDTYPE(ostring_checksum, krb5_checksum, contents, length, octetstring);
++DEFFIELD(pachecksum2_0, krb5_pachecksum2, checksum, 0, ostring_data);
++DEFFIELD(pachecksum2_1, krb5_pachecksum2, algorithmIdentifier, 1,
++         algorithm_identifier);
++static const struct atype_info *pachecksum2_fields[] = {
++    &k5_atype_pachecksum2_0, &k5_atype_pachecksum2_1
++};
++DEFSEQTYPE(pachecksum2, krb5_pachecksum2, pachecksum2_fields);
++
++DEFPTRTYPE(pachecksum2_ptr, pachecksum2);
++DEFOPTIONALZEROTYPE(opt_pachecksum2_ptr, pachecksum2_ptr);
+ 
+ DEFFIELD(pk_authenticator_0, krb5_pk_authenticator, cusec, 0, int32);
+ DEFFIELD(pk_authenticator_1, krb5_pk_authenticator, ctime, 1, kerberos_time);
+ DEFFIELD(pk_authenticator_2, krb5_pk_authenticator, nonce, 2, int32);
+ DEFFIELD(pk_authenticator_3, krb5_pk_authenticator, paChecksum, 3,
+-         ostring_checksum);
++         ostring_data);
+ DEFFIELD(pk_authenticator_4, krb5_pk_authenticator, freshnessToken, 4,
+          opt_ostring_data_ptr);
++DEFFIELD(pk_authenticator_5, krb5_pk_authenticator, paChecksum2, 5,
++         opt_pachecksum2_ptr);
+ static const struct atype_info *pk_authenticator_fields[] = {
+     &k5_atype_pk_authenticator_0, &k5_atype_pk_authenticator_1,
+     &k5_atype_pk_authenticator_2, &k5_atype_pk_authenticator_3,
+-    &k5_atype_pk_authenticator_4
++    &k5_atype_pk_authenticator_4, &k5_atype_pk_authenticator_5
+ };
+ DEFSEQTYPE(pk_authenticator, krb5_pk_authenticator, pk_authenticator_fields);
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h
+index 7ba7155bb4..a1564b6df2 100644
+--- a/src/plugins/preauth/pkinit/pkinit.h
++++ b/src/plugins/preauth/pkinit/pkinit.h
+@@ -338,6 +338,7 @@ void free_krb5_external_principal_identifier(krb5_external_principal_identifier
+ void free_krb5_algorithm_identifiers(krb5_algorithm_identifier ***in);
+ void free_krb5_algorithm_identifier(krb5_algorithm_identifier *in);
+ void free_krb5_kdc_dh_key_info(krb5_kdc_dh_key_info **in);
++void free_pachecksum2(krb5_context context, krb5_pachecksum2 **in);
+ krb5_error_code pkinit_copy_krb5_data(krb5_data *dst, const krb5_data *src);
+ 
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
+index b08022a214..433f477538 100644
+--- a/src/plugins/preauth/pkinit/pkinit_clnt.c
++++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
+@@ -56,10 +56,9 @@ use_content_info(krb5_context context, pkinit_req_context req,
+ static krb5_error_code
+ pkinit_as_req_create(krb5_context context, pkinit_context plgctx,
+                      pkinit_req_context reqctx, krb5_timestamp ctsec,
+-                     krb5_int32 cusec, krb5_ui_4 nonce,
+-                     const krb5_checksum *cksum,
+-                     krb5_principal client, krb5_principal server,
+-                     krb5_data **as_req);
++                     krb5_int32 cusec, krb5_ui_4 nonce, const krb5_data *cksum,
++                     const krb5_pachecksum2 *cksum2, krb5_principal client,
++                     krb5_principal server, krb5_data **as_req);
+ 
+ static krb5_error_code
+ pkinit_as_rep_parse(krb5_context context, pkinit_context plgctx,
+@@ -89,7 +88,8 @@ pa_pkinit_gen_req(krb5_context context,
+     krb5_timestamp ctsec = 0;
+     krb5_int32 cusec = 0;
+     krb5_ui_4 nonce = 0;
+-    krb5_checksum cksum;
++    krb5_data cksum = empty_data();
++    krb5_pachecksum2 *cksum2 = NULL;
+     krb5_data *der_req = NULL;
+     krb5_pa_data **return_pa_data = NULL;
+ 
+@@ -118,15 +118,10 @@ pa_pkinit_gen_req(krb5_context context,
+         goto cleanup;
+     }
+ 
+-    retval = krb5_c_make_checksum(context, CKSUMTYPE_SHA1, NULL, 0, der_req,
+-                                  &cksum);
++    retval = crypto_generate_checksums(context, der_req, &cksum, &cksum2);
+     if (retval)
+         goto cleanup;
+-    TRACE_PKINIT_CLIENT_REQ_CHECKSUM(context, &cksum);
+-#ifdef DEBUG_CKSUM
+-    pkiDebug("calculating checksum on buf size (%d)\n", der_req->length);
+-    print_buffer(der_req->data, der_req->length);
+-#endif
++    TRACE_PKINIT_CLIENT_REQ_CHECKSUMS(context, &cksum, cksum2);
+ 
+     retval = cb->get_preauth_time(context, rock, TRUE, &ctsec, &cusec);
+     if (retval)
+@@ -140,7 +135,8 @@ pa_pkinit_gen_req(krb5_context context,
+     nonce = request->nonce;
+ 
+     retval = pkinit_as_req_create(context, plgctx, reqctx, ctsec, cusec,
+-                                  nonce, &cksum, request->client, request->server, &out_data);
++                                  nonce, &cksum, cksum2, request->client,
++                                  request->server, &out_data);
+     if (retval) {
+         pkiDebug("error %d on pkinit_as_req_create; aborting PKINIT\n",
+                  (int) retval);
+@@ -168,23 +164,19 @@ pa_pkinit_gen_req(krb5_context context,
+ 
+ cleanup:
+     krb5_free_data(context, der_req);
+-    krb5_free_checksum_contents(context, &cksum);
++    krb5_free_data_contents(context, &cksum);
++    free_pachecksum2(context, &cksum2);
+     krb5_free_data(context, out_data);
+     krb5_free_pa_data(context, return_pa_data);
+     return retval;
+ }
+ 
+ static krb5_error_code
+-pkinit_as_req_create(krb5_context context,
+-                     pkinit_context plgctx,
+-                     pkinit_req_context reqctx,
+-                     krb5_timestamp ctsec,
+-                     krb5_int32 cusec,
+-                     krb5_ui_4 nonce,
+-                     const krb5_checksum * cksum,
+-                     krb5_principal client,
+-                     krb5_principal server,
+-                     krb5_data ** as_req)
++pkinit_as_req_create(krb5_context context, pkinit_context plgctx,
++                     pkinit_req_context reqctx, krb5_timestamp ctsec,
++                     krb5_int32 cusec, krb5_ui_4 nonce, const krb5_data *cksum,
++                     const krb5_pachecksum2 *cksum2, krb5_principal client,
++                     krb5_principal server, krb5_data **as_req)
+ {
+     krb5_error_code retval = ENOMEM;
+     krb5_data spki = empty_data(), *coded_auth_pack = NULL;
+@@ -202,6 +194,7 @@ pkinit_as_req_create(krb5_context context,
+     auth_pack.pkAuthenticator.paChecksum = *cksum;
+     if (!reqctx->opts->disable_freshness)
+         auth_pack.pkAuthenticator.freshnessToken = reqctx->freshness_token;
++    auth_pack.pkAuthenticator.paChecksum2 = (krb5_pachecksum2 *)cksum2;
+     auth_pack.clientDHNonce.length = 0;
+     auth_pack.supportedKDFs = (krb5_data **)supported_kdf_alg_ids;
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit_constants.c b/src/plugins/preauth/pkinit/pkinit_constants.c
+index 905e90d29c..a32b373c32 100644
+--- a/src/plugins/preauth/pkinit/pkinit_constants.c
++++ b/src/plugins/preauth/pkinit/pkinit_constants.c
+@@ -34,25 +34,49 @@
+ 
+ /* RFC 8636 id-pkinit-kdf-ah-sha1: iso(1) identified-organization(3) dod(6)
+  * internet(1) security(5) kerberosv5(2) pkinit(3) kdf(6) sha1(1) */
+-static char sha1_oid[8] = { 0x2B, 0x06, 0x01, 0x05, 0x02, 0x03, 0x06, 0x01 };
++static char kdf_sha1[8] = { 0x2B, 0x06, 0x01, 0x05, 0x02, 0x03, 0x06, 0x01 };
+ /* RFC 8636 id-pkinit-kdf-ah-sha256: iso(1) identified-organization(3) dod(6)
+  * internet(1) security(5) kerberosv5(2) pkinit(3) kdf(6) sha256(2) */
+-static char sha256_oid[8] = { 0x2B, 0x06, 0x01, 0x05, 0x02, 0x03, 0x06, 0x02 };
++static char kdf_sha256[8] = { 0x2B, 0x06, 0x01, 0x05, 0x02, 0x03, 0x06, 0x02 };
+ /* RFC 8636 id-pkinit-kdf-ah-sha512: iso(1) identified-organization(3) dod(6)
+  * internet(1) security(5) kerberosv5(2) pkinit(3) kdf(6) sha512(3) */
+-static char sha512_oid[8] = { 0x2B, 0x06, 0x01, 0x05, 0x02, 0x03, 0x06, 0x03 };
++static char kdf_sha512[8] = { 0x2B, 0x06, 0x01, 0x05, 0x02, 0x03, 0x06, 0x03 };
+ 
+-const krb5_data sha1_id = { KV5M_DATA, sizeof(sha1_oid), sha1_oid };
+-const krb5_data sha256_id = { KV5M_DATA, sizeof(sha256_oid), sha256_oid };
+-const krb5_data sha512_id = { KV5M_DATA, sizeof(sha512_oid), sha512_oid };
++const krb5_data kdf_sha1_id = { KV5M_DATA, sizeof(kdf_sha1), kdf_sha1 };
++const krb5_data kdf_sha256_id = { KV5M_DATA, sizeof(kdf_sha256), kdf_sha256 };
++const krb5_data kdf_sha512_id = { KV5M_DATA, sizeof(kdf_sha512), kdf_sha512 };
+ 
+ krb5_data const * const supported_kdf_alg_ids[] = {
+-    &sha256_id,
+-    &sha1_id,
+-    &sha512_id,
++    &kdf_sha256_id,
++    &kdf_sha1_id,
++    &kdf_sha512_id,
+     NULL
+ };
+ 
++/* RFC 3370 sha-1: iso(1) identified-organization(3) oiw(14) secsig(3)
++ * algorithm(2) 26 */
++static char cms_sha1[] = { 0x2b, 0x0e, 0x03, 0x02, 0x1a };
++/* RFC 5754 id-sha256: joint-iso-itu-t(2) country(16) us(840) organization(1)
++ * gov(101) csor(3) nistalgorithm(4) hashalgs(2) 1 */
++static char cms_sha256[] = {
++    0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01
++};
++/* RFC 5754 id-sha384: joint-iso-itu-t(2) country(16) us(840) organization(1)
++ * gov(101) csor(3) nistalgorithm(4) hashalgs(2) 2 */
++static char cms_sha384[] = {
++    0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02
++};
++/* RFC 5754 id-sha512: joint-iso-itu-t(2) country(16) us(840) organization(1)
++ * gov(101) csor(3) nistalgorithm(4) hashalgs(2) 3 */
++static char cms_sha512[] = {
++    0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03
++};
++
++const krb5_data cms_sha1_id = { KV5M_DATA, sizeof(cms_sha1), cms_sha1 };
++const krb5_data cms_sha256_id = { KV5M_DATA, sizeof(cms_sha256), cms_sha256 };
++const krb5_data cms_sha384_id = { KV5M_DATA, sizeof(cms_sha384), cms_sha384 };
++const krb5_data cms_sha512_id = { KV5M_DATA, sizeof(cms_sha512), cms_sha512 };
++
+ /* RFC 4055 sha256WithRSAEncryption: iso(1) member-body(2) us(840)
+  * rsadsi(113549) pkcs(1) 1 11 */
+ static char sha256WithRSAEncr_oid[9] = {
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h
+index fd876e4850..3b12e904b1 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto.h
++++ b/src/plugins/preauth/pkinit/pkinit_crypto.h
+@@ -562,9 +562,13 @@ pkinit_alg_agility_kdf(krb5_context context,
+                        krb5_data *pk_as_rep,
+                        krb5_keyblock *key_block);
+ 
+-extern const krb5_data sha1_id;
+-extern const krb5_data sha256_id;
+-extern const krb5_data sha512_id;
++extern const krb5_data kdf_sha1_id;
++extern const krb5_data kdf_sha256_id;
++extern const krb5_data kdf_sha512_id;
++extern const krb5_data cms_sha1_id;
++extern const krb5_data cms_sha256_id;
++extern const krb5_data cms_sha384_id;
++extern const krb5_data cms_sha512_id;
+ extern const krb5_data oakley_1024;
+ extern const krb5_data oakley_2048;
+ extern const krb5_data oakley_4096;
+@@ -597,4 +601,18 @@ crypto_req_cert_matching_data(krb5_context context,
+ 
+ int parse_dh_min_bits(krb5_context context, const char *str);
+ 
++/* Generate a SHA-1 checksum over body in *cksum1_out and a SHA-256 checksum
++ * over body in *cksum2_out with appropriate metadata. */
++krb5_error_code
++crypto_generate_checksums(krb5_context context, const krb5_data *body,
++			  krb5_data *cksum1_out,
++			  krb5_pachecksum2 **cksum2_out);
++
++/* Verify the SHA-1 checksum in cksum1 and the tagged checksum in cksum2.
++ * cksum2 may be NULL, in which case only cksum1 is verified. */
++krb5_error_code
++crypto_verify_checksums(krb5_context context, krb5_data *body,
++			const krb5_data *cksum1,
++			const krb5_pachecksum2 *cksum2);
++
+ #endif	/* _PKINIT_CRYPTO_H */
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 402bf1b9b3..429b7d202c 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -2616,11 +2616,11 @@ cleanup:
+ static const EVP_MD *
+ algid_to_md(const krb5_data *alg_id)
+ {
+-    if (data_eq(*alg_id, sha1_id))
++    if (data_eq(*alg_id, kdf_sha1_id))
+         return EVP_sha1();
+-    if (data_eq(*alg_id, sha256_id))
++    if (data_eq(*alg_id, kdf_sha256_id))
+         return EVP_sha256();
+-    if (data_eq(*alg_id, sha512_id))
++    if (data_eq(*alg_id, kdf_sha512_id))
+         return EVP_sha512();
+     return NULL;
+ }
+@@ -5663,3 +5663,113 @@ parse_dh_min_bits(krb5_context context, const char *str)
+     TRACE_PKINIT_DH_INVALID_MIN_BITS(context, str);
+     return PKINIT_DEFAULT_DH_MIN_BITS;
+ }
++
++/* Return the OpenSSL message digest type matching the given CMS OID, or NULL
++ * if it doesn't match any of the CMS OIDs we know about. */
++static const EVP_MD *
++md_from_cms_oid(const krb5_data *alg_id)
++{
++    if (data_eq(*alg_id, cms_sha1_id))
++        return EVP_sha1();
++    if (data_eq(*alg_id, cms_sha256_id))
++        return EVP_sha256();
++    if (data_eq(*alg_id, cms_sha384_id))
++        return EVP_sha384();
++    if (data_eq(*alg_id, cms_sha512_id))
++        return EVP_sha512();
++    return NULL;
++}
++
++/* Compute a message digest of the given type over body, placing the result in
++ * *digest_out in allocated storage.  Return true on success. */
++static krb5_boolean
++make_digest(const krb5_data *body, const EVP_MD *md, krb5_data *digest_out)
++{
++    krb5_error_code ret;
++    krb5_data d;
++
++    if (md == NULL)
++        return FALSE;
++    ret = alloc_data(&d, EVP_MD_size(md));
++    if (ret)
++        return FALSE;
++    if (!EVP_Digest(body->data, body->length, (uint8_t *)d.data, &d.length, md,
++                    NULL)) {
++        free(d.data);
++        return FALSE;
++    }
++    *digest_out = d;
++    return TRUE;
++}
++
++/* Return true if digest verifies for the given body and message digest
++ * type. */
++static krb5_boolean
++check_digest(const krb5_data *body, const EVP_MD *md, const krb5_data *digest)
++{
++    unsigned int digest_len;
++    uint8_t buf[EVP_MAX_MD_SIZE];
++
++    if (md == NULL)
++        return FALSE;
++    if (!EVP_Digest(body->data, body->length, buf, &digest_len, md, NULL))
++        return FALSE;
++    return (digest->length == digest_len &&
++            CRYPTO_memcmp(digest->data, buf, digest_len) == 0);
++}
++
++krb5_error_code
++crypto_generate_checksums(krb5_context context, const krb5_data *body,
++                          krb5_data *cksum1_out, krb5_pachecksum2 **cksum2_out)
++{
++    krb5_data cksum1 = empty_data();
++    krb5_pachecksum2 *cksum2 = NULL;
++    krb5_error_code ret;
++
++    if (!make_digest(body, EVP_sha1(), &cksum1))
++        goto fail;
++
++    cksum2 = k5alloc(sizeof(*cksum2), &ret);
++    if (cksum2 == NULL)
++        goto fail;
++
++    if (!make_digest(body, EVP_sha256(), &cksum2->checksum))
++        goto fail;
++
++    if (krb5int_copy_data_contents(context, &cms_sha256_id,
++                                   &cksum2->algorithmIdentifier.algorithm))
++        goto fail;
++
++    cksum2->algorithmIdentifier.parameters = empty_data();
++
++    *cksum1_out = cksum1;
++    *cksum2_out = cksum2;
++    return 0;
++
++fail:
++    krb5_free_data_contents(context, &cksum1);
++    free_pachecksum2(context, &cksum2);
++    return KRB5_CRYPTO_INTERNAL;
++}
++
++krb5_error_code
++crypto_verify_checksums(krb5_context context, krb5_data *body,
++                        const krb5_data *cksum1,
++                        const krb5_pachecksum2 *cksum2)
++{
++    const EVP_MD *md;
++
++    /* RFC 4556 doesn't say what error to return if the checksum doesn't match.
++     * Windows returns this one. */
++    if (!check_digest(body, EVP_sha1(), cksum1))
++        return KRB5KRB_AP_ERR_MODIFIED;
++
++    if (cksum2 == NULL)
++        return 0;
++
++    md = md_from_cms_oid(&cksum2->algorithmIdentifier.algorithm);
++    if (!check_digest(body, md, &cksum2->checksum))
++        return KRB5KRB_AP_ERR_MODIFIED;
++
++    return 0;
++}
+diff --git a/src/plugins/preauth/pkinit/pkinit_kdf_test.c b/src/plugins/preauth/pkinit/pkinit_kdf_test.c
+index 99c93ac128..dd6e8d7503 100644
+--- a/src/plugins/preauth/pkinit/pkinit_kdf_test.c
++++ b/src/plugins/preauth/pkinit/pkinit_kdf_test.c
+@@ -126,7 +126,7 @@ main(int argc, char **argv)
+ 
+     /* TEST 1:  SHA-1/AES */
+     /* set up algorithm id */
+-    alg_id.algorithm = sha1_id;
++    alg_id.algorithm = kdf_sha1_id;
+ 
+     enctype = enctype_aes;
+ 
+@@ -157,7 +157,7 @@ main(int argc, char **argv)
+ 
+     /* TEST 2: SHA-256/AES */
+     /* set up algorithm id */
+-    alg_id.algorithm = sha256_id;
++    alg_id.algorithm = kdf_sha256_id;
+ 
+     enctype = enctype_aes;
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit_lib.c b/src/plugins/preauth/pkinit/pkinit_lib.c
+index 25965eb5d2..891f47fd26 100644
+--- a/src/plugins/preauth/pkinit/pkinit_lib.c
++++ b/src/plugins/preauth/pkinit/pkinit_lib.c
+@@ -29,6 +29,7 @@
+  * SUCH DAMAGES.
+  */
+ 
++#include "k5-int.h"
+ #include "pkinit.h"
+ 
+ #define FAKECERT
+@@ -119,8 +120,9 @@ free_krb5_auth_pack(krb5_auth_pack **in)
+ {
+     if ((*in) == NULL) return;
+     krb5_free_data_contents(NULL, &(*in)->clientPublicValue);
+-    free((*in)->pkAuthenticator.paChecksum.contents);
++    free((*in)->pkAuthenticator.paChecksum.data);
+     krb5_free_data(NULL, (*in)->pkAuthenticator.freshnessToken);
++    free_pachecksum2(NULL, &(*in)->pkAuthenticator.paChecksum2);
+     if ((*in)->supportedCMSTypes != NULL)
+         free_krb5_algorithm_identifiers(&((*in)->supportedCMSTypes));
+     if ((*in)->supportedKDFs) {
+@@ -196,6 +198,18 @@ free_krb5_kdc_dh_key_info(krb5_kdc_dh_key_info **in)
+     free(*in);
+ }
+ 
++void
++free_pachecksum2(krb5_context context, krb5_pachecksum2 **in)
++{
++    if (*in == NULL)
++        return;
++    krb5_free_data_contents(context, &(*in)->checksum);
++    krb5_free_data_contents(context, &(*in)->algorithmIdentifier.algorithm);
++    krb5_free_data_contents(context, &(*in)->algorithmIdentifier.parameters);
++    free(*in);
++    *in = NULL;
++}
++
+ void
+ init_krb5_pa_pk_as_req(krb5_pa_pk_as_req **in)
+ {
+diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
+index e22bcb195b..f558308483 100644
+--- a/src/plugins/preauth/pkinit/pkinit_srv.c
++++ b/src/plugins/preauth/pkinit/pkinit_srv.c
+@@ -428,11 +428,12 @@ pkinit_server_verify_padata(krb5_context context,
+     krb5_data authp_data = {0, 0, NULL}, krb5_authz = {0, 0, NULL};
+     krb5_pa_pk_as_req *reqp = NULL;
+     krb5_auth_pack *auth_pack = NULL;
++    krb5_pk_authenticator *pka;
+     pkinit_kdc_context plgctx = NULL;
+     pkinit_kdc_req_context reqctx = NULL;
+     krb5_checksum cksum = {0, 0, 0, NULL};
+     krb5_data *der_req = NULL;
+-    krb5_data k5data, *ftoken;
++    krb5_data k5data;
+     int is_signed = 1;
+     krb5_pa_data **e_data = NULL;
+     krb5_kdcpreauth_modreq modreq = NULL;
+@@ -524,8 +525,9 @@ pkinit_server_verify_padata(krb5_context context,
+         pkiDebug("failed to decode krb5_auth_pack\n");
+         goto cleanup;
+     }
++    pka = &auth_pack->pkAuthenticator;
+ 
+-    retval = krb5_check_clockskew(context, auth_pack->pkAuthenticator.ctime);
++    retval = krb5_check_clockskew(context, pka->ctime);
+     if (retval)
+         goto cleanup;
+ 
+@@ -548,36 +550,14 @@ pkinit_server_verify_padata(krb5_context context,
+         goto cleanup;
+     }
+     der_req = cb->request_body(context, rock);
+-    retval = krb5_c_make_checksum(context, CKSUMTYPE_SHA1, NULL, 0, der_req,
+-                                  &cksum);
+-    if (retval) {
+-        pkiDebug("unable to calculate AS REQ checksum\n");
+-        goto cleanup;
+-    }
+-    if (cksum.length != auth_pack->pkAuthenticator.paChecksum.length ||
+-        k5_bcmp(cksum.contents, auth_pack->pkAuthenticator.paChecksum.contents,
+-                cksum.length) != 0) {
+-        pkiDebug("failed to match the checksum\n");
+-#ifdef DEBUG_CKSUM
+-        pkiDebug("calculating checksum on buf size (%d)\n", req_pkt->length);
+-        print_buffer(req_pkt->data, req_pkt->length);
+-        pkiDebug("received checksum type=%d size=%d ",
+-                 auth_pack->pkAuthenticator.paChecksum.checksum_type,
+-                 auth_pack->pkAuthenticator.paChecksum.length);
+-        print_buffer(auth_pack->pkAuthenticator.paChecksum.contents,
+-                     auth_pack->pkAuthenticator.paChecksum.length);
+-        pkiDebug("expected checksum type=%d size=%d ",
+-                 cksum.checksum_type, cksum.length);
+-        print_buffer(cksum.contents, cksum.length);
+-#endif
+ 
+-        retval = KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED;
++    retval = crypto_verify_checksums(context, der_req, &pka->paChecksum,
++                                     pka->paChecksum2);
++    if (retval)
+         goto cleanup;
+-    }
+ 
+-    ftoken = auth_pack->pkAuthenticator.freshnessToken;
+-    if (ftoken != NULL) {
+-        retval = cb->check_freshness_token(context, rock, ftoken);
++    if (pka->freshnessToken != NULL) {
++        retval = cb->check_freshness_token(context, rock, pka->freshnessToken);
+         if (retval)
+             goto cleanup;
+         valid_freshness_token = TRUE;
+diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
+index 1faa6816d7..7b68d4b3b1 100644
+--- a/src/plugins/preauth/pkinit/pkinit_trace.h
++++ b/src/plugins/preauth/pkinit/pkinit_trace.h
+@@ -58,8 +58,9 @@
+     TRACE(c, "PKINIT client verified DH reply")
+ #define TRACE_PKINIT_CLIENT_REP_DH_FAIL(c)              \
+     TRACE(c, "PKINIT client could not verify DH reply")
+-#define TRACE_PKINIT_CLIENT_REQ_CHECKSUM(c, cksum)                      \
+-    TRACE(c, "PKINIT client computed kdc-req-body checksum {cksum}", cksum)
++#define TRACE_PKINIT_CLIENT_REQ_CHECKSUMS(c, ck1, ck2)                  \
++    TRACE(c, "PKINIT client computed checksums: {hexdata} {hexdata}",   \
++          ck1, &(ck2)->checksum)
+ #define TRACE_PKINIT_CLIENT_REQ_DH(c)                           \
+     TRACE(c, "PKINIT client making DH request")
+ #define TRACE_PKINIT_CLIENT_SAN_CONFIG_DNSNAME(c, host)                 \
+diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
+index 2fa6dce8eb..f47849abad 100644
+--- a/src/tests/asn.1/krb5_decode_test.c
++++ b/src/tests/asn.1/krb5_decode_test.c
+@@ -1174,7 +1174,7 @@ main(int argc, char **argv)
+     /* decode_krb5_auth_pack */
+     {
+         setup(krb5_auth_pack,ktest_make_sample_auth_pack);
+-        decode_run("krb5_auth_pack","","30 81 85 A0 35 30 33 A0 05 02 03 01 E2 40 A1 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A2 03 02 01 2A A3 06 04 04 31 32 33 34 A4 0A 04 08 6B 72 62 35 64 61 74 61 A1 08 04 06 70 76 61 6C 75 65 A2 24 30 22 30 13 06 09 2A 86 48 86 F7 12 01 02 02 04 06 70 61 72 61 6D 73 30 0B 06 09 2A 86 48 86 F7 12 01 02 02 A3 0A 04 08 6B 72 62 35 64 61 74 61 A4 10 30 0E 30 0C A0 0A 06 08 6B 72 62 35 64 61 74 61",
++        decode_run("krb5_auth_pack","","30 81 89 A0 39 30 37 A0 05 02 03 01 E2 40 A1 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A2 03 02 01 2A A3 0A 04 08 6B 72 62 35 64 61 74 61 A4 0A 04 08 6B 72 62 35 64 61 74 61 A1 08 04 06 70 76 61 6C 75 65 A2 24 30 22 30 13 06 09 2A 86 48 86 F7 12 01 02 02 04 06 70 61 72 61 6D 73 30 0B 06 09 2A 86 48 86 F7 12 01 02 02 A3 0A 04 08 6B 72 62 35 64 61 74 61 A4 10 30 0E 30 0C A0 0A 06 08 6B 72 62 35 64 61 74 61",
+                    acc.decode_krb5_auth_pack,
+                    ktest_equal_auth_pack,ktest_free_auth_pack);
+         ktest_empty_auth_pack(&ref);
+diff --git a/src/tests/asn.1/ktest.c b/src/tests/asn.1/ktest.c
+index d37e4fa7e6..7f54aa3184 100644
+--- a/src/tests/asn.1/ktest.c
++++ b/src/tests/asn.1/ktest.c
+@@ -700,9 +700,7 @@ ktest_make_sample_pk_authenticator(krb5_pk_authenticator *p)
+     p->cusec = SAMPLE_USEC;
+     p->ctime = SAMPLE_TIME;
+     p->nonce = SAMPLE_NONCE;
+-    ktest_make_sample_checksum(&p->paChecksum);
+-    /* We don't encode the checksum type, only the contents. */
+-    p->paChecksum.checksum_type = 0;
++    ktest_make_sample_data(&p->paChecksum);
+     p->freshnessToken = ealloc(sizeof(krb5_data));
+     ktest_make_sample_data(p->freshnessToken);
+ }
+@@ -1604,8 +1602,7 @@ ktest_empty_pa_otp_req(krb5_pa_otp_req *p)
+ static void
+ ktest_empty_pk_authenticator(krb5_pk_authenticator *p)
+ {
+-    ktest_empty_checksum(&p->paChecksum);
+-    p->paChecksum.contents = NULL;
++    ktest_empty_data(&p->paChecksum);
+     krb5_free_data(NULL, p->freshnessToken);
+     p->freshnessToken = NULL;
+ }
+diff --git a/src/tests/asn.1/ktest_equal.c b/src/tests/asn.1/ktest_equal.c
+index b48a0285d2..13786dd1e5 100644
+--- a/src/tests/asn.1/ktest_equal.c
++++ b/src/tests/asn.1/ktest_equal.c
+@@ -844,7 +844,7 @@ ktest_equal_pk_authenticator(krb5_pk_authenticator *ref,
+     p = p && scalar_equal(cusec);
+     p = p && scalar_equal(ctime);
+     p = p && scalar_equal(nonce);
+-    p = p && struct_equal(paChecksum, ktest_equal_checksum);
++    p = p && data_eq(ref->paChecksum, var->paChecksum);
+     return p;
+ }
+ 
+diff --git a/src/tests/asn.1/pkinit_encode.out b/src/tests/asn.1/pkinit_encode.out
+index 6ec7aaa36a..a764182e15 100644
+--- a/src/tests/asn.1/pkinit_encode.out
++++ b/src/tests/asn.1/pkinit_encode.out
+@@ -1,7 +1,7 @@
+ encode_krb5_pa_pk_as_req: 30 38 80 08 6B 72 62 35 64 61 74 61 A1 22 30 20 30 1E 80 08 6B 72 62 35 64 61 74 61 81 08 6B 72 62 35 64 61 74 61 82 08 6B 72 62 35 64 61 74 61 82 08 6B 72 62 35 64 61 74 61
+ encode_krb5_pa_pk_as_rep(dhInfo): A0 28 30 26 80 08 6B 72 62 35 64 61 74 61 A1 0A 04 08 6B 72 62 35 64 61 74 61 A2 0E 30 0C A0 0A 06 08 6B 72 62 35 64 61 74 61
+ encode_krb5_pa_pk_as_rep(encKeyPack): 81 08 6B 72 62 35 64 61 74 61
+-encode_krb5_auth_pack: 30 81 85 A0 35 30 33 A0 05 02 03 01 E2 40 A1 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A2 03 02 01 2A A3 06 04 04 31 32 33 34 A4 0A 04 08 6B 72 62 35 64 61 74 61 A1 08 04 06 70 76 61 6C 75 65 A2 24 30 22 30 13 06 09 2A 86 48 86 F7 12 01 02 02 04 06 70 61 72 61 6D 73 30 0B 06 09 2A 86 48 86 F7 12 01 02 02 A3 0A 04 08 6B 72 62 35 64 61 74 61 A4 10 30 0E 30 0C A0 0A 06 08 6B 72 62 35 64 61 74 61
++encode_krb5_auth_pack: 30 81 89 A0 39 30 37 A0 05 02 03 01 E2 40 A1 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A2 03 02 01 2A A3 0A 04 08 6B 72 62 35 64 61 74 61 A4 0A 04 08 6B 72 62 35 64 61 74 61 A1 08 04 06 70 76 61 6C 75 65 A2 24 30 22 30 13 06 09 2A 86 48 86 F7 12 01 02 02 04 06 70 61 72 61 6D 73 30 0B 06 09 2A 86 48 86 F7 12 01 02 02 A3 0A 04 08 6B 72 62 35 64 61 74 61 A4 10 30 0E 30 0C A0 0A 06 08 6B 72 62 35 64 61 74 61
+ encode_krb5_kdc_dh_key_info: 30 25 A0 0B 03 09 00 6B 72 62 35 64 61 74 61 A1 03 02 01 2A A2 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A
+ encode_krb5_reply_key_pack: 30 26 A0 13 30 11 A0 03 02 01 01 A1 0A 04 08 31 32 33 34 35 36 37 38 A1 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34
+ encode_krb5_sp80056a_other_info: 30 81 81 30 0B 06 09 2A 86 48 86 F7 12 01 02 02 A0 32 04 30 30 2E A0 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 A1 1A 30 18 A0 03 02 01 01 A1 11 30 0F 1B 06 68 66 74 73 61 69 1B 05 65 78 74 72 61 A1 32 04 30 30 2E A0 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 A1 1A 30 18 A0 03 02 01 01 A1 11 30 0F 1B 06 68 66 74 73 61 69 1B 05 65 78 74 72 61 A2 0A 04 08 6B 72 62 35 64 61 74 61
+diff --git a/src/tests/asn.1/pkinit_trval.out b/src/tests/asn.1/pkinit_trval.out
+index 46f4a34108..c47bd71f67 100644
+--- a/src/tests/asn.1/pkinit_trval.out
++++ b/src/tests/asn.1/pkinit_trval.out
+@@ -38,7 +38,7 @@ encode_krb5_auth_pack:
+ .  .  [0] [Integer] 123456
+ .  .  [1] [Generalized Time] "19940610060317Z"
+ .  .  [2] [Integer] 42
+-.  .  [3] [Octet String] "1234"
++.  .  [3] [Octet String] "krb5data"
+ .  .  [4] [Octet String] "krb5data"
+ .  [1] [Octet String] "pvalue"
+ .  [2] [Sequence/Sequence Of]
+-- 
+2.49.0
+
diff --git a/0038-downstream-Do-not-block-HMAC-MD4-5-in-FIPS-mode.patch b/0038-downstream-Do-not-block-HMAC-MD4-5-in-FIPS-mode.patch
new file mode 100644
index 0000000..4b49867
--- /dev/null
+++ b/0038-downstream-Do-not-block-HMAC-MD4-5-in-FIPS-mode.patch
@@ -0,0 +1,381 @@
+From 33afd2a6cfdf87d153170b41fbabfb92be49c422 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 10 Apr 2025 10:04:22 +0200
+Subject: [PATCH] [downstream] Do not block HMAC-MD4/5 in FIPS mode
+
+To ensure RC4 HMAC-MD5 was not used in FIPS mode, access to HMAC-MD4/5
+was not allowed in this mode. However, since we provide the
+"radius_md5_fips_override" configuration parameter to allow using RADIUS
+regardless to the FIPS restrictions, we should allow HMAC-MD5 to be used
+too in this case, because it is required for the newly supported
+Message-Authenticator attribute.
+
+A FIPS mode check is added in calculate_mac() which will fail if
+"radius_md5_fips_override" is not true. It will not affect interactions
+between krb5kdc and ipa-otpd, because the Message-Authenticator
+attribute is not generated in this case.
+---
+ src/lib/crypto/krb/crypto_int.h               |  9 +++
+ src/lib/crypto/openssl/Makefile.in            |  9 ++-
+ src/lib/crypto/openssl/common.c               | 80 +++++++++++++++++++
+ .../crypto/openssl/hash_provider/hash_evp.c   | 62 ++------------
+ src/lib/crypto/openssl/hmac.c                 | 15 ++--
+ src/lib/krad/packet.c                         | 19 +++--
+ 6 files changed, 120 insertions(+), 74 deletions(-)
+ create mode 100644 src/lib/crypto/openssl/common.c
+
+diff --git a/src/lib/crypto/krb/crypto_int.h b/src/lib/crypto/krb/crypto_int.h
+index 1ee4b30e02..ff67b6bd35 100644
+--- a/src/lib/crypto/krb/crypto_int.h
++++ b/src/lib/crypto/krb/crypto_int.h
+@@ -36,6 +36,9 @@
+ 
+ #include <openssl/opensslv.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
++
++#include <openssl/provider.h>
++
+ /*
+  * OpenSSL 3.0 relegates MD4 and RC4 to the legacy provider, which must be
+  * explicitly loaded into a library context.  Performing this loading within a
+@@ -660,4 +663,10 @@ iov_cursor_advance(struct iov_cursor *c, size_t nblocks)
+     c->out_pos += nblocks * c->block_size;
+ }
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++
++krb5_error_code k5_get_ossl_legacy_libctx(OSSL_LIB_CTX **libctx);
++
++#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
++
+ #endif /* CRYPTO_INT_H */
+diff --git a/src/lib/crypto/openssl/Makefile.in b/src/lib/crypto/openssl/Makefile.in
+index 8e4cdb8bbf..cc131000bd 100644
+--- a/src/lib/crypto/openssl/Makefile.in
++++ b/src/lib/crypto/openssl/Makefile.in
+@@ -8,21 +8,24 @@ STLIBOBJS=\
+ 	hmac.o	\
+ 	kdf.o	\
+ 	pbkdf2.o \
+-	sha256.o
++	sha256.o \
++	common.o
+ 
+ OBJS=\
+ 	$(OUTPRE)cmac.$(OBJEXT)	\
+ 	$(OUTPRE)hmac.$(OBJEXT)	\
+ 	$(OUTPRE)kdf.$(OBJEXT)	\
+ 	$(OUTPRE)pbkdf2.$(OBJEXT) \
+-	$(OUTPRE)sha256.$(OBJEXT)
++	$(OUTPRE)sha256.$(OBJEXT) \
++	$(OUTPRE)common.$(OBJEXT)
+ 
+ SRCS=\
+ 	$(srcdir)/cmac.c	\
+ 	$(srcdir)/hmac.c	\
+ 	$(srcdir)/kdf.c		\
+ 	$(srcdir)/pbkdf2.c	\
+-	$(srcdir)/sha256.c
++	$(srcdir)/sha256.c	\
++	$(srcdir)/common.c
+ 
+ SUBDIROBJLISTS= md4/OBJS.ST 		\
+ 		md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST 	\
+diff --git a/src/lib/crypto/openssl/common.c b/src/lib/crypto/openssl/common.c
+new file mode 100644
+index 0000000000..ced43fd54c
+--- /dev/null
++++ b/src/lib/crypto/openssl/common.c
+@@ -0,0 +1,80 @@
++#include "crypto_int.h"
++
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++
++#include <openssl/provider.h>
++#include <openssl/fips.h>
++#include <threads.h>
++#include <stdbool.h>
++
++typedef struct ossl_legacy_context {
++    bool initialized;
++    OSSL_LIB_CTX *libctx;
++    OSSL_PROVIDER *default_provider;
++    OSSL_PROVIDER *legacy_provider;
++} ossl_legacy_context_t;
++
++static thread_local ossl_legacy_context_t g_ossl_legacy_ctx;
++
++static krb5_error_code
++init_ossl_legacy_ctx(ossl_legacy_context_t *ctx)
++{
++    ctx->libctx = OSSL_LIB_CTX_new();
++    if (!ctx->libctx)
++        return KRB5_CRYPTO_INTERNAL;
++
++    /* Load both legacy and default provider as both may be needed. */
++    ctx->default_provider = OSSL_PROVIDER_load(ctx->libctx, "default");
++    ctx->legacy_provider = OSSL_PROVIDER_load(ctx->libctx, "legacy");
++
++    if (!(ctx->default_provider && ctx->legacy_provider))
++        return KRB5_CRYPTO_INTERNAL;
++
++    ctx->initialized = true;
++    return 0;
++}
++
++static void
++deinit_ossl_legacy_ctx(ossl_legacy_context_t *ctx)
++{
++    if (ctx->legacy_provider)
++        OSSL_PROVIDER_unload(ctx->legacy_provider);
++
++    if (ctx->default_provider)
++        OSSL_PROVIDER_unload(ctx->default_provider);
++
++    if (ctx->libctx)
++        OSSL_LIB_CTX_free(ctx->libctx);
++
++    ctx->initialized = false;
++}
++
++krb5_error_code
++k5_get_ossl_legacy_libctx(OSSL_LIB_CTX **libctx)
++{
++    krb5_error_code err;
++
++    if (!FIPS_mode()) {
++        if (libctx)
++            *libctx = NULL;
++        err = 0;
++        goto end;
++    }
++
++    if (!g_ossl_legacy_ctx.initialized) {
++        err = init_ossl_legacy_ctx(&g_ossl_legacy_ctx);
++        if (err) {
++            deinit_ossl_legacy_ctx(&g_ossl_legacy_ctx);
++            goto end;
++        }
++    }
++
++    if (libctx)
++        *libctx = g_ossl_legacy_ctx.libctx;
++    err = 0;
++
++end:
++    return err;
++}
++
++#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
+diff --git a/src/lib/crypto/openssl/hash_provider/hash_evp.c b/src/lib/crypto/openssl/hash_provider/hash_evp.c
+index eb2e693e9f..2fd5d383d6 100644
+--- a/src/lib/crypto/openssl/hash_provider/hash_evp.c
++++ b/src/lib/crypto/openssl/hash_provider/hash_evp.c
+@@ -44,48 +44,7 @@
+ #define EVP_MD_CTX_free EVP_MD_CTX_destroy
+ #endif
+ 
+-#include <openssl/provider.h>
+ #include <openssl/fips.h>
+-#include <threads.h>
+-
+-typedef struct ossl_lib_md_context {
+-    OSSL_LIB_CTX *libctx;
+-    OSSL_PROVIDER *default_provider;
+-    OSSL_PROVIDER *legacy_provider;
+-} ossl_md_context_t;
+-
+-static thread_local ossl_md_context_t *ossl_md_ctx = NULL;
+-
+-static krb5_error_code
+-init_ossl_md_ctx(ossl_md_context_t *ctx, const char *algo)
+-{
+-    ctx->libctx = OSSL_LIB_CTX_new();
+-    if (!ctx->libctx)
+-        return KRB5_CRYPTO_INTERNAL;
+-
+-    /* Load both legacy and default provider as both may be needed. */
+-    ctx->default_provider = OSSL_PROVIDER_load(ctx->libctx, "default");
+-    ctx->legacy_provider = OSSL_PROVIDER_load(ctx->libctx, "legacy");
+-
+-    if (!(ctx->default_provider && ctx->legacy_provider))
+-        return KRB5_CRYPTO_INTERNAL;
+-
+-    return 0;
+-}
+-
+-static void
+-deinit_ossl_ctx(ossl_md_context_t *ctx)
+-{
+-    if (ctx->legacy_provider)
+-        OSSL_PROVIDER_unload(ctx->legacy_provider);
+-
+-    if (ctx->default_provider)
+-        OSSL_PROVIDER_unload(ctx->default_provider);
+-
+-    if (ctx->libctx)
+-        OSSL_LIB_CTX_free(ctx->libctx);
+-}
+-
+ 
+ static krb5_error_code
+ hash_evp(const EVP_MD *type, const krb5_crypto_iov *data, size_t num_data,
+@@ -120,25 +79,14 @@ hash_legacy_evp(const char *algo, const krb5_crypto_iov *data, size_t num_data,
+                 krb5_data *output)
+ {
+     krb5_error_code err;
++    OSSL_LIB_CTX *ossl_libctx;
+     EVP_MD *md = NULL;
+ 
+-    if (!ossl_md_ctx) {
+-        ossl_md_ctx = malloc(sizeof(ossl_md_context_t));
+-        if (!ossl_md_ctx) {
+-            err = ENOMEM;
+-            goto end;
+-        }
+-
+-        err = init_ossl_md_ctx(ossl_md_ctx, algo);
+-        if (err) {
+-            deinit_ossl_ctx(ossl_md_ctx);
+-            free(ossl_md_ctx);
+-            ossl_md_ctx = NULL;
+-            goto end;
+-        }
+-    }
++    err = k5_get_ossl_legacy_libctx(&ossl_libctx);
++    if (err)
++        goto end;
+ 
+-    md = EVP_MD_fetch(ossl_md_ctx->libctx, algo, NULL);
++    md = EVP_MD_fetch(ossl_libctx, algo, NULL);
+     if (!md) {
+         err = KRB5_CRYPTO_INTERNAL;
+         goto end;
+diff --git a/src/lib/crypto/openssl/hmac.c b/src/lib/crypto/openssl/hmac.c
+index 25a419d73a..8f9e88fec9 100644
+--- a/src/lib/crypto/openssl/hmac.c
++++ b/src/lib/crypto/openssl/hmac.c
+@@ -59,7 +59,6 @@
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #include <openssl/params.h>
+ #include <openssl/core_names.h>
+-#include <openssl/fips.h>
+ #else
+ #include <openssl/hmac.h>
+ #endif
+@@ -112,11 +111,7 @@ map_digest(const struct krb5_hash_provider *hash)
+         return EVP_sha256();
+     else if (hash == &krb5int_hash_sha384)
+         return EVP_sha384();
+-
+-    if (FIPS_mode())
+-        return NULL;
+-
+-    if (hash == &krb5int_hash_md5)
++    else if (hash == &krb5int_hash_md5)
+         return EVP_md5();
+     else if (hash == &krb5int_hash_md4)
+         return EVP_md4();
+@@ -138,13 +133,19 @@ krb5int_hmac_keyblock(const struct krb5_hash_provider *hash,
+     EVP_MAC_CTX *ctx = NULL;
+     OSSL_PARAM params[2], *p = params;
+     size_t i = 0, md_len;
++    OSSL_LIB_CTX *ossl_libctx;
++    krb5_error_code err;
+ 
+     if (md == NULL || keyblock->length > hash->blocksize)
+         return KRB5_CRYPTO_INTERNAL;
+     if (output->length < hash->hashsize)
+         return KRB5_BAD_MSIZE;
+ 
+-    mac = EVP_MAC_fetch(NULL, "HMAC", NULL);
++    err = k5_get_ossl_legacy_libctx(&ossl_libctx);
++    if (err)
++        return err;
++
++    mac = EVP_MAC_fetch(ossl_libctx, "HMAC", NULL);
+     if (mac == NULL)
+         return KRB5_CRYPTO_INTERNAL;
+ 
+diff --git a/src/lib/krad/packet.c b/src/lib/krad/packet.c
+index 3c1a4d507e..b95c99df65 100644
+--- a/src/lib/krad/packet.c
++++ b/src/lib/krad/packet.c
+@@ -278,7 +278,7 @@ lookup_msgauth_addr(const krad_packet *pkt)
+  * auth, which may be from pkt or from a corresponding request.
+  */
+ static krb5_error_code
+-calculate_mac(const char *secret, const krad_packet *pkt,
++calculate_mac(krb5_context ctx, const char *secret, const krad_packet *pkt,
+               const uint8_t auth[AUTH_FIELD_SIZE],
+               uint8_t mac_out[MD5_DIGEST_SIZE])
+ {
+@@ -288,6 +288,10 @@ calculate_mac(const char *secret, const krad_packet *pkt,
+     krb5_crypto_iov input[5];
+     krb5_data ksecr, mac;
+ 
++    /* Do not use HMAC-MD5 if not explicitly allowed */
++    if (kr_use_fips(ctx))
++        return KRB5_CRYPTO_INTERNAL;
++
+     msgauth_attr = lookup_msgauth_addr(pkt);
+     if (msgauth_attr == NULL)
+         return EINVAL;
+@@ -393,7 +397,8 @@ krad_packet_new_request(krb5_context ctx, const char *secret, krad_code code,
+ 
+     if (msgauth_required) {
+         /* Calculate and set the Message-Authenticator MAC. */
+-        retval = calculate_mac(secret, pkt, pkt_auth(pkt), pkt_attr(pkt) + 2);
++        retval = calculate_mac(ctx, secret, pkt, pkt_auth(pkt),
++                               pkt_attr(pkt) + 2);
+         if (retval != 0)
+             goto error;
+     }
+@@ -454,7 +459,7 @@ krad_packet_new_response(krb5_context ctx, const char *secret, krad_code code,
+          * section 5.14, use the authenticator from the request, not from the
+          * response.
+          */
+-        retval = calculate_mac(secret, pkt, pkt_auth(request),
++        retval = calculate_mac(ctx, secret, pkt, pkt_auth(request),
+                                pkt_attr(pkt) + 2);
+         if (retval != 0)
+             goto error;
+@@ -476,7 +481,7 @@ error:
+ /* Verify the Message-Authenticator value in pkt, using the provided
+  * authenticator (which may be from pkt or from a corresponding request). */
+ static krb5_error_code
+-verify_msgauth(const char *secret, const krad_packet *pkt,
++verify_msgauth(krb5_context ctx, const char *secret, const krad_packet *pkt,
+                const uint8_t auth[AUTH_FIELD_SIZE])
+ {
+     uint8_t mac[MD5_DIGEST_SIZE];
+@@ -488,7 +493,7 @@ verify_msgauth(const char *secret, const krad_packet *pkt,
+     if (msgauth == NULL)
+         return ENODATA;
+ 
+-    retval = calculate_mac(secret, pkt, auth, mac);
++    retval = calculate_mac(ctx, secret, pkt, auth, mac);
+     if (retval)
+         return retval;
+ 
+@@ -561,7 +566,7 @@ krad_packet_decode_request(krb5_context ctx, const char *secret,
+ 
+     /* Verify Message-Authenticator if present. */
+     if (has_pkt_msgauth(req)) {
+-        retval = verify_msgauth(secret, req, pkt_auth(req));
++        retval = verify_msgauth(ctx, secret, req, pkt_auth(req));
+         if (retval) {
+             krad_packet_free(req);
+             return retval;
+@@ -613,7 +618,7 @@ krad_packet_decode_response(krb5_context ctx, const char *secret,
+ 
+             /* Verify Message-Authenticator if present. */
+             if (has_pkt_msgauth(*rsppkt)) {
+-                if (verify_msgauth(secret, *rsppkt, pkt_auth(tmp)) != 0)
++                if (verify_msgauth(ctx, secret, *rsppkt, pkt_auth(tmp)) != 0)
+                     continue;
+             }
+ 
+-- 
+2.49.0
+
diff --git a/0039-Fix-strchr-conformance-to-C23.patch b/0039-Fix-strchr-conformance-to-C23.patch
new file mode 100644
index 0000000..ed2cfa7
--- /dev/null
+++ b/0039-Fix-strchr-conformance-to-C23.patch
@@ -0,0 +1,189 @@
+From 1761e06398e4f043e4f540f57131c37fcc53a1b9 Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Wed, 10 Dec 2025 10:42:02 +0200
+Subject: [PATCH] Fix strchr() conformance to C23
+
+C23 7.28.5.1 specifies search functions such as strchr() as generic,
+returning const char * if the first argument is of type const char *.
+Fix uses of strchr() to conform to this change.
+
+[jrische@redhat.com: altered changes to avoid casts; fixed an
+additional case]
+[ghudson@mit.edu: condensed some declarations; rewrote commit message]
+
+ticket: 9191 (new)
+(cherry picked from commit 6cd8580d823585d50ee4f30efd9f7e855823a369)
+---
+ src/lib/krb5/ccache/ccbase.c                      |  4 ++--
+ src/lib/krb5/os/expand_path.c                     |  3 ++-
+ src/lib/krb5/os/locate_kdc.c                      | 15 +++++++--------
+ src/plugins/preauth/pkinit/pkinit_crypto.h        |  2 +-
+ .../preauth/pkinit/pkinit_crypto_openssl.c        |  6 +++---
+ src/plugins/preauth/pkinit/pkinit_identity.c      |  2 +-
+ src/plugins/preauth/pkinit/pkinit_matching.c      |  2 +-
+ src/tests/responder.c                             |  3 +--
+ 8 files changed, 18 insertions(+), 19 deletions(-)
+
+diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
+index 5a01320832..1aada91b5e 100644
+--- a/src/lib/krb5/ccache/ccbase.c
++++ b/src/lib/krb5/ccache/ccbase.c
+@@ -201,8 +201,8 @@ krb5_cc_register(krb5_context context, const krb5_cc_ops *ops,
+ krb5_error_code KRB5_CALLCONV
+ krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache)
+ {
+-    char *pfx, *cp;
+-    const char *resid;
++    char *pfx;
++    const char *cp, *resid;
+     unsigned int pfxlen;
+     krb5_error_code err;
+     const krb5_cc_ops *ops;
+diff --git a/src/lib/krb5/os/expand_path.c b/src/lib/krb5/os/expand_path.c
+index 5cbccf08c8..6569b8820b 100644
+--- a/src/lib/krb5/os/expand_path.c
++++ b/src/lib/krb5/os/expand_path.c
+@@ -454,7 +454,8 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in,
+ {
+     krb5_error_code ret;
+     struct k5buf buf;
+-    char *tok_begin, *tok_end, *tok_val, **extra_tokens = NULL, *path;
++    const char *tok_begin, *tok_end;
++    char *tok_val, **extra_tokens = NULL, *path;
+     const char *path_left;
+     size_t nargs = 0, i;
+     va_list ap;
+diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
+index edca5ac7eb..47e15c849f 100644
+--- a/src/lib/krb5/os/locate_kdc.c
++++ b/src/lib/krb5/os/locate_kdc.c
+@@ -188,8 +188,8 @@ oom:
+ }
+ 
+ static void
+-parse_uri_if_https(const char *host_or_uri, k5_transport *transport,
+-                   const char **host, const char **uri_path)
++parse_uri_if_https(char *host_or_uri, k5_transport *transport,
++                   char **host, const char **uri_path)
+ {
+     char *cp;
+ 
+@@ -229,8 +229,7 @@ locate_srv_conf_1(krb5_context context, const krb5_data *realm,
+                   k5_transport transport, int udpport)
+ {
+     const char *realm_srv_names[4];
+-    char **hostlist = NULL, *realmstr = NULL, *host = NULL;
+-    const char *hostspec;
++    char **hostlist = NULL, *realmstr = NULL, *host = NULL, *hostspec;
+     krb5_error_code code;
+     int i, default_port;
+ 
+@@ -535,8 +534,8 @@ prof_locate_server(krb5_context context, const krb5_data *realm,
+  * Return a NULL *host_out if there are any problems parsing the URI.
+  */
+ static void
+-parse_uri_fields(const char *uri, k5_transport *transport_out,
+-                 const char **host_out, int *primary_out)
++parse_uri_fields(char *uri, k5_transport *transport_out,
++                 char **host_out, int *primary_out)
+ 
+ {
+     k5_transport transport;
+@@ -604,8 +603,8 @@ locate_uri(krb5_context context, const krb5_data *realm,
+     krb5_error_code ret;
+     k5_transport transport, host_trans;
+     struct srv_dns_entry *answers, *entry;
+-    char *host;
+-    const char *host_field, *path;
++    char *host, *host_field;
++    const char *path;
+     int port, def_port, primary;
+ 
+     ret = k5_make_uri_query(context, realm, req_service, &answers);
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto.h b/src/plugins/preauth/pkinit/pkinit_crypto.h
+index 3b12e904b1..99e2394040 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto.h
++++ b/src/plugins/preauth/pkinit/pkinit_crypto.h
+@@ -456,7 +456,7 @@ krb5_error_code crypto_load_cas_and_crls
+ 		    defines the storage type (file, directory, etc) */
+ 	int catype,					/* IN
+ 		    defines the ca type (anchor, intermediate, crls) */
+-	char *id);					/* IN
++	const char *id);				/* IN
+ 		    defines the location (filename, directory name, etc) */
+ 
+ /*
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 429b7d202c..6013080afc 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -4956,7 +4956,7 @@ load_cas_and_crls(krb5_context context,
+                   pkinit_req_crypto_context req_cryptoctx,
+                   pkinit_identity_crypto_context id_cryptoctx,
+                   int catype,
+-                  char *filename)
++                  const char *filename)
+ {
+     STACK_OF(X509_INFO) *sk = NULL;
+     STACK_OF(X509) *ca_certs = NULL;
+@@ -5114,7 +5114,7 @@ load_cas_and_crls_dir(krb5_context context,
+                       pkinit_req_crypto_context req_cryptoctx,
+                       pkinit_identity_crypto_context id_cryptoctx,
+                       int catype,
+-                      char *dirname)
++                      const char *dirname)
+ {
+     krb5_error_code retval = EINVAL;
+     DIR *d = NULL;
+@@ -5166,7 +5166,7 @@ crypto_load_cas_and_crls(krb5_context context,
+                          pkinit_identity_crypto_context id_cryptoctx,
+                          int idtype,
+                          int catype,
+-                         char *id)
++                         const char *id)
+ {
+     switch (idtype) {
+     case IDTYPE_FILE:
+diff --git a/src/plugins/preauth/pkinit/pkinit_identity.c b/src/plugins/preauth/pkinit/pkinit_identity.c
+index a5a979f279..b06d519c66 100644
+--- a/src/plugins/preauth/pkinit/pkinit_identity.c
++++ b/src/plugins/preauth/pkinit/pkinit_identity.c
+@@ -474,7 +474,7 @@ process_option_ca_crl(krb5_context context,
+                       const char *value,
+                       int catype)
+ {
+-    char *residual;
++    const char *residual;
+     unsigned int typelen;
+     int idtype;
+ 
+diff --git a/src/plugins/preauth/pkinit/pkinit_matching.c b/src/plugins/preauth/pkinit/pkinit_matching.c
+index b42485a50a..5a7f2ba3fa 100644
+--- a/src/plugins/preauth/pkinit/pkinit_matching.c
++++ b/src/plugins/preauth/pkinit/pkinit_matching.c
+@@ -263,7 +263,7 @@ parse_rule_component(krb5_context context,
+     char err_buf[128];
+     int ret;
+     struct keyword_desc *kw, *nextkw;
+-    char *nk;
++    const char *nk;
+     int found_next_kw = 0;
+     char *value = NULL;
+     size_t len;
+diff --git a/src/tests/responder.c b/src/tests/responder.c
+index 82f870ea5d..4221a20283 100644
+--- a/src/tests/responder.c
++++ b/src/tests/responder.c
+@@ -282,8 +282,7 @@ responder(krb5_context ctx, void *rawdata, krb5_responder_context rctx)
+     /* Provide a particular response for an OTP challenge. */
+     if (data->otp_answer != NULL) {
+         if (krb5_responder_otp_get_challenge(ctx, rctx, &ochl) == 0) {
+-            key = strchr(data->otp_answer, '=');
+-            if (key != NULL) {
++            if (strchr(data->otp_answer, '=') != NULL) {
+                 /* Make a copy of the answer that we can chop up. */
+                 key = strdup(data->otp_answer);
+                 if (key == NULL)
+-- 
+2.51.1
+
diff --git a/0040-automated-fast.patch b/0040-automated-fast.patch
new file mode 100644
index 0000000..5a64233
--- /dev/null
+++ b/0040-automated-fast.patch
@@ -0,0 +1,226 @@
+From 3baf9b93dc1dfe38585722c71d7268304cb4a01a Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Sun, 21 Sep 2025 11:14:51 +0300
+Subject: libkrb5: in case PKINIT is configured, attempt Anonymous
+ PKINIT for FAST
+
+If auto_fast_armor is configured for the realm or globally, optimistically
+assume that Anonymous PKINIT is supported as well and try to obtain it for
+FAST use in case no pre-made FAST channel was established by the caller.
+
+This behavior will automatically enable use of passwordless pre-authentication
+methods which rely on FAST channel presence in deployments such as FreeIPA.
+
+Notably, Microsoft Active Directory KDCs do not support Anonymous PKINIT. For
+these deployments only a machine account (host keytab) can be used to build a
+FAST channel. However, libkrb5 does not have access to /etc/krb5.keytab in a
+general case.
+
+Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ src/lib/krb5/krb/fast.c | 118 ++++++++++++++++++++++++++++++++++++++++
+ src/lib/krb5/krb/fast.h |   2 +
+ src/man/krb5.conf.man   |  13 +++++
+ 3 files changed, 133 insertions(+)
+
+diff --git a/src/lib/krb5/krb/fast.c b/src/lib/krb5/krb/fast.c
+index 62c9f0841..ee2e08189 100644
+--- a/src/lib/krb5/krb/fast.c
++++ b/src/lib/krb5/krb/fast.c
+@@ -168,6 +168,109 @@ krb5int_fast_prep_req_body(krb5_context context,
+     return retval;
+ }
+ 
++static krb5_boolean
++fast_is_pkinit_allowed(krb5_context context, krb5_data *realm)
++{
++    int value;
++    krb5_error_code retval = EINVAL;
++    char realmstr[1024];
++    const char *option = "auto_fast_armor";
++    const int def_value = FALSE;
++
++    if (realm != NULL && realm->length > sizeof(realmstr)-1)
++        return FALSE;
++
++    if (realm != NULL) {
++        strncpy(realmstr, realm->data, realm->length);
++        realmstr[realm->length] = '\0';
++
++        retval = profile_get_boolean(context->profile,
++                                     KRB5_CONF_REALMS, realmstr,
++                                     option, def_value, &value);
++    }
++
++    return retval ? FALSE : value;
++
++}
++
++static krb5_error_code
++fast_acquire_pkinit_armor(krb5_context context,
++                           struct krb5int_fast_request_state *state,
++                           krb5_get_init_creds_opt *opt, krb5_kdc_req *request)
++{
++    krb5_context ctx;
++    krb5_get_init_creds_opt *options = NULL;
++    krb5_error_code retval = 0;
++    krb5_data *target_realm = &request->server->realm;
++    krb5_creds creds;
++    krb5_principal anon_princ = NULL;
++    krb5_ccache out_cc;
++
++    /* short circuit, we are asked to perform Anonymous PKINIT already */
++    if (opt->flags & KRB5_GET_INIT_CREDS_OPT_ANONYMOUS) {
++        return EINVAL;
++    }
++
++    /* skip realms which do not allow use of automated FAST armor */
++    if (!fast_is_pkinit_allowed(context, target_realm)) {
++        return EINVAL;
++    }
++
++    retval = krb5_init_context(&ctx);
++    if (retval != 0) {
++        return retval;
++    }
++    retval = krb5_get_init_creds_opt_alloc(ctx, &options);
++    if (retval != 0) {
++        goto cleanup;
++    }
++    krb5_get_init_creds_opt_set_anonymous(options, 1);
++    retval = krb5_cc_new_unique(ctx, "MEMORY", NULL, &out_cc);
++    if (retval != 0) {
++        goto cleanup;
++    }
++
++    retval = krb5_get_init_creds_opt_set_out_ccache(ctx, options, out_cc);
++    if (retval != 0) {
++        goto cleanup;
++    }
++
++    retval = krb5_build_principal_ext(ctx, &anon_princ,
++                                      target_realm->length, target_realm->data,
++                                      strlen(KRB5_WELLKNOWN_NAMESTR),
++                                      KRB5_WELLKNOWN_NAMESTR,
++                                      strlen(KRB5_ANONYMOUS_PRINCSTR),
++                                      KRB5_ANONYMOUS_PRINCSTR, 0);
++    if (retval != 0) {
++        goto cleanup;
++    }
++
++    retval = krb5_get_init_creds_password(ctx, &creds, anon_princ, 0,
++                                          NULL /* no prompter */, NULL,
++                                          0, NULL /* service name */,
++                                          options);
++    if (retval == 0) {
++        state->fast_state_flags |= KRB5INT_FAST_OWN_ARMOR;
++        state->armor_ccache = out_cc;
++    }
++cleanup:
++    if (retval != 0 && out_cc != NULL) {
++        (void) krb5_cc_destroy(ctx, out_cc);
++    }
++    if (retval == 0) {
++        krb5_free_cred_contents(ctx, &creds);
++    }
++    if (options != NULL) {
++        krb5_get_init_creds_opt_free(ctx, options);
++    }
++    if (anon_princ != NULL) {
++        krb5_free_principal(ctx, anon_princ);
++    }
++    krb5_free_context(ctx);
++
++    return retval;
++}
++
+ krb5_error_code
+ krb5int_fast_as_armor(krb5_context context,
+                       struct krb5int_fast_request_state *state,
+@@ -178,10 +281,20 @@ krb5int_fast_as_armor(krb5_context context,
+     krb5_principal target_principal = NULL;
+     krb5_data *target_realm;
+     const char *ccname = k5_gic_opt_get_fast_ccache_name(opt);
++    char *fast_ccname = NULL;
+     krb5_flags fast_flags;
+ 
+     krb5_clear_error_message(context);
+     target_realm = &request->server->realm;
++    if (ccname == NULL) {
++        retval = fast_acquire_pkinit_armor(context, state, opt, request);
++        if (retval == 0) {
++            retval = krb5_cc_get_full_name(context, state->armor_ccache, &fast_ccname);
++            if (retval == 0 && fast_ccname != NULL)
++                ccname = fast_ccname;
++        }
++        retval = 0;
++    }
+     if (ccname != NULL) {
+         TRACE_FAST_ARMOR_CCACHE(context, ccname);
+         state->fast_state_flags |= KRB5INT_FAST_ARMOR_AVAIL;
+@@ -220,6 +333,8 @@ krb5int_fast_as_armor(krb5_context context,
+         krb5_cc_close(context, ccache);
+     if (target_principal)
+         krb5_free_principal(context, target_principal);
++    if (fast_ccname)
++        free(fast_ccname);
+     return retval;
+ }
+ 
+@@ -615,6 +730,9 @@ krb5int_fast_free_state(krb5_context context,
+     /*We are responsible for none of the store in the fast_outer_req*/
+     krb5_free_keyblock(context, state->armor_key);
+     krb5_free_fast_armor(context, state->armor);
++    if (state->fast_state_flags & KRB5INT_FAST_OWN_ARMOR) {
++        krb5_cc_destroy(context, state->armor_ccache);
++    }
+     free(state);
+ }
+ 
+diff --git a/src/lib/krb5/krb/fast.h b/src/lib/krb5/krb/fast.h
+index 7156ea203..e5fe8bd54 100644
+--- a/src/lib/krb5/krb/fast.h
++++ b/src/lib/krb5/krb/fast.h
+@@ -34,6 +34,7 @@ struct krb5int_fast_request_state {
+     krb5_kdc_req fast_outer_request;
+     krb5_keyblock *armor_key; /*non-null means fast is in use*/
+     krb5_fast_armor *armor;
++    krb5_ccache armor_ccache;
+     krb5_ui_4 fast_state_flags;
+     krb5_ui_4 fast_options;
+     krb5_int32 nonce;
+@@ -41,6 +42,7 @@ struct krb5int_fast_request_state {
+ 
+ #define KRB5INT_FAST_DO_FAST     (1l<<0)  /* Perform FAST */
+ #define KRB5INT_FAST_ARMOR_AVAIL (1l<<1)
++#define KRB5INT_FAST_OWN_ARMOR   (1l<<2)
+ 
+ krb5_error_code
+ krb5int_fast_prep_req_body(krb5_context context,
+diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
+index d4caa2bd3..ac7649647 100644
+--- a/src/man/krb5.conf.man
++++ b/src/man/krb5.conf.man
+@@ -650,6 +650,19 @@ primary KDC, in case the user\(aqs password has just been changed, and
+ the updated database has not been propagated to the replica
+ servers yet.  New in release 1.19.
+ .TP
++\fBauto_fast_armor\fP
++If this flag is true, then initial ticket request will use Anonymous
++PKINIT to protect the communication as a FAST channel in case an application
++did not provide its own FAST channel. This is useful for deployments where
++pre-authentication methods require use of the FAST channel, such as
++passwordless methods provided by FreeIPA. Microsoft Active Directory
++implementation of PKINIT does not support Anonymous PKINIT feature.
++As a result, \fIauto_fast_armor\fP defaults to false.
++.sp
++Use of \fIauto_fast_armor = true\fP requires properly configured PKINIT and
++WELLKNOWN/ANONYMOUS principal defined on the KDC side. Consult KDC documentation
++for details.
++.TP
+ \fBv4_instance_convert\fP
+ This subsection allows the administrator to configure exceptions
+ to the \fBdefault_domain\fP mapping rule.  It contains V4 instances
+-- 
+2.51.0
+
diff --git a/0041-bail-if-prompter-is-not-specified-but-required.patch b/0041-bail-if-prompter-is-not-specified-but-required.patch
new file mode 100644
index 0000000..d1a3dc7
--- /dev/null
+++ b/0041-bail-if-prompter-is-not-specified-but-required.patch
@@ -0,0 +1,40 @@
+From ff580d9cf86202d45454a6b6f53accc22cb40b62 Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Sun, 19 Oct 2025 18:14:29 +0300
+Subject: [PATCH] bail if prompter is not specified but required
+
+GSSAPI gss_init_sec_context() may trigger credential re-initialization
+if the cred in ccache is expired. If automatic FAST armor is in use,
+we'd request Anonymous PKINIT and use it as an armor and this will
+enable seeing pre-authentication methods which require armor presence.
+
+OTP is one of such methods and its use requires prompter to be set,
+but GSSAPI cannot specify a prompter and thus we should fail any
+pre-auth where a prompter wasn't passed.
+
+PKINIT PKCS11 and SAM-2 preauth methods use KRB5_LIBOS_CANTREADPWD while PKINIT
+and gic_pwd.c use EIO. Use EIO here because we technically attempt to read a
+PIN rather than a password.
+
+Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ src/lib/krb5/krb/preauth_otp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lib/krb5/krb/preauth_otp.c b/src/lib/krb5/krb/preauth_otp.c
+index 07ffc15c2..48003da62 100644
+--- a/src/lib/krb5/krb/preauth_otp.c
++++ b/src/lib/krb5/krb/preauth_otp.c
+@@ -479,6 +479,9 @@ doprompt(krb5_context context, krb5_prompter_fct prompter, void *prompter_data,
+     krb5_error_code retval;
+     krb5_prompt_type prompt_type = KRB5_PROMPT_TYPE_PREAUTH;
+ 
++    if (prompter == NULL)
++        return EIO;
++
+     if (prompttxt == NULL || out == NULL)
+         return EINVAL;
+ 
+-- 
+2.51.0
+
diff --git a/Add-channel-bindings-tests.patch b/Add-channel-bindings-tests.patch
deleted file mode 100644
index 2eb0f1c..0000000
--- a/Add-channel-bindings-tests.patch
+++ /dev/null
@@ -1,419 +0,0 @@
-From 6d36ea6fcfe281a8ce73fc5aa5c133f435d93fa4 Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Fri, 20 Mar 2020 00:17:28 +0100
-Subject: [PATCH] Add channel bindings tests
-
-[ghudson@mit.edu: adjusted test program to output channel-bound state
-instead of optionally enforcing it; adjusted tests to check program
-output; split out tests into separate Python script; made cosmetic
-changes]
-
-ticket: 8900
-(cherry picked from commit b0b21b6d25b06f3e2b365dfe9dd4c99b3d43bf57)
-[rharwood@redhat.com: .gitignore]
----
- src/plugins/gssapi/negoextest/main.c |  18 +++++
- src/tests/gssapi/Makefile.in         |  49 ++++++------
- src/tests/gssapi/common.c            |  25 ++++--
- src/tests/gssapi/common.h            |   9 +++
- src/tests/gssapi/deps                |   4 +
- src/tests/gssapi/t_bindings.c        | 111 +++++++++++++++++++++++++++
- src/tests/gssapi/t_bindings.py       |  43 +++++++++++
- src/tests/gssapi/t_negoex.py         |   7 ++
- 8 files changed, 237 insertions(+), 29 deletions(-)
- create mode 100644 src/tests/gssapi/t_bindings.c
- create mode 100644 src/tests/gssapi/t_bindings.py
-
-diff --git a/src/plugins/gssapi/negoextest/main.c b/src/plugins/gssapi/negoextest/main.c
-index 6c340f41b..72fc5273a 100644
---- a/src/plugins/gssapi/negoextest/main.c
-+++ b/src/plugins/gssapi/negoextest/main.c
-@@ -57,6 +57,15 @@ gss_init_sec_context(OM_uint32 *minor_status,
-     const char *envstr;
-     uint8_t hops, mech_last_octet;
- 
-+    envstr = getenv("GSS_INIT_BINDING");
-+    if (envstr != NULL) {
-+        assert(strlen(envstr) > 0);
-+        assert(input_chan_bindings != GSS_C_NO_CHANNEL_BINDINGS);
-+        assert(strlen(envstr) == input_chan_bindings->application_data.length);
-+        assert(strcmp((char *)input_chan_bindings->application_data.value,
-+                      envstr) == 0);
-+    }
-+
-     if (input_token == GSS_C_NO_BUFFER || input_token->length == 0) {
-         envstr = getenv("HOPS");
-         hops = (envstr != NULL) ? atoi(envstr) : 1;
-@@ -112,6 +121,15 @@ gss_accept_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
-     uint8_t hops, mech_last_octet;
-     const char *envstr;
- 
-+    envstr = getenv("GSS_ACCEPT_BINDING");
-+    if (envstr != NULL) {
-+        assert(strlen(envstr) > 0);
-+        assert(input_chan_bindings != GSS_C_NO_CHANNEL_BINDINGS);
-+        assert(strlen(envstr) == input_chan_bindings->application_data.length);
-+        assert(strcmp((char *)input_chan_bindings->application_data.value,
-+                      envstr) == 0);
-+    }
-+
-     /*
-      * The unwrapped token sits at the end and is just one byte giving the
-      * remaining number of hops.  The final octet of the mech encoding should
-diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
-index 5cc1e0f58..68c132b79 100644
---- a/src/tests/gssapi/Makefile.in
-+++ b/src/tests/gssapi/Makefile.in
-@@ -9,33 +9,33 @@ LOCALINCLUDES = -I$(srcdir)/../../lib/gssapi/mechglue \
- 	-I../../lib/gssapi/generic
- 
- SRCS=	$(srcdir)/ccinit.c $(srcdir)/ccrefresh.c $(srcdir)/common.c \
--	$(srcdir)/t_accname.c $(srcdir)/t_add_cred.c $(srcdir)/t_ccselect.c \
--	$(srcdir)/t_ciflags.c $(srcdir)/t_context.c $(srcdir)/t_credstore.c \
--	$(srcdir)/t_enctypes.c $(srcdir)/t_err.c $(srcdir)/t_export_cred.c \
--	$(srcdir)/t_export_name.c $(srcdir)/t_gssexts.c \
--	$(srcdir)/t_imp_cred.c $(srcdir)/t_imp_name.c $(srcdir)/t_invalid.c \
--	$(srcdir)/t_inq_cred.c $(srcdir)/t_inq_ctx.c \
-+	$(srcdir)/t_accname.c $(srcdir)/t_add_cred.c $(srcdir)/t_bindings.c \
-+	$(srcdir)/t_ccselect.c $(srcdir)/t_ciflags.c $(srcdir)/t_context.c \
-+	$(srcdir)/t_credstore.c $(srcdir)/t_enctypes.c $(srcdir)/t_err.c \
-+	$(srcdir)/t_export_cred.c $(srcdir)/t_export_name.c \
-+	$(srcdir)/t_gssexts.c $(srcdir)/t_imp_cred.c $(srcdir)/t_imp_name.c \
-+	$(srcdir)/t_invalid.c $(srcdir)/t_inq_cred.c $(srcdir)/t_inq_ctx.c \
- 	$(srcdir)/t_inq_mechs_name.c $(srcdir)/t_iov.c \
- 	$(srcdir)/t_lifetime.c $(srcdir)/t_namingexts.c $(srcdir)/t_oid.c \
- 	$(srcdir)/t_pcontok.c $(srcdir)/t_prf.c $(srcdir)/t_s4u.c \
- 	$(srcdir)/t_s4u2proxy_krb5.c $(srcdir)/t_saslname.c \
- 	$(srcdir)/t_spnego.c $(srcdir)/t_srcattrs.c
- 
--OBJS=	ccinit.o ccrefresh.o common.o t_accname.o t_add_cred.o t_ccselect.o \
--	t_ciflags.o t_context.o t_credstore.o t_enctypes.o t_err.o \
--	t_export_cred.o t_export_name.o t_gssexts.o t_imp_cred.o t_imp_name.o \
--	t_invalid.o t_inq_cred.o t_inq_ctx.o t_inq_mechs_name.o t_iov.o \
--	t_lifetime.o t_namingexts.o t_oid.o t_pcontok.o t_prf.o t_s4u.o \
--	t_s4u2proxy_krb5.o t_saslname.o t_spnego.o t_srcattrs.o
-+OBJS=	ccinit.o ccrefresh.o common.o t_accname.o t_add_cred.o t_bindings.o \
-+	t_ccselect.o t_ciflags.o t_context.o t_credstore.o t_enctypes.o \
-+	t_err.o t_export_cred.o t_export_name.o t_gssexts.o t_imp_cred.o \
-+	t_imp_name.o t_invalid.o t_inq_cred.o t_inq_ctx.o t_inq_mechs_name.o \
-+	t_iov.o t_lifetime.o t_namingexts.o t_oid.o t_pcontok.o t_prf.o \
-+	t_s4u.o t_s4u2proxy_krb5.o t_saslname.o t_spnego.o t_srcattrs.o
- 
- COMMON_DEPS= common.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
- COMMON_LIBS= common.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
- 
--all: ccinit ccrefresh t_accname t_add_cred t_ccselect t_ciflags t_context \
--	t_credstore t_enctypes t_err t_export_cred t_export_name t_gssexts \
--	t_imp_cred t_imp_name t_invalid t_inq_cred t_inq_ctx t_inq_mechs_name \
--	t_iov t_lifetime t_namingexts t_oid t_pcontok t_prf t_s4u \
--	t_s4u2proxy_krb5 t_saslname t_spnego t_srcattrs
-+all: ccinit ccrefresh t_accname t_add_cred t_bindings t_ccselect t_ciflags \
-+	t_context t_credstore t_enctypes t_err t_export_cred t_export_name \
-+	t_gssexts t_imp_cred t_imp_name t_invalid t_inq_cred t_inq_ctx \
-+	t_inq_mechs_name t_iov t_lifetime t_namingexts t_oid t_pcontok t_prf \
-+	t_s4u t_s4u2proxy_krb5 t_saslname t_spnego t_srcattrs
- 
- check-unix: t_oid
- 	$(RUN_TEST) ./t_invalid
-@@ -43,11 +43,12 @@ check-unix: t_oid
- 	$(RUN_TEST) ./t_prf
- 	$(RUN_TEST) ./t_imp_name
- 
--check-pytests: ccinit ccrefresh t_accname t_add_cred t_ccselect t_ciflags \
--	t_context t_credstore t_enctypes t_err t_export_cred t_export_name \
--	t_imp_cred t_inq_cred t_inq_ctx t_inq_mechs_name t_iov t_lifetime \
--	t_pcontok t_s4u t_s4u2proxy_krb5 t_spnego t_srcattrs
-+check-pytests: ccinit ccrefresh t_accname t_add_cred t_bindings t_ccselect \
-+	t_ciflags t_context t_credstore t_enctypes t_err t_export_cred \
-+	t_export_name t_imp_cred t_inq_cred t_inq_ctx t_inq_mechs_name t_iov \
-+	t_lifetime t_pcontok t_s4u t_s4u2proxy_krb5 t_spnego t_srcattrs
- 	$(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS)
-+	$(RUNPYTEST) $(srcdir)/t_bindings.py $(PYTESTFLAGS)
- 	$(RUNPYTEST) $(srcdir)/t_ccselect.py $(PYTESTFLAGS)
- 	$(RUNPYTEST) $(srcdir)/t_client_keytab.py $(PYTESTFLAGS)
- 	$(RUNPYTEST) $(srcdir)/t_enctypes.py $(PYTESTFLAGS)
-@@ -64,6 +65,8 @@ t_accname: t_accname.o $(COMMON_DEPS)
- 	$(CC_LINK) -o $@ t_accname.o $(COMMON_LIBS)
- t_add_cred: t_add_cred.o $(COMMON_DEPS)
- 	$(CC_LINK) -o $@ t_add_cred.o $(COMMON_LIBS)
-+t_bindings: t_bindings.o $(COMMON_DEPS)
-+	$(CC_LINK) -o $@ t_bindings.o $(COMMON_LIBS)
- t_ccselect: t_ccselect.o $(COMMON_DEPS)
- 	$(CC_LINK) -o $@ t_ccselect.o $(COMMON_LIBS)
- t_ciflags: t_ciflags.o $(COMMON_DEPS)
-@@ -118,8 +121,8 @@ t_srcattrs: t_srcattrs.o $(COMMON_DEPS)
- 	$(CC_LINK) -o $@ t_srcattrs.o $(COMMON_LIBS)
- 
- clean:
--	$(RM) ccinit ccrefresh t_accname t_add_cred t_ccselect t_ciflags
--	$(RM) t_context t_credstore t_enctypes t_err t_export_cred
-+	$(RM) ccinit ccrefresh t_accname t_add_cred t_bindings t_ccselect
-+	$(RM) t_ciflags t_context t_credstore t_enctypes t_err t_export_cred
- 	$(RM) t_export_name t_gssexts t_imp_cred t_imp_name t_invalid
- 	$(RM) t_inq_cred t_inq_ctx t_inq_mechs_name t_iov t_lifetime
- 	$(RM) t_namingexts t_oid t_pcontok t_prf t_s4u t_s4u2proxy_krb5
-diff --git a/src/tests/gssapi/common.c b/src/tests/gssapi/common.c
-index 83e9d9bb8..7ba72f7b2 100644
---- a/src/tests/gssapi/common.c
-+++ b/src/tests/gssapi/common.c
-@@ -115,6 +115,20 @@ establish_contexts(gss_OID imech, gss_cred_id_t icred, gss_cred_id_t acred,
-                    gss_name_t tname, OM_uint32 flags, gss_ctx_id_t *ictx,
-                    gss_ctx_id_t *actx, gss_name_t *src_name, gss_OID *amech,
-                    gss_cred_id_t *deleg_cred)
-+{
-+    return establish_contexts_ex(imech, icred, acred, tname, flags, ictx, actx,
-+                                 GSS_C_NO_CHANNEL_BINDINGS,
-+                                 GSS_C_NO_CHANNEL_BINDINGS, NULL, src_name,
-+                                 amech, deleg_cred);
-+}
-+
-+void
-+establish_contexts_ex(gss_OID imech, gss_cred_id_t icred, gss_cred_id_t acred,
-+                      gss_name_t tname, OM_uint32 flags, gss_ctx_id_t *ictx,
-+                      gss_ctx_id_t *actx, gss_channel_bindings_t icb,
-+                      gss_channel_bindings_t acb, OM_uint32 *aret_flags,
-+                      gss_name_t *src_name, gss_OID *amech,
-+                      gss_cred_id_t *deleg_cred)
- {
-     OM_uint32 minor, imaj, amaj;
-     gss_buffer_desc itok, atok;
-@@ -126,17 +140,16 @@ establish_contexts(gss_OID imech, gss_cred_id_t icred, gss_cred_id_t acred,
-     for (;;) {
-         (void)gss_release_buffer(&minor, &itok);
-         imaj = gss_init_sec_context(&minor, icred, ictx, tname, imech, flags,
--                                    GSS_C_INDEFINITE,
--                                    GSS_C_NO_CHANNEL_BINDINGS, &atok, NULL,
--                                    &itok, NULL, NULL);
-+                                    GSS_C_INDEFINITE, icb, &atok, NULL, &itok,
-+                                    NULL, NULL);
-         check_gsserr("gss_init_sec_context", imaj, minor);
-         if (amaj == GSS_S_COMPLETE)
-             break;
- 
-         (void)gss_release_buffer(&minor, &atok);
--        amaj = gss_accept_sec_context(&minor, actx, acred, &itok,
--                                      GSS_C_NO_CHANNEL_BINDINGS, src_name,
--                                      amech, &atok, NULL, NULL, deleg_cred);
-+        amaj = gss_accept_sec_context(&minor, actx, acred, &itok, acb,
-+                                      src_name, amech, &atok, aret_flags, NULL,
-+                                      deleg_cred);
-         check_gsserr("gss_accept_sec_context", amaj, minor);
-         (void)gss_release_buffer(&minor, &itok);
-         if (imaj == GSS_S_COMPLETE)
-diff --git a/src/tests/gssapi/common.h b/src/tests/gssapi/common.h
-index ae11b51d4..a5c8f87e6 100644
---- a/src/tests/gssapi/common.h
-+++ b/src/tests/gssapi/common.h
-@@ -62,6 +62,15 @@ void establish_contexts(gss_OID imech, gss_cred_id_t icred,
-                         gss_name_t *src_name, gss_OID *amech,
-                         gss_cred_id_t *deleg_cred);
- 
-+/* Establish contexts with channel bindings. */
-+void establish_contexts_ex(gss_OID imech, gss_cred_id_t icred,
-+                           gss_cred_id_t acred, gss_name_t tname,
-+                           OM_uint32 flags, gss_ctx_id_t *ictx,
-+                           gss_ctx_id_t *actx, gss_channel_bindings_t icb,
-+                           gss_channel_bindings_t acb, OM_uint32 *aret_flags,
-+                           gss_name_t *src_name, gss_OID *amech,
-+                           gss_cred_id_t *deleg_cred);
-+
- /* Export *cred to a token, then release *cred and replace it by re-importing
-  * the token. */
- void export_import_cred(gss_cred_id_t *cred);
-diff --git a/src/tests/gssapi/deps b/src/tests/gssapi/deps
-index acd0e96f8..73e4d9a74 100644
---- a/src/tests/gssapi/deps
-+++ b/src/tests/gssapi/deps
-@@ -33,6 +33,10 @@ $(OUTPRE)t_add_cred.$(OBJEXT): $(BUILDTOP)/include/gssapi/gssapi.h \
-   $(BUILDTOP)/include/gssapi/gssapi_ext.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \
-   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/krb5.h \
-   common.h t_add_cred.c
-+$(OUTPRE)t_bindings.$(OBJEXT): $(BUILDTOP)/include/gssapi/gssapi.h \
-+  $(BUILDTOP)/include/gssapi/gssapi_ext.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \
-+  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/krb5.h \
-+  common.h t_bindings.c
- $(OUTPRE)t_ccselect.$(OBJEXT): $(BUILDTOP)/include/gssapi/gssapi.h \
-   $(BUILDTOP)/include/gssapi/gssapi_ext.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \
-   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/krb5.h \
-diff --git a/src/tests/gssapi/t_bindings.c b/src/tests/gssapi/t_bindings.c
-new file mode 100644
-index 000000000..e8906715b
---- /dev/null
-+++ b/src/tests/gssapi/t_bindings.c
-@@ -0,0 +1,111 @@
-+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-+/*
-+ * Copyright (C) 2020 by Red Hat, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ * * Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in
-+ *   the documentation and/or other materials provided with the
-+ *   distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ * OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <assert.h>
-+
-+#include "common.h"
-+
-+/*
-+ * Establish contexts (without and with GSS_C_DCE_STYLE) with the default
-+ * initiator name, a specified principal name as target name, initiator
-+ * bindings, and acceptor bindings.  If any call is unsuccessful, display an
-+ * error message.  Output "yes" or "no" to indicate whether the contexts were
-+ * reported as channel-bound on the acceptor.  Exit with status 0 if all
-+ * operations are successful, or 1 if not.
-+ *
-+ * Usage: ./t_bindings [-s] targetname icb acb
-+ *
-+ * An icb or abc value of "-" will not specify channel bindings.
-+ */
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    OM_uint32 minor, flags1, flags2;
-+    gss_name_t target_name;
-+    gss_ctx_id_t ictx, actx;
-+    struct gss_channel_bindings_struct icb_data = {0}, acb_data = {0};
-+    gss_channel_bindings_t icb = GSS_C_NO_CHANNEL_BINDINGS;
-+    gss_channel_bindings_t acb = GSS_C_NO_CHANNEL_BINDINGS;
-+    gss_OID_desc *mech;
-+
-+    argv++;
-+    argc--;
-+    if (*argv != NULL && strcmp(*argv, "-s") == 0) {
-+        mech = &mech_spnego;
-+        argv++;
-+        argc--;
-+    } else {
-+        mech = &mech_krb5;
-+    }
-+
-+    if (argc != 3) {
-+        fprintf(stderr, "Usage: t_bindings [-s] targetname icb acb\n");
-+        return 1;
-+    }
-+
-+    target_name = import_name(argv[0]);
-+
-+    if (strcmp(argv[1], "-") != 0) {
-+        icb_data.application_data.length = strlen(argv[1]);
-+        icb_data.application_data.value = argv[1];
-+        icb = &icb_data;
-+    }
-+
-+    if (strcmp(argv[2], "-") != 0) {
-+        acb_data.application_data.length = strlen(argv[2]);
-+        acb_data.application_data.value = argv[2];
-+        acb = &acb_data;
-+    }
-+
-+    establish_contexts_ex(mech, GSS_C_NO_CREDENTIAL, GSS_C_NO_CREDENTIAL,
-+                          target_name, 0, &ictx, &actx, icb, acb, &flags1,
-+                          NULL, NULL, NULL);
-+
-+    /* Try again with GSS_C_DCE_STYLE */
-+    (void)gss_delete_sec_context(&minor, &ictx, NULL);
-+    (void)gss_delete_sec_context(&minor, &actx, NULL);
-+
-+    establish_contexts_ex(mech, GSS_C_NO_CREDENTIAL, GSS_C_NO_CREDENTIAL,
-+                          target_name, GSS_C_DCE_STYLE, &ictx, &actx, icb, acb,
-+                          &flags2, NULL, NULL, NULL);
-+    assert((flags1 & GSS_C_CHANNEL_BOUND_FLAG) ==
-+           (flags2 & GSS_C_CHANNEL_BOUND_FLAG));
-+    printf("%s\n", (flags1 & GSS_C_CHANNEL_BOUND_FLAG) ? "yes" : "no");
-+
-+    (void)gss_delete_sec_context(&minor, &ictx, NULL);
-+    (void)gss_delete_sec_context(&minor, &actx, NULL);
-+    (void)gss_release_name(&minor, &target_name);
-+
-+    return 0;
-+}
-diff --git a/src/tests/gssapi/t_bindings.py b/src/tests/gssapi/t_bindings.py
-new file mode 100644
-index 000000000..f377977b6
---- /dev/null
-+++ b/src/tests/gssapi/t_bindings.py
-@@ -0,0 +1,43 @@
-+from k5test import *
-+
-+realm = K5Realm()
-+server = 'p:' + realm.host_princ
-+
-+mark('krb5 channel bindings')
-+realm.run(['./t_bindings', server, '-', '-'], expected_msg='no')
-+realm.run(['./t_bindings', server, 'a', '-'], expected_msg='no')
-+realm.run(['./t_bindings', server, 'a', 'a'], expected_msg='yes')
-+realm.run(['./t_bindings', server, '-', 'a'], expected_msg='no')
-+realm.run(['./t_bindings', server, 'a', 'x'],
-+          expected_code=1, expected_msg='Incorrect channel bindings')
-+
-+mark('SPNEGO channel bindings')
-+realm.run(['./t_bindings', '-s', server, '-', '-'], expected_msg='no')
-+realm.run(['./t_bindings', '-s', server, 'a', '-'], expected_msg='no')
-+realm.run(['./t_bindings', '-s', server, 'a', 'a'], expected_msg='yes')
-+realm.run(['./t_bindings', '-s', server, '-', 'a'], expected_msg='no')
-+realm.run(['./t_bindings', '-s', server, 'a', 'x'],
-+          expected_code=1, expected_msg='Incorrect channel bindings')
-+
-+client_aware_conf = {'libdefaults': {'client_aware_channel_bindings': 'true'}}
-+e = realm.special_env('cb_aware', False, krb5_conf=client_aware_conf)
-+
-+mark('krb5 client_aware_channel_bindings')
-+realm.run(['./t_bindings', server, '-', '-'], env=e, expected_msg='no')
-+realm.run(['./t_bindings', server, 'a', '-'], env=e, expected_msg='no')
-+realm.run(['./t_bindings', server, 'a', 'a'], env=e, expected_msg='yes')
-+realm.run(['./t_bindings', server, '-', 'a'], env=e,
-+          expected_code=1, expected_msg='Incorrect channel bindings')
-+realm.run(['./t_bindings', server, 'a', 'x'], env=e,
-+          expected_code=1, expected_msg='Incorrect channel bindings')
-+
-+mark('SPNEGO client_aware_channel_bindings')
-+realm.run(['./t_bindings', '-s', server, '-', '-'], env=e, expected_msg='no')
-+realm.run(['./t_bindings', '-s', server, 'a', '-'], env=e, expected_msg='no')
-+realm.run(['./t_bindings', '-s', server, 'a', 'a'], env=e, expected_msg='yes')
-+realm.run(['./t_bindings', '-s', server, '-', 'a'], env=e,
-+          expected_code=1, expected_msg='Incorrect channel bindings')
-+realm.run(['./t_bindings', '-s', server, 'a', 'x'], env=e,
-+          expected_code=1, expected_msg='Incorrect channel bindings')
-+
-+success('channel bindings tests')
-diff --git a/src/tests/gssapi/t_negoex.py b/src/tests/gssapi/t_negoex.py
-index 88470d2fa..a218899c4 100644
---- a/src/tests/gssapi/t_negoex.py
-+++ b/src/tests/gssapi/t_negoex.py
-@@ -139,4 +139,11 @@ msgs = ('sending [3]AP_REQUEST', 'sending [7]CHALLENGE', 'sending [8]VERIFY',
-         'sending [11]CHALLENGE', 'sending [12]VERIFY', 'sending [13]VERIFY')
- test({'HOPS': '4', 'KEY': 'accept-always'}, expected_trace=())
- 
-+mark('channel bindings')
-+e = realm.env.copy()
-+e.update({'HOPS': '1', 'GSS_INIT_BINDING': 'a', 'GSS_ACCEPT_BINDING': 'b'})
-+# The test mech will verify that the bindings are communicated to the
-+# mech, but does not set the channel-bound flag.
-+realm.run(['./t_bindings', '-s', 'h:host', 'a', 'b'], env=e, expected_msg='no')
-+
- success('NegoEx tests')
diff --git a/Add-client_aware_channel_bindings-option.patch b/Add-client_aware_channel_bindings-option.patch
deleted file mode 100644
index bd3bcba..0000000
--- a/Add-client_aware_channel_bindings-option.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From 46ec975eb8f33b6d42c440758fc0deb826f87313 Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Tue, 10 Mar 2020 13:13:17 +0100
-Subject: [PATCH] Add client_aware_channel_bindings option
-
-Add client support for KERB_AP_OPTIONS_CBT in the form of a profile
-option "client_aware_gss_bindings".  Adjust the make_etype_list()
-helper so that enctype negotiation and AP_OPTIONS can be included in
-the same IF-RELEVANT wrapper.
-
-[ghudson@mit.edu: refactored; edited documentation; wrote commit
-message]
-
-ticket: 8900
-(cherry picked from commit 225e6ef7f021cd1a8ef2a054af0ca58b7288fd81)
----
- doc/admin/conf_files/krb5_conf.rst |   6 +
- src/include/k5-int.h               |   1 +
- src/lib/krb5/krb/mk_req_ext.c      | 177 +++++++++++++++--------------
- 3 files changed, 98 insertions(+), 86 deletions(-)
-
-diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
-index 38f450367..da5ad00f2 100644
---- a/doc/admin/conf_files/krb5_conf.rst
-+++ b/doc/admin/conf_files/krb5_conf.rst
-@@ -388,6 +388,12 @@ The libdefaults section may contain any of the following relations:
-     credentials will fail if the client machine does not have a
-     keytab.  The default value is false.
- 
-+**client_aware_channel_bindings**
-+    If this flag is true, then all application protocol authentication
-+    requests will be flagged to indicate that the application supports
-+    channel bindings when operating over a secure channel.  The
-+    default value is false.
-+
- .. _realms:
- 
- [realms]
-diff --git a/src/include/k5-int.h b/src/include/k5-int.h
-index 0d9af3d95..eb18a4cd6 100644
---- a/src/include/k5-int.h
-+++ b/src/include/k5-int.h
-@@ -299,6 +299,7 @@ typedef unsigned char   u_char;
- #define KRB5_CONF_V4_INSTANCE_CONVERT          "v4_instance_convert"
- #define KRB5_CONF_V4_REALM                     "v4_realm"
- #define KRB5_CONF_VERIFY_AP_REQ_NOFAIL         "verify_ap_req_nofail"
-+#define KRB5_CONF_CLIENT_AWARE_GSS_BINDINGS    "client_aware_channel_bindings"
- 
- /* Cache configuration variables */
- #define KRB5_CC_CONF_FAST_AVAIL                "fast_avail"
-diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
-index 9fc6a0e52..08504860c 100644
---- a/src/lib/krb5/krb/mk_req_ext.c
-+++ b/src/lib/krb5/krb/mk_req_ext.c
-@@ -68,10 +68,9 @@
- */
- 
- static krb5_error_code
--make_etype_list(krb5_context context,
--                krb5_enctype *desired_etypes,
--                krb5_enctype tkt_enctype,
--                krb5_authdata ***authdata);
-+make_ap_authdata(krb5_context context, krb5_enctype *desired_enctypes,
-+                 krb5_enctype tkt_enctype, krb5_boolean client_aware_cb,
-+                 krb5_authdata ***authdata_out);
- 
- static krb5_error_code
- generate_authenticator(krb5_context,
-@@ -263,7 +262,8 @@ generate_authenticator(krb5_context context, krb5_authenticator *authent,
-                        krb5_enctype tkt_enctype)
- {
-     krb5_error_code retval;
--    krb5_authdata **ext_authdata = NULL;
-+    krb5_authdata **ext_authdata = NULL, **ap_authdata, **combined;
-+    int client_aware_cb;
- 
-     authent->client = client;
-     authent->checksum = cksum;
-@@ -297,99 +297,104 @@ generate_authenticator(krb5_context context, krb5_authenticator *authent,
-         krb5_free_authdata(context, ext_authdata);
-     }
- 
--    /* Only send EtypeList if we prefer another enctype to tkt_enctype */
--    if (desired_etypes != NULL && desired_etypes[0] != tkt_enctype) {
--        TRACE_MK_REQ_ETYPES(context, desired_etypes);
--        retval = make_etype_list(context, desired_etypes, tkt_enctype,
--                                 &authent->authorization_data);
-+    retval = profile_get_boolean(context->profile, KRB5_CONF_LIBDEFAULTS,
-+                                 KRB5_CONF_CLIENT_AWARE_GSS_BINDINGS, NULL,
-+                                 FALSE, &client_aware_cb);
-+    if (retval)
-+        return retval;
-+
-+    /* Add etype negotiation or channel-binding awareness authdata to the
-+     * front, if appropriate. */
-+    retval = make_ap_authdata(context, desired_etypes, tkt_enctype,
-+                              client_aware_cb, &ap_authdata);
-+    if (retval)
-+        return retval;
-+    if (ap_authdata != NULL) {
-+        retval = krb5_merge_authdata(context, ap_authdata,
-+                                     authent->authorization_data, &combined);
-+        krb5_free_authdata(context, ap_authdata);
-         if (retval)
-             return retval;
-+        krb5_free_authdata(context, authent->authorization_data);
-+        authent->authorization_data = combined;
-     }
- 
-     return(krb5_us_timeofday(context, &authent->ctime, &authent->cusec));
- }
- 
--/* RFC 4537 */
-+/* Set *out to a DER-encoded RFC 4537 etype list, or to NULL if no etype list
-+ * should be sent. */
- static krb5_error_code
--make_etype_list(krb5_context context,
--                krb5_enctype *desired_etypes,
--                krb5_enctype tkt_enctype,
--                krb5_authdata ***authdata)
-+make_etype_list(krb5_context context, krb5_enctype *desired_enctypes,
-+                krb5_enctype tkt_enctype, krb5_data **out)
- {
--    krb5_error_code code;
--    krb5_etype_list etypes;
--    krb5_data *enc_etype_list;
--    krb5_data *ad_if_relevant;
--    krb5_authdata *etype_adata[2], etype_adatum, **adata;
--    int i;
-+    krb5_etype_list etlist;
-+    int count;
- 
--    etypes.etypes = desired_etypes;
-+    *out = NULL;
- 
--    for (etypes.length = 0;
--         etypes.etypes[etypes.length] != ENCTYPE_NULL;
--         etypes.length++)
--    {
--        /*
--         * RFC 4537:
--         *
--         *   If the enctype of the ticket session key is included in the enctype
--         *   list sent by the client, it SHOULD be the last on the list;
--         */
--        if (etypes.length && etypes.etypes[etypes.length - 1] == tkt_enctype)
-+    /* Only send a list if we prefer another enctype to tkt_enctype. */
-+    if (desired_enctypes == NULL || desired_enctypes[0] == tkt_enctype)
-+        return 0;
-+
-+    /* Count elements of desired_etypes, stopping at tkt_enctypes if present.
-+     * (Per RFC 4537, it must be the last option if it is included.) */
-+    for (count = 0; desired_enctypes[count] != ENCTYPE_NULL; count++) {
-+        if (count > 0 && desired_enctypes[count - 1] == tkt_enctype)
-             break;
-     }
- 
--    code = encode_krb5_etype_list(&etypes, &enc_etype_list);
--    if (code) {
--        return code;
--    }
--
--    etype_adatum.magic = KV5M_AUTHDATA;
--    etype_adatum.ad_type = KRB5_AUTHDATA_ETYPE_NEGOTIATION;
--    etype_adatum.length = enc_etype_list->length;
--    etype_adatum.contents = (krb5_octet *)enc_etype_list->data;
--
--    etype_adata[0] = &etype_adatum;
--    etype_adata[1] = NULL;
--
--    /* Wrap in AD-IF-RELEVANT container */
--    code = encode_krb5_authdata(etype_adata, &ad_if_relevant);
--    if (code) {
--        krb5_free_data(context, enc_etype_list);
--        return code;
--    }
--
--    krb5_free_data(context, enc_etype_list);
--
--    adata = *authdata;
--    if (adata == NULL) {
--        adata = (krb5_authdata **)calloc(2, sizeof(krb5_authdata *));
--        i = 0;
--    } else {
--        for (i = 0; adata[i] != NULL; i++)
--            ;
--
--        adata = (krb5_authdata **)realloc(*authdata,
--                                          (i + 2) * sizeof(krb5_authdata *));
--    }
--    if (adata == NULL) {
--        krb5_free_data(context, ad_if_relevant);
--        return ENOMEM;
--    }
--    *authdata = adata;
--
--    adata[i] = (krb5_authdata *)malloc(sizeof(krb5_authdata));
--    if (adata[i] == NULL) {
--        krb5_free_data(context, ad_if_relevant);
--        return ENOMEM;
--    }
--    adata[i]->magic = KV5M_AUTHDATA;
--    adata[i]->ad_type = KRB5_AUTHDATA_IF_RELEVANT;
--    adata[i]->length = ad_if_relevant->length;
--    adata[i]->contents = (krb5_octet *)ad_if_relevant->data;
--    free(ad_if_relevant); /* contents owned by adata[i] */
--
--    adata[i + 1] = NULL;
--
--    return 0;
-+    etlist.etypes = desired_enctypes;
-+    etlist.length = count;
-+    return encode_krb5_etype_list(&etlist, out);
-+}
-+
-+/* Set *authdata_out to appropriate authenticator authdata for the request,
-+ * encoded in a single AD_IF_RELEVANT element. */
-+static krb5_error_code
-+make_ap_authdata(krb5_context context, krb5_enctype *desired_enctypes,
-+                 krb5_enctype tkt_enctype, krb5_boolean client_aware_cb,
-+                 krb5_authdata ***authdata_out)
-+{
-+    krb5_error_code ret;
-+    krb5_authdata etypes_ad, flags_ad, *list[3];
-+    krb5_data *der_etypes = NULL;
-+    size_t count = 0;
-+    uint8_t flagbuf[4];
-+    const uint32_t KERB_AP_OPTIONS_CBT = 0x4000;
-+
-+    *authdata_out = NULL;
-+
-+    /* Include an ETYPE_NEGOTIATION element if appropriate. */
-+    ret = make_etype_list(context, desired_enctypes, tkt_enctype, &der_etypes);
-+    if (ret)
-+        goto cleanup;
-+    if (der_etypes != NULL) {
-+        etypes_ad.magic = KV5M_AUTHDATA;
-+        etypes_ad.ad_type = KRB5_AUTHDATA_ETYPE_NEGOTIATION;
-+        etypes_ad.length = der_etypes->length;
-+        etypes_ad.contents = (uint8_t *)der_etypes->data;
-+        list[count++] = &etypes_ad;
-+    }
-+
-+    /* Include an AP_OPTIONS element if the CBT flag is configured. */
-+    if (client_aware_cb != 0) {
-+        store_32_le(KERB_AP_OPTIONS_CBT, flagbuf);
-+        flags_ad.magic = KV5M_AUTHDATA;
-+        flags_ad.ad_type = KRB5_AUTHDATA_AP_OPTIONS;
-+        flags_ad.length = 4;
-+        flags_ad.contents = flagbuf;
-+        list[count++] = &flags_ad;
-+    }
-+
-+    if (count > 0) {
-+        list[count] = NULL;
-+        ret = krb5_encode_authdata_container(context,
-+                                             KRB5_AUTHDATA_IF_RELEVANT,
-+                                             list, authdata_out);
-+    }
-+
-+cleanup:
-+    krb5_free_data(context, der_etypes);
-+    return ret;
- }
diff --git a/Add-finalization-safety-check-to-com_err.patch b/Add-finalization-safety-check-to-com_err.patch
deleted file mode 100644
index a7ebd53..0000000
--- a/Add-finalization-safety-check-to-com_err.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 96a36ef54aecb48b71c1ae0cc85b83ef644c3bd0 Mon Sep 17 00:00:00 2001
-From: Jiri Sasek <Jiri.Sasek@Oracle.COM>
-Date: Fri, 13 Mar 2020 19:02:58 +0100
-Subject: [PATCH] Add finalization safety check to com_err
-
-If the linker erroneously runs the libkrb5 finalizer after the
-libcom_err finalizer, the consequent remove_error_table() calls could
-crash due to accessing a destroyed mutex or an invalid et_list
-pointer.  Add an unsynchronized check on finalized in
-remove_error_table(), and set et_list to null in com_err_terminate()
-after destroying the list.
-
-[ghudson@mit.edu: minimized code hanges; rewrote comment and commit
-message]
-
-ticket: 8890 (new)
-(cherry picked from commit 9d654aa05e26bbf22f140abde3436afeff2fdf8d)
----
- src/util/et/error_message.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
-index d7069a9df..7dc02a34e 100644
---- a/src/util/et/error_message.c
-+++ b/src/util/et/error_message.c
-@@ -26,7 +26,7 @@
- 
- static struct et_list *et_list;
- static k5_mutex_t et_list_lock = K5_MUTEX_PARTIAL_INITIALIZER;
--static int terminated = 0;      /* for debugging shlib fini sequence errors */
-+static int terminated = 0;      /* for safety and finalization debugging */
- 
- MAKE_INIT_FUNCTION(com_err_initialize);
- MAKE_FINI_FUNCTION(com_err_terminate);
-@@ -69,6 +69,7 @@ void com_err_terminate(void)
-         enext = e->next;
-         free(e);
-     }
-+    et_list = NULL;
-     k5_mutex_unlock(&et_list_lock);
-     k5_mutex_destroy(&et_list_lock);
-     terminated = 1;
-@@ -280,6 +281,10 @@ remove_error_table(const struct error_table *et)
- {
-     struct et_list **ep, *e;
- 
-+    /* Safety check in case libraries are finalized in the wrong order. */
-+    if (terminated)
-+        return ENOENT;
-+
-     if (CALL_INIT_FUNCTION(com_err_initialize))
-         return 0;
-     k5_mutex_lock(&et_list_lock);
diff --git a/Add-recursion-limit-for-ASN.1-indefinite-lengths.patch b/Add-recursion-limit-for-ASN.1-indefinite-lengths.patch
deleted file mode 100644
index bc1229c..0000000
--- a/Add-recursion-limit-for-ASN.1-indefinite-lengths.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From b7aca8b57422cdc67a2d2bff385f09646ca037bc Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Sat, 31 Oct 2020 17:07:05 -0400
-Subject: [PATCH] Add recursion limit for ASN.1 indefinite lengths
-
-The libkrb5 ASN.1 decoder supports BER indefinite lengths.  It
-computes the tag length using recursion; the lack of a recursion limit
-allows an attacker to overrun the stack and cause the process to
-crash.  Reported by Demi Obenour.
-
-CVE-2020-28196:
-
-In MIT krb5 releases 1.11 and later, an unauthenticated attacker can
-cause a denial of service for any client or server to which it can
-send an ASN.1-encoded Kerberos message of sufficient length.
-
-ticket: 8959 (new)
-tags: pullup
-target_version: 1.18-next
-target_version: 1.17-next
-
-(cherry picked from commit 57415dda6cf04e73ffc3723be518eddfae599bfd)
----
- src/lib/krb5/asn.1/asn1_encode.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c
-index a160cf4fe..cd6b879f7 100644
---- a/src/lib/krb5/asn.1/asn1_encode.c
-+++ b/src/lib/krb5/asn.1/asn1_encode.c
-@@ -356,7 +356,7 @@ make_tag(asn1buf *buf, const taginfo *t, size_t len)
- static krb5_error_code
- get_tag(const uint8_t *asn1, size_t len, taginfo *tag_out,
-         const uint8_t **contents_out, size_t *clen_out,
--        const uint8_t **remainder_out, size_t *rlen_out)
-+        const uint8_t **remainder_out, size_t *rlen_out, int recursion)
- {
-     krb5_error_code ret;
-     uint8_t o;
-@@ -394,9 +394,11 @@ get_tag(const uint8_t *asn1, size_t len, taginfo *tag_out,
-         /* Indefinite form (should not be present in DER, but we accept it). */
-         if (tag_out->construction != CONSTRUCTED)
-             return ASN1_MISMATCH_INDEF;
-+        if (recursion >= 32)
-+            return ASN1_OVERFLOW;
-         p = asn1;
-         while (!(len >= 2 && p[0] == 0 && p[1] == 0)) {
--            ret = get_tag(p, len, &t, &c, &clen, &p, &len);
-+            ret = get_tag(p, len, &t, &c, &clen, &p, &len, recursion + 1);
-             if (ret)
-                 return ret;
-         }
-@@ -613,7 +615,7 @@ split_der(asn1buf *buf, uint8_t *const *der, size_t len, taginfo *tag_out)
-     const uint8_t *contents, *remainder;
-     size_t clen, rlen;
- 
--    ret = get_tag(*der, len, tag_out, &contents, &clen, &remainder, &rlen);
-+    ret = get_tag(*der, len, tag_out, &contents, &clen, &remainder, &rlen, 0);
-     if (ret)
-         return ret;
-     if (rlen != 0)
-@@ -1199,7 +1201,7 @@ decode_atype(const taginfo *t, const uint8_t *asn1, size_t len,
-         const uint8_t *rem;
-         size_t rlen;
-         if (!tag->implicit) {
--            ret = get_tag(asn1, len, &inner_tag, &asn1, &len, &rem, &rlen);
-+            ret = get_tag(asn1, len, &inner_tag, &asn1, &len, &rem, &rlen, 0);
-             if (ret)
-                 return ret;
-             /* Note: we don't check rlen (it should be 0). */
-@@ -1420,7 +1422,7 @@ decode_sequence(const uint8_t *asn1, size_t len, const struct seq_info *seq,
-     for (i = 0; i < seq->n_fields; i++) {
-         if (len == 0)
-             break;
--        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len);
-+        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len, 0);
-         if (ret)
-             goto error;
-         /*
-@@ -1478,7 +1480,7 @@ decode_sequence_of(const uint8_t *asn1, size_t len,
-     *seq_out = NULL;
-     *count_out = 0;
-     while (len > 0) {
--        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len);
-+        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len, 0);
-         if (ret)
-             goto error;
-         if (!check_atype_tag(elemtype, &t)) {
-@@ -1584,7 +1586,7 @@ k5_asn1_full_decode(const krb5_data *code, const struct atype_info *a,
- 
-     *retrep = NULL;
-     ret = get_tag((uint8_t *)code->data, code->length, &t, &contents,
--                  &clen, &remainder, &rlen);
-+                  &clen, &remainder, &rlen, 0);
-     if (ret)
-         return ret;
-     /* rlen should be 0, but we don't check it (and due to padding in
diff --git a/Add-three-kvno-options-from-Heimdal-kgetcred.patch b/Add-three-kvno-options-from-Heimdal-kgetcred.patch
deleted file mode 100644
index 40a6318..0000000
--- a/Add-three-kvno-options-from-Heimdal-kgetcred.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-From 538d787aa7c10894cc0426f54db0d8248efcf7c9 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Wed, 17 Jun 2020 20:48:38 -0400
-Subject: [PATCH] Add three kvno options from Heimdal kgetcred
-
-Add the flags --cached-only and --no-store, which pass the
-corresponding options to krb5_get_credentials().  Add the option
---out-cache to write the retrieved credentials to a specified output
-cache.
-
-Add a Python test script for kvno command-line options, including
-tests for the new options.
-
-ticket: 8917 (new)
-(cherry picked from commit 876bab8418d7dd134c9d9db812ee2118d5ad58f0)
----
- doc/user/user_commands/kvno.rst |  13 ++++
- src/clients/kvno/Makefile.in    |   3 +
- src/clients/kvno/kvno.c         | 115 +++++++++++++++++++++++---------
- src/clients/kvno/t_kvno.py      |  75 +++++++++++++++++++++
- src/man/kvno.man                |  13 ++++
- 5 files changed, 187 insertions(+), 32 deletions(-)
- create mode 100644 src/clients/kvno/t_kvno.py
-
-diff --git a/doc/user/user_commands/kvno.rst b/doc/user/user_commands/kvno.rst
-index 3892f0ca5..718313576 100644
---- a/doc/user/user_commands/kvno.rst
-+++ b/doc/user/user_commands/kvno.rst
-@@ -74,6 +74,19 @@ OPTIONS
-     client principal with the X.509 certificate in *cert_file*.  The
-     certificate file must be in PEM format.
- 
-+**--cached-only**
-+    Only retrieve credentials already present in the cache, not from
-+    the KDC.
-+
-+**--no-store**
-+    Do not store retrieved credentials in the cache.  If
-+    **--out-cache** is also specified, credentials will still be
-+    stored into the output credential cache.
-+
-+**--out-cache** *ccache*
-+    Initialize *ccache* and store all retrieved credentials into it.
-+    Do not store acquired credentials in the input cache.
-+
- **--u2u** *ccache*
-     Requests a user-to-user ticket.  *ccache* must contain a local
-     krbtgt ticket for the server principal.  The reported version
-diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
-index 1c3f79392..5ba877271 100644
---- a/src/clients/kvno/Makefile.in
-+++ b/src/clients/kvno/Makefile.in
-@@ -26,6 +26,9 @@ kvno: kvno.o $(KRB5_BASE_DEPLIBS)
- ##WIN32##	link $(EXE_LINKOPTS) /out:$@ $**
- ##WIN32##	$(_VC_MANIFEST_EMBED_EXE)
- 
-+check-pytests: kvno
-+	$(RUNPYTEST) $(srcdir)/t_kvno.py $(PYTESTFLAGS)
-+
- clean-unix::
- 	$(RM) kvno.o kvno
- 
-diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
-index 2472c0cfe..9d85864f6 100644
---- a/src/clients/kvno/kvno.c
-+++ b/src/clients/kvno/kvno.c
-@@ -44,14 +44,17 @@ xusage()
-     fprintf(stderr, _("usage: %s [-C] [-u] [-c ccache] [-e etype]\n"), prog);
-     fprintf(stderr, _("\t[-k keytab] [-S sname] [{-I | -U} for_user | "
-                       "[-F cert_file] [-P]]\n"));
--    fprintf(stderr, _("\t[--u2u ccache] service1 service2 ...\n"));
-+    fprintf(stderr, _("\t[--cached-only] [--no-store] [--out-cache ccache] "
-+                      "[--u2u ccache]\n"));
-+    fprintf(stderr, _("\tservice1 service2 ...\n"));
-     exit(1);
- }
- 
- static void do_v5_kvno(int argc, char *argv[], char *ccachestr, char *etypestr,
--                       char *keytab_name, char *sname, int canon, int unknown,
--                       char *for_user, int for_user_enterprise,
--                       char *for_user_cert_file, int proxy,
-+                       char *keytab_name, char *sname, int cached_only,
-+                       int canon, int no_store, int unknown, char *for_user,
-+                       int for_user_enterprise, char *for_user_cert_file,
-+                       int proxy, const char *out_ccname,
-                        const char *u2u_ccname);
- 
- #include <com_err.h>
-@@ -61,18 +64,21 @@ static void extended_com_err_fn(const char *myprog, errcode_t code,
- int
- main(int argc, char *argv[])
- {
--    enum { OPTION_U2U = 256 };
--    struct option lopts[] = {
--        { "u2u", 1, NULL, OPTION_U2U },
--        { NULL, 0, NULL, 0 }
--    };
-+    enum { OPTION_U2U = 256, OPTION_OUT_CACHE = 257 };
-     const char *shopts = "uCc:e:hk:qPS:I:U:F:";
-     int option;
-     char *etypestr = NULL, *ccachestr = NULL, *keytab_name = NULL;
-     char *sname = NULL, *for_user = NULL, *u2u_ccname = NULL;
--    char *for_user_cert_file = NULL;
-+    char *for_user_cert_file = NULL, *out_ccname = NULL;
-     int canon = 0, unknown = 0, proxy = 0, for_user_enterprise = 0;
--    int impersonate = 0;
-+    int impersonate = 0, cached_only = 0, no_store = 0;
-+    struct option lopts[] = {
-+        { "cached-only", 0, &cached_only, 1 },
-+        { "no-store", 0, &no_store, 1 },
-+        { "out-cache", 1, NULL, OPTION_OUT_CACHE },
-+        { "u2u", 1, NULL, OPTION_U2U },
-+        { NULL, 0, NULL, 0 }
-+    };
- 
-     setlocale(LC_ALL, "");
-     set_com_err_hook(extended_com_err_fn);
-@@ -135,6 +141,12 @@ main(int argc, char *argv[])
-         case OPTION_U2U:
-             u2u_ccname = optarg;
-             break;
-+        case OPTION_OUT_CACHE:
-+            out_ccname = optarg;
-+            break;
-+        case 0:
-+            /* If this option set a flag, do nothing else now. */
-+            break;
-         default:
-             xusage();
-             break;
-@@ -159,8 +171,9 @@ main(int argc, char *argv[])
-         xusage();
- 
-     do_v5_kvno(argc - optind, argv + optind, ccachestr, etypestr, keytab_name,
--               sname, canon, unknown, for_user, for_user_enterprise,
--               for_user_cert_file, proxy, u2u_ccname);
-+               sname, cached_only, canon, no_store, unknown, for_user,
-+               for_user_enterprise, for_user_cert_file, proxy, out_ccname,
-+               u2u_ccname);
-     return 0;
- }
- 
-@@ -274,14 +287,16 @@ static krb5_error_code
- kvno(const char *name, krb5_ccache ccache, krb5_principal me,
-      krb5_enctype etype, krb5_keytab keytab, const char *sname,
-      krb5_flags options, int unknown, krb5_principal for_user_princ,
--     krb5_data *for_user_cert, int proxy, krb5_data *u2u_ticket)
-+     krb5_data *for_user_cert, int proxy, krb5_data *u2u_ticket,
-+     krb5_creds **creds_out)
- {
-     krb5_error_code ret;
-     krb5_principal server = NULL;
-     krb5_ticket *ticket = NULL;
--    krb5_creds in_creds, *out_creds = NULL;
-+    krb5_creds in_creds, *creds = NULL;
-     char *princ = NULL;
- 
-+    *creds_out = NULL;
-     memset(&in_creds, 0, sizeof(in_creds));
- 
-     if (sname != NULL) {
-@@ -321,13 +336,12 @@ kvno(const char *name, krb5_ccache ccache, krb5_principal me,
-         in_creds.client = for_user_princ;
-         in_creds.server = me;
-         ret = krb5_get_credentials_for_user(context, options, ccache,
--                                            &in_creds, for_user_cert,
--                                            &out_creds);
-+                                            &in_creds, for_user_cert, &creds);
-     } else {
-         in_creds.client = me;
-         in_creds.server = server;
-         ret = krb5_get_credentials(context, options, ccache, &in_creds,
--                                   &out_creds);
-+                                   &creds);
-     }
- 
-     if (ret) {
-@@ -336,7 +350,7 @@ kvno(const char *name, krb5_ccache ccache, krb5_principal me,
-     }
- 
-     /* We need a native ticket. */
--    ret = krb5_decode_ticket(&out_creds->ticket, &ticket);
-+    ret = krb5_decode_ticket(&creds->ticket, &ticket);
-     if (ret) {
-         com_err(prog, ret, _("while decoding ticket for %s"), princ);
-         goto cleanup;
-@@ -362,15 +376,15 @@ kvno(const char *name, krb5_ccache ccache, krb5_principal me,
-     }
- 
-     if (proxy) {
--        in_creds.client = out_creds->client;
--        out_creds->client = NULL;
--        krb5_free_creds(context, out_creds);
--        out_creds = NULL;
-+        in_creds.client = creds->client;
-+        creds->client = NULL;
-+        krb5_free_creds(context, creds);
-+        creds = NULL;
-         in_creds.server = server;
- 
-         ret = krb5_get_credentials_for_proxy(context, KRB5_GC_CANONICALIZE,
-                                              ccache, &in_creds, ticket,
--                                             &out_creds);
-+                                             &creds);
-         krb5_free_principal(context, in_creds.client);
-         if (ret) {
-             com_err(prog, ret, _("%s: constrained delegation failed"),
-@@ -379,10 +393,13 @@ kvno(const char *name, krb5_ccache ccache, krb5_principal me,
-         }
-     }
- 
-+    *creds_out = creds;
-+    creds = NULL;
-+
- cleanup:
-     krb5_free_principal(context, server);
-     krb5_free_ticket(context, ticket);
--    krb5_free_creds(context, out_creds);
-+    krb5_free_creds(context, creds);
-     krb5_free_unparsed_name(context, princ);
-     return ret;
- }
-@@ -428,19 +445,28 @@ cleanup:
- 
- static void
- do_v5_kvno(int count, char *names[], char * ccachestr, char *etypestr,
--           char *keytab_name, char *sname, int canon, int unknown,
--           char *for_user, int for_user_enterprise,
--           char *for_user_cert_file, int proxy, const char *u2u_ccname)
-+           char *keytab_name, char *sname, int cached_only, int canon,
-+           int no_store, int unknown, char *for_user, int for_user_enterprise,
-+           char *for_user_cert_file, int proxy, const char *out_ccname,
-+           const char *u2u_ccname)
- {
-     krb5_error_code ret;
--    int i, errors, flags;
-+    int i, errors, flags, initialized = 0;
-     krb5_enctype etype;
--    krb5_ccache ccache;
-+    krb5_ccache ccache, out_ccache = NULL;
-     krb5_principal me;
-     krb5_keytab keytab = NULL;
-     krb5_principal for_user_princ = NULL;
--    krb5_flags options = canon ? KRB5_GC_CANONICALIZE : 0;
-+    krb5_flags options = 0;
-     krb5_data cert_data = empty_data(), *user_cert = NULL, *u2u_ticket = NULL;
-+    krb5_creds *creds;
-+
-+    if (canon)
-+        options |= KRB5_GC_CANONICALIZE;
-+    if (cached_only)
-+        options |= KRB5_GC_CACHED;
-+    if (no_store || out_ccname != NULL)
-+        options |= KRB5_GC_NO_STORE;
- 
-     ret = krb5_init_context(&context);
-     if (ret) {
-@@ -467,6 +493,14 @@ do_v5_kvno(int count, char *names[], char * ccachestr, char *etypestr,
-         exit(1);
-     }
- 
-+    if (out_ccname != NULL) {
-+        ret = krb5_cc_resolve(context, out_ccname, &out_ccache);
-+        if (ret) {
-+            com_err(prog, ret, _("while resolving output ccache"));
-+            exit(1);
-+        }
-+    }
-+
-     if (keytab_name != NULL) {
-         ret = krb5_kt_resolve(context, keytab_name, &keytab);
-         if (ret) {
-@@ -513,8 +547,25 @@ do_v5_kvno(int count, char *names[], char * ccachestr, char *etypestr,
-     errors = 0;
-     for (i = 0; i < count; i++) {
-         if (kvno(names[i], ccache, me, etype, keytab, sname, options, unknown,
--                 for_user_princ, user_cert, proxy, u2u_ticket) != 0)
-+                 for_user_princ, user_cert, proxy, u2u_ticket, &creds) != 0) {
-             errors++;
-+        } else if (out_ccache != NULL) {
-+            if (!initialized) {
-+                ret = krb5_cc_initialize(context, out_ccache, creds->client);
-+                if (ret) {
-+                    com_err(prog, ret, _("while initializing output ccache"));
-+                    exit(1);
-+                }
-+                initialized = 1;
-+            }
-+            ret = krb5_cc_store_cred(context, out_ccache, creds);
-+            if (ret) {
-+                com_err(prog, ret, _("while storing creds in output ccache"));
-+                exit(1);
-+            }
-+        }
-+
-+        krb5_free_creds(context, creds);
-     }
- 
-     if (keytab != NULL)
-diff --git a/src/clients/kvno/t_kvno.py b/src/clients/kvno/t_kvno.py
-new file mode 100644
-index 000000000..e98b90e8a
---- /dev/null
-+++ b/src/clients/kvno/t_kvno.py
-@@ -0,0 +1,75 @@
-+from k5test import *
-+
-+realm = K5Realm()
-+
-+def check_cache(ccache, expected_services):
-+    # Fetch the klist output and skip past the header.
-+    lines = realm.run([klist, '-c', ccache]).splitlines()
-+    lines = lines[4:]
-+
-+    # For each line not beginning with an indent, match against the
-+    # expected service principals.
-+    svcs = {x: True for x in expected_services}
-+    for l in lines:
-+        if not l.startswith('\t'):
-+            svcprinc = l.split()[4]
-+            if svcprinc in svcs:
-+                del svcs[svcprinc]
-+            else:
-+                fail('unexpected service princ ' + svcprinc)
-+
-+    if svcs:
-+        fail('services not found in klist output: ' + ' '.join(svcs.keys()))
-+
-+
-+mark('no options')
-+realm.run([kvno, realm.user_princ], expected_msg='user@KRBTEST.COM: kvno = 1')
-+check_cache(realm.ccache, [realm.krbtgt_princ, realm.user_princ])
-+
-+mark('-e')
-+msgs = ('etypes requested in TGS request: camellia128-cts',
-+        '/KDC has no support for encryption type')
-+realm.run([kvno, '-e', 'camellia128-cts', realm.host_princ],
-+          expected_code=1, expected_trace=msgs)
-+
-+mark('--cached-only')
-+realm.run([kvno, '--cached-only', realm.user_princ], expected_msg='kvno = 1')
-+realm.run([kvno, '--cached-only', realm.host_princ],
-+          expected_code=1, expected_msg='Matching credential not found')
-+check_cache(realm.ccache, [realm.krbtgt_princ, realm.user_princ])
-+
-+mark('--no-store')
-+realm.run([kvno, '--no-store', realm.host_princ], expected_msg='kvno = 1')
-+check_cache(realm.ccache, [realm.krbtgt_princ, realm.user_princ])
-+
-+mark('--out-cache') # and multiple services
-+out_ccache = os.path.join(realm.testdir, 'ccache.out')
-+realm.run([kvno, '--out-cache', out_ccache,
-+           realm.host_princ, realm.admin_princ])
-+check_cache(realm.ccache, [realm.krbtgt_princ, realm.user_princ])
-+check_cache(out_ccache, [realm.host_princ, realm.admin_princ])
-+
-+mark('--out-cache --cached-only') # tests out-cache overwriting, and -q
-+realm.run([kvno, '--out-cache', out_ccache, '--cached-only', realm.host_princ],
-+          expected_code=1, expected_msg='Matching credential not found')
-+out = realm.run([kvno, '-q', '--out-cache', out_ccache, '--cached-only',
-+                 realm.user_princ])
-+if out:
-+    fail('unexpected kvno output with -q')
-+check_cache(out_ccache, [realm.user_princ])
-+
-+mark('-U') # and -c
-+svc_ccache = os.path.join(realm.testdir, 'ccache.svc')
-+realm.run([kinit, '-k', '-c', svc_ccache, realm.host_princ])
-+realm.run([kvno, '-c', svc_ccache, '-U', 'user', realm.host_princ])
-+realm.run([klist, '-c', svc_ccache], expected_msg='for client user@')
-+realm.run([kvno, '-c', svc_ccache, '-U', 'user', '--out-cache', out_ccache,
-+           realm.host_princ])
-+out = realm.run([klist, '-c', out_ccache])
-+if ('Default principal: user@KRBTEST.COM' not in out):
-+    fail('wrong default principal in klist output')
-+
-+# More S4U options are tested in tests/gssapi/t_s4u.py.
-+# --u2u is tested in tests/t_u2u.py.
-+
-+success('kvno tests')
-diff --git a/src/man/kvno.man b/src/man/kvno.man
-index 005a2ec97..b9f6739eb 100644
---- a/src/man/kvno.man
-+++ b/src/man/kvno.man
-@@ -95,6 +95,19 @@ Specifies that protocol transition is to be used, identifying the
- client principal with the X.509 certificate in \fIcert_file\fP\&.  The
- certificate file must be in PEM format.
- .TP
-+\fB\-\-cached\-only\fP
-+Only retrieve credentials already present in the cache, not from
-+the KDC.
-+.TP
-+\fB\-\-no\-store\fP
-+Do not store retrieved credentials in the cache.  If
-+\fB\-\-out\-cache\fP is also specified, credentials will still be
-+stored into the output credential cache.
-+.TP
-+\fB\-\-out\-cache\fP \fIccache\fP
-+Initialize \fIccache\fP and store all retrieved credentials into it.
-+Do not store acquired credentials in the input cache.
-+.TP
- \fB\-\-u2u\fP \fIccache\fP
- Requests a user\-to\-user ticket.  \fIccache\fP must contain a local
- krbtgt ticket for the server principal.  The reported version
diff --git a/Adjust-KDC-alias-helper-function-contract.patch b/Adjust-KDC-alias-helper-function-contract.patch
deleted file mode 100644
index 7b7c62b..0000000
--- a/Adjust-KDC-alias-helper-function-contract.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 758f5031fe9d6c1e3eb33818bc6d57cf8b4a3a72 Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Tue, 22 Sep 2020 01:11:39 +0300
-Subject: [PATCH] Adjust KDC alias helper function contract
-
-Change the name of is_client_alias() to is_client_db_alias(), and
-change the contract so that the already-canonical principal name comes
-from a DB entry (which is less flexible, but clearer since DB entries
-always contain canonical principal names).  Make the function
-available outside of kdc_util.c.
-
-[ghudson@mit.edu: clarified commit message]
-
-(cherry picked from commit 9fb5f572dd6ce808b234cb60a573eac48136d7ca)
----
- src/kdc/kdc_util.c | 14 +++++++-------
- src/kdc/kdc_util.h |  4 ++++
- 2 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index dcb2df8dc..6330387d0 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -1463,10 +1463,10 @@ cleanup:
-     return code;
- }
- 
--/* Return true if princ canonicalizes to the same principal as canon. */
--static krb5_boolean
--is_client_alias(krb5_context context, krb5_const_principal canon,
--                krb5_const_principal princ)
-+/* Return true if princ canonicalizes to the same principal as entry's. */
-+krb5_boolean
-+is_client_db_alias(krb5_context context, const krb5_db_entry *entry,
-+                   krb5_const_principal princ)
- {
-     krb5_error_code ret;
-     krb5_db_entry *self;
-@@ -1475,7 +1475,7 @@ is_client_alias(krb5_context context, krb5_const_principal canon,
-     ret = krb5_db_get_principal(context, princ,
-                                 KRB5_KDB_FLAG_CLIENT_REFERRALS_ONLY, &self);
-     if (!ret) {
--        is_self = krb5_principal_compare(context, canon, self->princ);
-+        is_self = krb5_principal_compare(context, entry->princ, self->princ);
-         krb5_db_free_principal(context, self);
-     }
- 
-@@ -1535,7 +1535,7 @@ kdc_process_s4u2self_req(kdc_realm_t *kdc_active_realm,
- 
-     /* If the server is local, check that the request is for self. */
-     if (!isflagset(c_flags, KRB5_KDB_FLAG_ISSUING_REFERRAL) &&
--        !is_client_alias(kdc_context, server->princ, client_princ)) {
-+        !is_client_db_alias(kdc_context, server, client_princ)) {
-         *status = "INVALID_S4U2SELF_REQUEST_SERVER_MISMATCH";
-         return KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN; /* match Windows error */
-     }
-@@ -1728,7 +1728,7 @@ kdc_process_s4u2proxy_req(kdc_realm_t *kdc_active_realm, unsigned int flags,
-         }
- 
-         client_princ = *stkt_authdata_client;
--    } else if (!is_client_alias(kdc_context, server->princ, server_princ)) {
-+    } else if (!is_client_db_alias(kdc_context, server, server_princ)) {
-         *status = "EVIDENCE_TICKET_MISMATCH";
-         return KRB5KDC_ERR_SERVER_NOMATCH;
-     }
-diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
-index 384b21ad2..2c9d8cf69 100644
---- a/src/kdc/kdc_util.h
-+++ b/src/kdc/kdc_util.h
-@@ -344,6 +344,10 @@ log_tgs_badtrans(krb5_context ctx, krb5_principal cprinc,
- void
- log_tgs_alt_tgt(krb5_context context, krb5_principal p);
- 
-+krb5_boolean
-+is_client_db_alias(krb5_context context, const krb5_db_entry *entry,
-+                   krb5_const_principal princ);
-+
- /* FAST*/
- enum krb5_fast_kdc_flags {
-     KRB5_FAST_REPLY_KEY_USED = 0x1,
diff --git a/Allow-aliases-when-matching-U2U-second-ticket.patch b/Allow-aliases-when-matching-U2U-second-ticket.patch
deleted file mode 100644
index 8622ff8..0000000
--- a/Allow-aliases-when-matching-U2U-second-ticket.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ccc5b9663e229f20421c01836aa5ecb06f1f2a48 Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Tue, 22 Sep 2020 01:17:11 +0300
-Subject: [PATCH] Allow aliases when matching U2U second ticket
-
-In process_tgs_req() when verifying the user-to-user second ticket,
-compare the canonical names of the request server and the second
-ticket client.
-
-[ghudson@mit.edu: expanded commit message; trimmed tests]
-
-ticket: 8951 (new)
-(cherry picked from commit afc494ef9418e6be7fbb887364efa6606b10034a)
----
- src/kdc/do_tgs_req.c |  2 +-
- src/tests/t_u2u.py   | 25 +++++++++++++++++++++++++
- 2 files changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index 463a9c0dd..74cd19e96 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -666,7 +666,7 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt,
-          */
-         krb5_enc_tkt_part *t2enc = request->second_ticket[st_idx]->enc_part2;
-         krb5_principal client2 = t2enc->client;
--        if (!krb5_principal_compare(kdc_context, request->server, client2)) {
-+        if (!is_client_db_alias(kdc_context, server, client2)) {
-             altcprinc = client2;
-             errcode = KRB5KDC_ERR_SERVER_NOMATCH;
-             status = "2ND_TKT_MISMATCH";
-diff --git a/src/tests/t_u2u.py b/src/tests/t_u2u.py
-index 1ca6ac87e..4b8a82a2f 100644
---- a/src/tests/t_u2u.py
-+++ b/src/tests/t_u2u.py
-@@ -32,4 +32,29 @@ realm.run([kvno, '--u2u', realm.ccache, realm.user_princ])
- 
- realm.run([klist])
- 
-+realm.stop()
-+
-+# Load the test KDB module to test aliases
-+testprincs = {'krbtgt/KRBTEST.COM': {'keys': 'aes128-cts'},
-+              'user': {'keys': 'aes128-cts', 'flags': '+preauth'},
-+              'WIN10': {'keys': 'aes128-cts'}}
-+kdcconf = {'realms': {'$realm': {'database_module': 'test'}},
-+           'dbmodules': {'test': {'db_library': 'test',
-+                                  'princs': testprincs,
-+                                  'alias': {'HOST/win10': 'WIN10'}}}}
-+
-+realm = K5Realm(kdc_conf=kdcconf, create_kdb=False)
-+realm.start_kdc()
-+
-+# Create a second user principal and get tickets for it.
-+u2u_ccache = 'FILE:' + os.path.join(realm.testdir, 'ccu2u')
-+realm.extract_keytab('WIN10', realm.keytab)
-+realm.kinit('WIN10', None, ['-k', '-c', u2u_ccache])
-+
-+realm.extract_keytab(realm.user_princ, realm.keytab)
-+realm.kinit(realm.user_princ, None, ['-k'])
-+
-+realm.run([kvno, '--u2u', u2u_ccache, 'HOST/win10'], expected_msg='kvno = 0')
-+realm.run([kvno, '--u2u', u2u_ccache, 'WIN10'], expected_msg='kvno = 0')
-+
- success('user-to-user tests')
diff --git a/Allow-certauth-modules-to-set-hw-authent-flag.patch b/Allow-certauth-modules-to-set-hw-authent-flag.patch
deleted file mode 100644
index 94ff5dd..0000000
--- a/Allow-certauth-modules-to-set-hw-authent-flag.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 5b62f6f6a960e5a428a39a3e83e0a16dba5a914a Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Mon, 24 Feb 2020 15:58:59 -0500
-Subject: [PATCH] Allow certauth modules to set hw-authent flag
-
-In PKINIT, if a certauth module returns KRB5_CERTAUTH_HWAUTH from its
-authorize method, set the hw-authent flag in the ticket.
-
-ticket: 8879 (new)
-(cherry picked from commit 50fb43b4a2d97ce2cd53e1ced30e8e8224fede70)
----
- doc/plugindev/certauth.rst              |  7 +++++--
- src/include/krb5/certauth_plugin.h      |  9 ++++++---
- src/lib/krb5/error_tables/k5e1_err.et   |  1 +
- src/plugins/certauth/test/Makefile.in   |  4 ++--
- src/plugins/certauth/test/main.c        | 11 +++++++++--
- src/plugins/preauth/pkinit/pkinit_srv.c | 24 ++++++++++++++++--------
- src/tests/t_certauth.py                 | 13 +++++++++++++
- 7 files changed, 52 insertions(+), 17 deletions(-)
-
-diff --git a/doc/plugindev/certauth.rst b/doc/plugindev/certauth.rst
-index 8a7f7c5eb..3b715f738 100644
---- a/doc/plugindev/certauth.rst
-+++ b/doc/plugindev/certauth.rst
-@@ -15,8 +15,11 @@ principal.  **authorize** receives the DER-encoded certificate, the
- requested client principal, and a pointer to the client's
- krb5_db_entry (for modules that link against libkdb5).  It returns the
- authorization status and optionally outputs a list of authentication
--indicator strings to be added to the ticket.  A module must use its
--own internal or library-provided ASN.1 certificate decoder.
-+indicator strings to be added to the ticket.  Beginning in release
-+1.19, the authorize method can request that the hardware
-+authentication bit be set in the ticket by returning
-+**KRB5_CERTAUTH_HWAUTH**.  A module must use its own internal or
-+library-provided ASN.1 certificate decoder.
- 
- A module can optionally create and destroy module data with the
- **init** and **fini** methods.  Module data objects last for the
-diff --git a/src/include/krb5/certauth_plugin.h b/src/include/krb5/certauth_plugin.h
-index 3074790f8..3466cf345 100644
---- a/src/include/krb5/certauth_plugin.h
-+++ b/src/include/krb5/certauth_plugin.h
-@@ -85,14 +85,17 @@ typedef void
- (*krb5_certauth_fini_fn)(krb5_context context, krb5_certauth_moddata moddata);
- 
- /*
-- * Mandatory:
-- * Return 0 if the DER-encoded cert is authorized for PKINIT authentication by
-- * princ; otherwise return one of the following error codes:
-+ * Mandatory: return 0 or KRB5_CERTAUTH_HWAUTH if the DER-encoded cert is
-+ * authorized for PKINIT authentication by princ; otherwise return one of the
-+ * following error codes:
-  * - KRB5KDC_ERR_CLIENT_NAME_MISMATCH - incorrect SAN value
-  * - KRB5KDC_ERR_INCONSISTENT_KEY_PURPOSE - incorrect EKU
-  * - KRB5KDC_ERR_CERTIFICATE_MISMATCH - other extension error
-  * - KRB5_PLUGIN_NO_HANDLE - the module has no opinion about cert
-  *
-+ * Returning KRB5_CERTAUTH_HWAUTH will cause the hw-authent flag to be set in
-+ * the issued ticket (new in release 1.19).
-+ *
-  * - opts is used by built-in modules to receive internal data, and must be
-  *   ignored by other modules.
-  * - db_entry receives the client principal database entry, and can be ignored
-diff --git a/src/lib/krb5/error_tables/k5e1_err.et b/src/lib/krb5/error_tables/k5e1_err.et
-index ade5caecf..abd9f3bfe 100644
---- a/src/lib/krb5/error_tables/k5e1_err.et
-+++ b/src/lib/krb5/error_tables/k5e1_err.et
-@@ -42,4 +42,5 @@ error_code KRB5_KCM_MALFORMED_REPLY, "Malformed reply from KCM daemon"
- error_code KRB5_KCM_RPC_ERROR, "Mach RPC error communicating with KCM daemon"
- error_code KRB5_KCM_REPLY_TOO_BIG, "KCM daemon reply too big"
- error_code KRB5_KCM_NO_SERVER, "No KCM server found"
-+error_code KRB5_CERTAUTH_HWAUTH, "Authorize and set hw-authent ticket flag"
- end
-diff --git a/src/plugins/certauth/test/Makefile.in b/src/plugins/certauth/test/Makefile.in
-index d3524084c..e94c13845 100644
---- a/src/plugins/certauth/test/Makefile.in
-+++ b/src/plugins/certauth/test/Makefile.in
-@@ -5,8 +5,8 @@ LIBBASE=certauth_test
- LIBMAJOR=0
- LIBMINOR=0
- RELDIR=../plugins/certauth/test
--SHLIB_EXPDEPS=$(KRB5_BASE_DEPLIBS)
--SHLIB_EXPLIBS=$(KRB5_BASE_LIBS)
-+SHLIB_EXPDEPS=$(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
-+SHLIB_EXPLIBS=$(KDB5_LIBS) $(KRB5_BASE_LIBS)
- 
- STLIBOBJS=main.o
- 
-diff --git a/src/plugins/certauth/test/main.c b/src/plugins/certauth/test/main.c
-index 77641230c..d4633b8cd 100644
---- a/src/plugins/certauth/test/main.c
-+++ b/src/plugins/certauth/test/main.c
-@@ -31,6 +31,7 @@
-  */
- 
- #include <k5-int.h>
-+#include <kdb.h>
- #include "krb5/certauth_plugin.h"
- 
- struct krb5_certauth_moddata_st {
-@@ -131,7 +132,8 @@ has_cn(krb5_context context, const uint8_t *cert, size_t cert_len,
- 
- /*
-  * Test module 2 returns OK if princ matches the CN part of the subject name,
-- * and returns indicators of the module name and princ.
-+ * and returns indicators of the module name and princ.  If the "hwauth" string
-+ * attribute is set on db_entry, it returns KRB5_CERTAUTH_HWAUTH.
-  */
- static krb5_error_code
- test2_authorize(krb5_context context, krb5_certauth_moddata moddata,
-@@ -141,7 +143,7 @@ test2_authorize(krb5_context context, krb5_certauth_moddata moddata,
-                 char ***authinds_out)
- {
-     krb5_error_code ret;
--    char *name = NULL, **ais = NULL;
-+    char *name = NULL, *strval = NULL, **ais = NULL;
- 
-     *authinds_out = NULL;
- 
-@@ -167,6 +169,11 @@ test2_authorize(krb5_context context, krb5_certauth_moddata moddata,
- 
-     ais = NULL;
- 
-+    ret = krb5_dbe_get_string(context, (krb5_db_entry *)db_entry, "hwauth",
-+                              &strval);
-+    ret = (strval != NULL) ? KRB5_CERTAUTH_HWAUTH : 0;
-+    krb5_dbe_free_string(context, strval);
-+
- cleanup:
-     krb5_free_unparsed_name(context, name);
-     return ret;
-diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
-index feca11806..3ae56c064 100644
---- a/src/plugins/preauth/pkinit/pkinit_srv.c
-+++ b/src/plugins/preauth/pkinit/pkinit_srv.c
-@@ -320,12 +320,12 @@ static krb5_error_code
- authorize_cert(krb5_context context, certauth_handle *certauth_modules,
-                pkinit_kdc_context plgctx, pkinit_kdc_req_context reqctx,
-                krb5_kdcpreauth_callbacks cb, krb5_kdcpreauth_rock rock,
--               krb5_principal client)
-+               krb5_principal client, krb5_boolean *hwauth_out)
- {
-     krb5_error_code ret;
-     certauth_handle h;
-     struct certauth_req_opts opts;
--    krb5_boolean accepted = FALSE;
-+    krb5_boolean accepted = FALSE, hwauth = FALSE;
-     uint8_t *cert;
-     size_t i, cert_len;
-     void *db_ent = NULL;
-@@ -347,9 +347,10 @@ authorize_cert(krb5_context context, certauth_handle *certauth_modules,
- 
-     /*
-      * Check the certificate against each certauth module.  For the certificate
--     * to be authorized at least one module must return 0, and no module can an
--     * error code other than KRB5_PLUGIN_NO_HANDLE (pass).  Add indicators from
--     * modules that return 0 or pass.
-+     * to be authorized at least one module must return 0 or
-+     * KRB5_CERTAUTH_HWAUTH, and no module can return an error code other than
-+     * KRB5_PLUGIN_NO_HANDLE (pass).  Add indicators from modules that return 0
-+     * or pass.
-      */
-     ret = KRB5_PLUGIN_NO_HANDLE;
-     for (i = 0; certauth_modules != NULL && certauth_modules[i] != NULL; i++) {
-@@ -359,6 +360,8 @@ authorize_cert(krb5_context context, certauth_handle *certauth_modules,
-                               &opts, db_ent, &ais);
-         if (ret == 0)
-             accepted = TRUE;
-+        else if (ret == KRB5_CERTAUTH_HWAUTH)
-+            accepted = hwauth = TRUE;
-         else if (ret != KRB5_PLUGIN_NO_HANDLE)
-             goto cleanup;
- 
-@@ -374,6 +377,7 @@ authorize_cert(krb5_context context, certauth_handle *certauth_modules,
-         }
-     }
- 
-+    *hwauth_out = hwauth;
-     ret = accepted ? 0 : KRB5KDC_ERR_CLIENT_NAME_MISMATCH;
- 
- cleanup:
-@@ -430,7 +434,7 @@ pkinit_server_verify_padata(krb5_context context,
-     int is_signed = 1;
-     krb5_pa_data **e_data = NULL;
-     krb5_kdcpreauth_modreq modreq = NULL;
--    krb5_boolean valid_freshness_token = FALSE;
-+    krb5_boolean valid_freshness_token = FALSE, hwauth = FALSE;
-     char **sp;
- 
-     pkiDebug("pkinit_verify_padata: entered!\n");
-@@ -494,7 +498,7 @@ pkinit_server_verify_padata(krb5_context context,
-     }
-     if (is_signed) {
-         retval = authorize_cert(context, moddata->certauth_modules, plgctx,
--                                reqctx, cb, rock, request->client);
-+                                reqctx, cb, rock, request->client, &hwauth);
-         if (retval)
-             goto cleanup;
- 
-@@ -613,6 +617,8 @@ pkinit_server_verify_padata(krb5_context context,
- 
-     /* remember to set the PREAUTH flag in the reply */
-     enc_tkt_reply->flags |= TKT_FLG_PRE_AUTH;
-+    if (hwauth)
-+        enc_tkt_reply->flags |= TKT_FLG_HW_AUTH;
-     modreq = (krb5_kdcpreauth_modreq)reqctx;
-     reqctx = NULL;
- 
-@@ -1044,7 +1050,9 @@ pkinit_server_get_flags(krb5_context kcontext, krb5_preauthtype patype)
- {
-     if (patype == KRB5_PADATA_PKINIT_KX)
-         return PA_INFO;
--    return PA_SUFFICIENT | PA_REPLACES_KEY | PA_TYPED_E_DATA;
-+    /* PKINIT does not normally set the hw-authent ticket flag, but a
-+     * certauth module can cause it to do so. */
-+    return PA_SUFFICIENT | PA_REPLACES_KEY | PA_TYPED_E_DATA | PA_HARDWARE;
- }
- 
- static krb5_preauthtype supported_server_pa_types[] = {
-diff --git a/src/tests/t_certauth.py b/src/tests/t_certauth.py
-index 9c7094525..0fe0fdb4a 100644
---- a/src/tests/t_certauth.py
-+++ b/src/tests/t_certauth.py
-@@ -43,4 +43,17 @@ out = realm.kinit("user2@KRBTEST.COM",
-                   expected_code=1,
-                   expected_msg='kinit: Certificate mismatch')
- 
-+# Test the KRB5_CERTAUTH_HWAUTH return code.
-+mark('hw-authent flag tests')
-+# First test +requires_hwauth without causing the hw-authent ticket
-+# flag to be set.  This currently results in a preauth loop.
-+realm.run([kadminl, 'modprinc', '+requires_hwauth', realm.user_princ])
-+realm.kinit(realm.user_princ,
-+            flags=['-X', 'X509_user_identity=%s' % file_identity],
-+            expected_code=1, expected_msg='Looping detected')
-+# Cause the test2 module to return KRB5_CERTAUTH_HWAUTH and try again.
-+realm.run([kadminl, 'setstr', realm.user_princ, 'hwauth', 'x'])
-+realm.kinit(realm.user_princ,
-+            flags=['-X', 'X509_user_identity=%s' % file_identity])
-+
- success("certauth tests")
diff --git a/Allow-gss_unwrap_iov-of-unpadded-RC4-tokens.patch b/Allow-gss_unwrap_iov-of-unpadded-RC4-tokens.patch
deleted file mode 100644
index 3824646..0000000
--- a/Allow-gss_unwrap_iov-of-unpadded-RC4-tokens.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 594c9d225f470e73a46dd2a85c5e50571e90598c Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Sat, 11 Jul 2020 21:57:30 -0400
-Subject: [PATCH] Allow gss_unwrap_iov() of unpadded RC4 tokens
-
-Windows Remote Management, when used with an RC4 session key, appears
-to generate GSS wrap tokens with no padding instead of the expected
-one byte (RFC 4757 section 7.3).  These tokens cannot be decoded with
-gss_unwrap() or a STREAM buffer (even with Microsoft SSPI), but SSPI
-allows them to be decoded using explicit IOVs with either a
-zero-length padding buffer or no padding buffer.  Allow these cases to
-work in kg_fixup_padding_iov().  (It is already possible to make this
-work with HEADER | DATA | DATA, but only by
-accident--kg_fixup_padding_iov() doesn't find a data buffer because
-kg_locate_iov() only looks for singleton buffers, so it exits early.)
-
-ticket: 8926 (new)
-tags: pullup
-target_version: 1.18-next
-
-(cherry picked from commit 3f204ddd567715ef360b4bb0b32961b6a9877f9d)
----
- src/lib/gssapi/krb5/util_crypt.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c
-index f7d3e92c4..d6c71aeb8 100644
---- a/src/lib/gssapi/krb5/util_crypt.c
-+++ b/src/lib/gssapi/krb5/util_crypt.c
-@@ -638,16 +638,13 @@ kg_fixup_padding_iov(OM_uint32 *minor_status, gss_iov_buffer_desc *iov,
-     data = kg_locate_iov(iov, iov_count, GSS_IOV_BUFFER_TYPE_DATA);
-     padding = kg_locate_iov(iov, iov_count, GSS_IOV_BUFFER_TYPE_PADDING);
- 
--    if (data == NULL) {
-+    /* Do nothing if padding is absent or empty, to allow unwrapping of WinRM
-+     * unpadded RC4 tokens using an explicit IOV array. */
-+    if (data == NULL || padding == NULL || padding->buffer.length == 0) {
-         *minor_status = 0;
-         return GSS_S_COMPLETE;
-     }
- 
--    if (padding == NULL || padding->buffer.length == 0) {
--        *minor_status = EINVAL;
--        return GSS_S_FAILURE;
--    }
--
-     p = (unsigned char *)padding->buffer.value;
-     padlength = p[padding->buffer.length - 1];
- 
diff --git a/Avoid-passing-DB-entry-structures-in-KDC.patch b/Avoid-passing-DB-entry-structures-in-KDC.patch
deleted file mode 100644
index e5cff1a..0000000
--- a/Avoid-passing-DB-entry-structures-in-KDC.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From dd8b146093d4bdf8a7d0c0eb8156b62d090448d7 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Wed, 30 Sep 2020 02:12:00 -0400
-Subject: [PATCH] Avoid passing DB entry structures in KDC
-
-When validating AS or TGS requests, pass pointers to DB entry
-structures, not the structures themselves.
-
-(cherry picked from commit 7ccc08a889b40693b2ce7f108f2cdda51bc04bff)
----
- src/kdc/do_as_req.c  |  4 ++--
- src/kdc/do_tgs_req.c |  2 +-
- src/kdc/kdc_util.c   | 34 +++++++++++++++++-----------------
- src/kdc/kdc_util.h   |  6 +++---
- src/kdc/tgs_policy.c | 35 ++++++++++++++++++-----------------
- 5 files changed, 41 insertions(+), 40 deletions(-)
-
-diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
-index 9ae7b0a5e..c2dfea9b8 100644
---- a/src/kdc/do_as_req.c
-+++ b/src/kdc/do_as_req.c
-@@ -663,8 +663,8 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
-     au_state->stage = VALIDATE_POL;
- 
-     if ((errcode = validate_as_request(kdc_active_realm,
--                                       state->request, *state->client,
--                                       *state->server, state->kdc_time,
-+                                       state->request, state->client,
-+                                       state->server, state->kdc_time,
-                                        &state->status, &state->e_data))) {
-         errcode += ERROR_TABLE_BASE_krb5;
-         goto errout;
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index 74cd19e96..d345797c4 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -260,7 +260,7 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt,
-         goto cleanup;
- 
-     if ((retval = validate_tgs_request(kdc_active_realm,
--                                       request, *server, header_ticket,
-+                                       request, server, header_ticket,
-                                        kdc_time, &status, &e_data))) {
-         if (retval == KDC_ERR_POLICY || retval == KDC_ERR_BADOPTION)
-             au_state->violation = PROT_CONSTRAINT;
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index a4a05b9fa..b2042862a 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -612,8 +612,8 @@ check_anon(kdc_realm_t *kdc_active_realm,
-                             KDC_OPT_ENC_TKT_IN_SKEY | KDC_OPT_CNAME_IN_ADDL_TKT)
- int
- validate_as_request(kdc_realm_t *kdc_active_realm,
--                    krb5_kdc_req *request, krb5_db_entry client,
--                    krb5_db_entry server, krb5_timestamp kdc_time,
-+                    krb5_kdc_req *request, krb5_db_entry *client,
-+                    krb5_db_entry *server, krb5_timestamp kdc_time,
-                     const char **status, krb5_pa_data ***e_data)
- {
-     krb5_error_code ret;
-@@ -627,7 +627,7 @@ validate_as_request(kdc_realm_t *kdc_active_realm,
-     }
- 
-     /* The client must not be expired */
--    if (client.expiration && ts_after(kdc_time, client.expiration)) {
-+    if (client->expiration && ts_after(kdc_time, client->expiration)) {
-         *status = "CLIENT EXPIRED";
-         if (vague_errors)
-             return(KRB_ERR_GENERIC);
-@@ -637,8 +637,8 @@ validate_as_request(kdc_realm_t *kdc_active_realm,
- 
-     /* The client's password must not be expired, unless the server is
-        a KRB5_KDC_PWCHANGE_SERVICE. */
--    if (client.pw_expiration && ts_after(kdc_time, client.pw_expiration) &&
--        !isflagset(server.attributes, KRB5_KDB_PWCHANGE_SERVICE)) {
-+    if (client->pw_expiration && ts_after(kdc_time, client->pw_expiration) &&
-+        !isflagset(server->attributes, KRB5_KDB_PWCHANGE_SERVICE)) {
-         *status = "CLIENT KEY EXPIRED";
-         if (vague_errors)
-             return(KRB_ERR_GENERIC);
-@@ -647,7 +647,7 @@ validate_as_request(kdc_realm_t *kdc_active_realm,
-     }
- 
-     /* The server must not be expired */
--    if (server.expiration && ts_after(kdc_time, server.expiration)) {
-+    if (server->expiration && ts_after(kdc_time, server->expiration)) {
-         *status = "SERVICE EXPIRED";
-         return(KDC_ERR_SERVICE_EXP);
-     }
-@@ -656,8 +656,8 @@ validate_as_request(kdc_realm_t *kdc_active_realm,
-      * If the client requires password changing, then only allow the
-      * pwchange service.
-      */
--    if (isflagset(client.attributes, KRB5_KDB_REQUIRES_PWCHANGE) &&
--        !isflagset(server.attributes, KRB5_KDB_PWCHANGE_SERVICE)) {
-+    if (isflagset(client->attributes, KRB5_KDB_REQUIRES_PWCHANGE) &&
-+        !isflagset(server->attributes, KRB5_KDB_PWCHANGE_SERVICE)) {
-         *status = "REQUIRED PWCHANGE";
-         return(KDC_ERR_KEY_EXP);
-     }
-@@ -665,37 +665,37 @@ validate_as_request(kdc_realm_t *kdc_active_realm,
-     /* Client and server must allow postdating tickets */
-     if ((isflagset(request->kdc_options, KDC_OPT_ALLOW_POSTDATE) ||
-          isflagset(request->kdc_options, KDC_OPT_POSTDATED)) &&
--        (isflagset(client.attributes, KRB5_KDB_DISALLOW_POSTDATED) ||
--         isflagset(server.attributes, KRB5_KDB_DISALLOW_POSTDATED))) {
-+        (isflagset(client->attributes, KRB5_KDB_DISALLOW_POSTDATED) ||
-+         isflagset(server->attributes, KRB5_KDB_DISALLOW_POSTDATED))) {
-         *status = "POSTDATE NOT ALLOWED";
-         return(KDC_ERR_CANNOT_POSTDATE);
-     }
- 
-     /* Check to see if client is locked out */
--    if (isflagset(client.attributes, KRB5_KDB_DISALLOW_ALL_TIX)) {
-+    if (isflagset(client->attributes, KRB5_KDB_DISALLOW_ALL_TIX)) {
-         *status = "CLIENT LOCKED OUT";
-         return(KDC_ERR_CLIENT_REVOKED);
-     }
- 
-     /* Check to see if server is locked out */
--    if (isflagset(server.attributes, KRB5_KDB_DISALLOW_ALL_TIX)) {
-+    if (isflagset(server->attributes, KRB5_KDB_DISALLOW_ALL_TIX)) {
-         *status = "SERVICE LOCKED OUT";
-         return(KDC_ERR_S_PRINCIPAL_UNKNOWN);
-     }
- 
-     /* Check to see if server is allowed to be a service */
--    if (isflagset(server.attributes, KRB5_KDB_DISALLOW_SVR)) {
-+    if (isflagset(server->attributes, KRB5_KDB_DISALLOW_SVR)) {
-         *status = "SERVICE NOT ALLOWED";
-         return(KDC_ERR_MUST_USE_USER2USER);
-     }
- 
--    if (check_anon(kdc_active_realm, client.princ, request->server) != 0) {
-+    if (check_anon(kdc_active_realm, client->princ, request->server) != 0) {
-         *status = "ANONYMOUS NOT ALLOWED";
-         return(KDC_ERR_POLICY);
-     }
- 
-     /* Perform KDB module policy checks. */
--    ret = krb5_db_check_policy_as(kdc_context, request, &client, &server,
-+    ret = krb5_db_check_policy_as(kdc_context, request, client, server,
-                                   kdc_time, status, e_data);
-     if (ret && ret != KRB5_PLUGIN_OP_NOTSUPP)
-         return errcode_to_protocol(ret);
-@@ -1568,8 +1568,8 @@ kdc_process_s4u2self_req(kdc_realm_t *kdc_active_realm,
-         princ->pw_expiration = 0;
-         clear(princ->attributes, KRB5_KDB_REQUIRES_PWCHANGE);
- 
--        code = validate_as_request(kdc_active_realm, request, *princ,
--                                   no_server, kdc_time, status, &e_data);
-+        code = validate_as_request(kdc_active_realm, request, princ,
-+                                   &no_server, kdc_time, status, &e_data);
-         if (code) {
-             krb5_db_free_principal(kdc_context, princ);
-             krb5_free_pa_data(kdc_context, e_data);
-diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
-index 42b7ee208..04007a8f5 100644
---- a/src/kdc/kdc_util.h
-+++ b/src/kdc/kdc_util.h
-@@ -76,12 +76,12 @@ get_local_tgt(krb5_context context, const krb5_data *realm,
-               krb5_db_entry **storage_out, krb5_keyblock *kb_out);
- 
- int
--validate_as_request (kdc_realm_t *, krb5_kdc_req *, krb5_db_entry,
--                     krb5_db_entry, krb5_timestamp,
-+validate_as_request (kdc_realm_t *, krb5_kdc_req *, krb5_db_entry *,
-+                     krb5_db_entry *, krb5_timestamp,
-                      const char **, krb5_pa_data ***);
- 
- int
--validate_tgs_request (kdc_realm_t *, krb5_kdc_req *, krb5_db_entry,
-+validate_tgs_request (kdc_realm_t *, krb5_kdc_req *, krb5_db_entry *,
-                       krb5_ticket *, krb5_timestamp,
-                       const char **, krb5_pa_data ***);
- 
-diff --git a/src/kdc/tgs_policy.c b/src/kdc/tgs_policy.c
-index 554345ba5..3f4fa8499 100644
---- a/src/kdc/tgs_policy.c
-+++ b/src/kdc/tgs_policy.c
-@@ -48,7 +48,7 @@ struct tgsflagrule {
- };
- 
- /* Service principal TGS policy checking functions */
--typedef int (check_tgs_svc_pol_fn)(krb5_kdc_req *, krb5_db_entry,
-+typedef int (check_tgs_svc_pol_fn)(krb5_kdc_req *, krb5_db_entry *,
-                                    krb5_ticket *, krb5_timestamp,
-                                    const char **);
- 
-@@ -110,7 +110,7 @@ static const struct tgsflagrule svcdenyrules[] = {
-  * A service principal can forbid some TGS-REQ options.
-  */
- static int
--check_tgs_svc_deny_opts(krb5_kdc_req *req, krb5_db_entry server,
-+check_tgs_svc_deny_opts(krb5_kdc_req *req, krb5_db_entry *server,
-                         krb5_ticket *tkt, krb5_timestamp kdc_time,
-                         const char **status)
- {
-@@ -122,7 +122,7 @@ check_tgs_svc_deny_opts(krb5_kdc_req *req, krb5_db_entry server,
-         r = &svcdenyrules[i];
-         if (!(r->reqflags & req->kdc_options))
-             continue;
--        if (r->checkflag & server.attributes) {
-+        if (r->checkflag & server->attributes) {
-             *status = r->status;
-             return r->err;
-         }
-@@ -134,20 +134,20 @@ check_tgs_svc_deny_opts(krb5_kdc_req *req, krb5_db_entry server,
-  * A service principal can deny all TGS-REQs for it.
-  */
- static int
--check_tgs_svc_deny_all(krb5_kdc_req *req, krb5_db_entry server,
-+check_tgs_svc_deny_all(krb5_kdc_req *req, krb5_db_entry *server,
-                        krb5_ticket *tkt, krb5_timestamp kdc_time,
-                        const char **status)
- {
--    if (server.attributes & KRB5_KDB_DISALLOW_ALL_TIX) {
-+    if (server->attributes & KRB5_KDB_DISALLOW_ALL_TIX) {
-         *status = "SERVER LOCKED OUT";
-         return KDC_ERR_S_PRINCIPAL_UNKNOWN;
-     }
--    if ((server.attributes & KRB5_KDB_DISALLOW_SVR) &&
-+    if ((server->attributes & KRB5_KDB_DISALLOW_SVR) &&
-         !(req->kdc_options & KDC_OPT_ENC_TKT_IN_SKEY)) {
-         *status = "SERVER NOT ALLOWED";
-         return KDC_ERR_MUST_USE_USER2USER;
-     }
--    if (server.attributes & KRB5_KDB_DISALLOW_TGT_BASED) {
-+    if (server->attributes & KRB5_KDB_DISALLOW_TGT_BASED) {
-         if (krb5_is_tgs_principal(tkt->server)) {
-             *status = "TGT BASED NOT ALLOWED";
-             return KDC_ERR_POLICY;
-@@ -160,17 +160,17 @@ check_tgs_svc_deny_all(krb5_kdc_req *req, krb5_db_entry server,
-  * A service principal can require certain TGT flags.
-  */
- static int
--check_tgs_svc_reqd_flags(krb5_kdc_req *req, krb5_db_entry server,
-+check_tgs_svc_reqd_flags(krb5_kdc_req *req, krb5_db_entry *server,
-                          krb5_ticket *tkt,
-                          krb5_timestamp kdc_time, const char **status)
- {
--    if (server.attributes & KRB5_KDB_REQUIRES_HW_AUTH) {
-+    if (server->attributes & KRB5_KDB_REQUIRES_HW_AUTH) {
-         if (!(tkt->enc_part2->flags & TKT_FLG_HW_AUTH)) {
-             *status = "NO HW PREAUTH";
-             return KRB_ERR_GENERIC;
-         }
-     }
--    if (server.attributes & KRB5_KDB_REQUIRES_PRE_AUTH) {
-+    if (server->attributes & KRB5_KDB_REQUIRES_PRE_AUTH) {
-         if (!(tkt->enc_part2->flags & TKT_FLG_PRE_AUTH)) {
-             *status = "NO PREAUTH";
-             return KRB_ERR_GENERIC;
-@@ -180,10 +180,10 @@ check_tgs_svc_reqd_flags(krb5_kdc_req *req, krb5_db_entry server,
- }
- 
- static int
--check_tgs_svc_time(krb5_kdc_req *req, krb5_db_entry server, krb5_ticket *tkt,
-+check_tgs_svc_time(krb5_kdc_req *req, krb5_db_entry *server, krb5_ticket *tkt,
-                    krb5_timestamp kdc_time, const char **status)
- {
--    if (server.expiration && ts_after(kdc_time, server.expiration)) {
-+    if (server->expiration && ts_after(kdc_time, server->expiration)) {
-         *status = "SERVICE EXPIRED";
-         return KDC_ERR_SERVICE_EXP;
-     }
-@@ -191,8 +191,9 @@ check_tgs_svc_time(krb5_kdc_req *req, krb5_db_entry server, krb5_ticket *tkt,
- }
- 
- static int
--check_tgs_svc_policy(krb5_kdc_req *req, krb5_db_entry server, krb5_ticket *tkt,
--                     krb5_timestamp kdc_time, const char **status)
-+check_tgs_svc_policy(krb5_kdc_req *req, krb5_db_entry *server,
-+                     krb5_ticket *tkt, krb5_timestamp kdc_time,
-+                     const char **status)
- {
-     int errcode;
-     size_t i;
-@@ -317,7 +318,7 @@ check_tgs_tgt(kdc_realm_t *kdc_active_realm, krb5_kdc_req *req,
- 
- int
- validate_tgs_request(kdc_realm_t *kdc_active_realm,
--                     krb5_kdc_req *request, krb5_db_entry server,
-+                     krb5_kdc_req *request, krb5_db_entry *server,
-                      krb5_ticket *ticket, krb5_timestamp kdc_time,
-                      const char **status, krb5_pa_data ***e_data)
- {
-@@ -367,8 +368,8 @@ validate_tgs_request(kdc_realm_t *kdc_active_realm,
-     }
- 
-     /* Perform KDB module policy checks. */
--    ret = krb5_db_check_policy_tgs(kdc_context, request, &server,
--                                   ticket, status, e_data);
-+    ret = krb5_db_check_policy_tgs(kdc_context, request, server, ticket,
-+                                   status, e_data);
-     if (ret && ret != KRB5_PLUGIN_OP_NOTSUPP)
-         return errcode_to_protocol(ret);
- 
diff --git a/Correctly-import-service-GSS-host-based-name.patch b/Correctly-import-service-GSS-host-based-name.patch
deleted file mode 100644
index f56aed4..0000000
--- a/Correctly-import-service-GSS-host-based-name.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f56afbeb7848322f3208edd55f2c12a9e32127f0 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Mon, 30 Mar 2020 15:26:02 -0400
-Subject: [PATCH] Correctly import "service@" GSS host-based name
-
-The intended way to specify only a service in a GSS host-based name is
-to omit the "@" separator.  Some applications include the separator
-but no hostname, and this happened to yield wildcard hostname behavior
-prior to commit 996353767fe8afa7f67a3b5b465e4d70e18bad7c when
-shortname qualification was added.  To restore this behavior, check in
-parse_hostbased() that at least one character is present after the "@"
-separator before copying the hostname.  Add a test case to t_gssapi.py.
-
-ticket: 8892
-tags: pullup
-target_version: 1.18-next
-
-(cherry picked from commit a2f047af0400ba8080dc26033fae2b17534501e2)
----
- src/lib/gssapi/krb5/import_name.c | 4 ++--
- src/tests/gssapi/t_gssapi.py      | 3 +++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
-index da2ab1423..21023dd76 100644
---- a/src/lib/gssapi/krb5/import_name.c
-+++ b/src/lib/gssapi/krb5/import_name.c
-@@ -102,8 +102,8 @@ parse_hostbased(const char *str, size_t len,
-     memcpy(service, str, servicelen);
-     service[servicelen] = '\0';
- 
--    /* If present, copy the hostname. */
--    if (at != NULL) {
-+    /* Copy the hostname if present (at least one character after '@'). */
-+    if (len - servicelen > 1) {
-         hostlen = len - servicelen - 1;
-         host = malloc(hostlen + 1);
-         if (host == NULL) {
-diff --git a/src/tests/gssapi/t_gssapi.py b/src/tests/gssapi/t_gssapi.py
-index 54d5cf549..ecf982604 100755
---- a/src/tests/gssapi/t_gssapi.py
-+++ b/src/tests/gssapi/t_gssapi.py
-@@ -47,6 +47,9 @@ realm.run(['./t_accname', 'p:service2/calvin', 'h:service2'],
-           expected_msg='service2/calvin')
- realm.run(['./t_accname', 'p:service2/calvin', 'h:service1'], expected_code=1,
-           expected_msg=' found in keytab but does not match server principal')
-+# Regression test for #8892 (trailing @ in name).
-+realm.run(['./t_accname', 'p:service1/andrew', 'h:service1@'],
-+          expected_msg='service1/abraham')
- 
- # Test with acceptor name containing service and host.  Use the
- # client's un-canonicalized hostname as acceptor input to mirror what
diff --git a/Default-dns_canonicalize_hostname-to-fallback.patch b/Default-dns_canonicalize_hostname-to-fallback.patch
deleted file mode 100644
index 1c46562..0000000
--- a/Default-dns_canonicalize_hostname-to-fallback.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-From c3d2c3bcafe0ac87d9cbbf37f1488ad642627fc3 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Wed, 27 May 2020 18:48:35 -0400
-Subject: [PATCH] Default dns_canonicalize_hostname to "fallback"
-
-This change should mitigate some of the pain caused by the rdns=true
-default (generally associated with unwanted PTR records that cannot
-easily be changed), with a minimum of fallout.
-
-Update the documentation and tests accordingly.  In test environments,
-disable qualify_shortname and use the uncanonicalized system hostname
-(lowercased) to match the initial sn2princ result.
-
-ticket: 8911 (new)
----
- doc/admin/appl_servers.rst                    | 14 +++---
- doc/admin/conf_files/krb5_conf.rst            |  9 ++--
- doc/admin/princ_dns.rst                       | 44 +++++++++++--------
- src/kadmin/testing/proto/krb5.conf.proto      |  8 ++--
- src/kadmin/testing/scripts/env-setup.shin     |  4 +-
- src/kadmin/testing/scripts/init_db            |  3 +-
- src/kadmin/testing/scripts/start_servers      |  3 +-
- .../testing/scripts/start_servers_local       |  2 +-
- .../kadm5/unit-test/api.current/init-v2.exp   |  6 +--
- src/lib/krb5/krb/init_ctx.c                   |  2 +-
- src/tests/dejagnu/config/default.exp          |  5 +--
- src/tests/t_sn2princ.py                       |  5 ++-
- src/util/k5test.py                            | 25 +++--------
- 13 files changed, 58 insertions(+), 72 deletions(-)
-
-diff --git a/doc/admin/appl_servers.rst b/doc/admin/appl_servers.rst
-index 5232db9af..afdf30297 100644
---- a/doc/admin/appl_servers.rst
-+++ b/doc/admin/appl_servers.rst
-@@ -115,14 +115,12 @@ Getting DNS information correct
- -------------------------------
- 
- Several aspects of Kerberos rely on name service.  When a hostname is
--used to name a service, the Kerberos library canonicalizes the
--hostname using forward and reverse name resolution.  (The reverse name
--resolution step can be turned off using the **rdns** variable in
--:ref:`libdefaults`.)  The result of this canonicalization must match
--the principal entry in the host's keytab, or authentication will fail.
--
--Each host's canonical name must be the fully-qualified host name
--(including the domain), and each host's IP address must
-+used to name a service, clients may canonicalize the hostname using
-+forward and possibly reverse name resolution.  The result of this
-+canonicalization must match the principal entry in the host's keytab,
-+or authentication will fail.  To work with all client canonicalization
-+configurations, each host's canonical name must be the fully-qualified
-+host name (including the domain), and each host's IP address must
- reverse-resolve to the canonical name.
- 
- Configuration of hostnames varies by operating system.  On the
-diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
-index 3a8b9cf47..38f450367 100644
---- a/doc/admin/conf_files/krb5_conf.rst
-+++ b/doc/admin/conf_files/krb5_conf.rst
-@@ -188,11 +188,10 @@ The libdefaults section may contain any of the following relations:
-     hostnames for use in service principal names.  Setting this flag
-     to false can improve security by reducing reliance on DNS, but
-     means that short hostnames will not be canonicalized to
--    fully-qualified hostnames.  The default value is true.
--
--    If this option is set to ``fallback`` (new in release 1.18), DNS
--    canonicalization will only be performed the server hostname is not
--    found with the original name when requesting credentials.
-+    fully-qualified hostnames.  If this option is set to ``fallback`` (new
-+    in release 1.18), DNS canonicalization will only be performed the
-+    server hostname is not found with the original name when
-+    requesting credentials.  The default value is ``fallback``.
- 
- **dns_lookup_kdc**
-     Indicate whether DNS SRV records should be used to locate the KDCs
-diff --git a/doc/admin/princ_dns.rst b/doc/admin/princ_dns.rst
-index e1d823f27..32a269afc 100644
---- a/doc/admin/princ_dns.rst
-+++ b/doc/admin/princ_dns.rst
-@@ -31,27 +31,35 @@ based on rotating ``CNAME`` records in DNS.
- Service principal canonicalization
- ----------------------------------
- 
--MIT Kerberos clients currently always do forward resolution (looking
--up the IPv4 and possibly IPv6 addresses using ``getaddrinfo()``) of
--the hostname part of a host-based service principal to canonicalize
--the hostname.  They obtain the "canonical" name of the host when doing
--so.  By default, MIT Kerberos clients will also then do reverse DNS
--resolution (looking up the hostname associated with the IPv4 or IPv6
--address using ``getnameinfo()``) of the hostname.  Using the
--:ref:`krb5.conf(5)` setting::
-+In the MIT krb5 client library, canonicalization of host-based service
-+principals is controlled by the **dns_canonicalize_hostname**,
-+**rnds**, and **qualify_shortname** variables in :ref:`libdefaults`.
- 
--    [libdefaults]
--        rdns = false
-+If **dns_canonicalize_hostname** is set to ``true`` (the default value
-+before release 1.19), the client performs forward resolution by
-+looking up the IPv4 and/or IPv6 addresses of the hostname using
-+``getaddrinfo()``.  This process will typically add a domain suffix to
-+the hostname if needed, and follow CNAME records in the DNS.  If
-+**rdns** is also set to ``true`` (the default), the client will then
-+perform a reverse lookup of the first returned Internet address using
-+``getnameinfo()``, finding the name associated with the PTR record.
- 
--will disable reverse DNS lookup on clients.  The default setting is
--"true".
-+If **dns_canonicalize_hostname** is set to ``false``, the hostname is
-+not canonicalized using DNS.  If the hostname has only one component
-+(i.e. it contains no "." characters), the host's primary DNS search
-+domain will be appended, if there is one.  The **qualify_shortname**
-+variable can be used to override or disable this suffix.
-+
-+If **dns_canonicalize_hostname** is set to ``fallback`` (the default
-+value in release 1.19 and later), the hostname is initially treated
-+according to the rules for ``dns_canonicalize_hostname=false``.  If a
-+ticket request fails because the service principal is unknown, it the
-+hostname will be canonicalized according to the rules for
-+``dns_canonicalize_hostname=true`` and the request will be retried.
-+
-+In all cases, the hostname is converted to lowercase, and any trailing
-+dot is removed.
- 
--Operating system bugs may prevent a setting of ``rdns = false`` from
--disabling reverse DNS lookup.  Some versions of GNU libc have a bug in
--``getaddrinfo()`` that cause them to look up ``PTR`` records even when
--not required.  MIT Kerberos releases krb5-1.10.2 and newer have a
--workaround for this problem, as does the krb5-1.9.x series as of
--release krb5-1.9.4.
- 
- 
- Reverse DNS mismatches
-diff --git a/src/kadmin/testing/proto/krb5.conf.proto b/src/kadmin/testing/proto/krb5.conf.proto
-index e710852d4..c0af716a5 100644
---- a/src/kadmin/testing/proto/krb5.conf.proto
-+++ b/src/kadmin/testing/proto/krb5.conf.proto
-@@ -2,19 +2,19 @@
- 	default_realm = __REALM__
- 	default_keytab_name = FILE:__K5ROOT__/keytab
- 	dns_fallback = no
-+	qualify_shortname = ""
- 	plugin_base_dir = __PLUGIN_DIR__
- 	allow_weak_crypto = true
- 
- [realms]
- 	__REALM__ = {
--		kdc = __KDCHOST__:1750
--		admin_server = __KDCHOST__:1751
-+		kdc = __HOSTNAME__:1750
-+		admin_server = __HOSTNAME__:1751
- 		database_module = foobar_db2_module_blah
- 	}
- 
- [domain_realm]
--	__LOCALHOST__ = __REALM__
--	__KDCHOST__ = __REALM__
-+	__HOSTNAME__ = __REALM__
- 
- [logging]
- 	admin_server = FILE:__K5ROOT__/syslog
-diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
-index 969c5340c..88f8ad1aa 100755
---- a/src/kadmin/testing/scripts/env-setup.shin
-+++ b/src/kadmin/testing/scripts/env-setup.shin
-@@ -71,8 +71,8 @@ BSDDB_DUMP=$TESTDIR/util/bsddb_dump; export BSDDB_DUMP
- CLNTTCL=$TESTDIR/util/kadm5_clnt_tcl; export CLNTTCL
- SRVTCL=$TESTDIR/util/kadm5_srv_tcl; export SRVTCL
- 
--QUALNAME=`$BUILDTOP/tests/resolve/resolve -q | tr '[A-Z]' '[a-z]'`
--export QUALNAME
-+HOSTNAME=`hostname | tr '[A-Z]' '[a-z]'`
-+export HOSTNAME
- 
- KRB5_CONFIG=$K5ROOT/krb5.conf; export KRB5_CONFIG
- KRB5_KDC_PROFILE=$K5ROOT/kdc.conf; export KRB5_KDC_PROFILE
-diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db
-index e65826c96..216f62793 100755
---- a/src/kadmin/testing/scripts/init_db
-+++ b/src/kadmin/testing/scripts/init_db
-@@ -79,8 +79,7 @@ fi
- # done
- 
- sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
--	-e "s/__KDCHOST__/$QUALNAME/g" \
--	-e "s/__LOCALHOST__/$QUALNAME/g" \
-+	-e "s/__HOSTNAME__/$HOSTNAME/g" \
- 	-e "s#__MODDIR__#$MODDIR#g" \
- 	< $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf
- sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
-diff --git a/src/kadmin/testing/scripts/start_servers b/src/kadmin/testing/scripts/start_servers
-index f23df0682..05519e4ee 100755
---- a/src/kadmin/testing/scripts/start_servers
-+++ b/src/kadmin/testing/scripts/start_servers
-@@ -36,8 +36,7 @@ if [ $local = 0 ]; then
- 
- 	# Fix up the local krb5.conf to point to the remote 
- 	sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
--		-e "s/__KDCHOST__/$hostname/g" \
--		-e "s/__LOCALHOST__/$QUALNAME/g" \
-+		-e "s/__HOSTNAME__/$HOSTNAME/g" \
- 		-e "s#__MODDIR__#$TOP/../plugins/kdb#g"\
- 		-e "s#__PLUGIN_DIR__#$TOP/../plugins#g"\
- 		< $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf
-diff --git a/src/kadmin/testing/scripts/start_servers_local b/src/kadmin/testing/scripts/start_servers_local
-index 998ef9164..858e88031 100755
---- a/src/kadmin/testing/scripts/start_servers_local
-+++ b/src/kadmin/testing/scripts/start_servers_local
-@@ -79,7 +79,7 @@ cat - > /tmp/start_servers_local$$ <<\EOF
- if { [catch {
- 	source $env(STOP)/testing/tcl/util.t
- 	set r $env(REALM)
--	set q $env(QUALNAME)
-+	set q $env(HOSTNAME)
- 	puts stdout [kadm5_init $env(SRVTCL) mrroot null \
- 		[config_params {KADM5_CONFIG_REALM} $r] \
- 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_3 server_handle]
-diff --git a/src/lib/kadm5/unit-test/api.current/init-v2.exp b/src/lib/kadm5/unit-test/api.current/init-v2.exp
-index 7a353d4e9..47764c212 100644
---- a/src/lib/kadm5/unit-test/api.current/init-v2.exp
-+++ b/src/lib/kadm5/unit-test/api.current/init-v2.exp
-@@ -3,18 +3,14 @@ load_lib lib.t
- api_exit
- api_start
- 
--if ![info exists RESOLVE] {
--    set RESOLVE [findfile $objdir/../../../tests/resolve/resolve]
--}
- proc get_hostname { } {
--    global RESOLVE
-     global hostname
- 
-     if {[info exists hostname]} {
- 	return 1
-     }
- 
--    catch "exec $RESOLVE -q >myname" exec_output
-+    catch "exec hostname >myname" exec_output
-     if ![string match "" $exec_output] {
- 	send_log "$exec_output\n"
- 	verbose $exec_output
-diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
-index 9a4741fa6..0b8ae6714 100644
---- a/src/lib/krb5/krb/init_ctx.c
-+++ b/src/lib/krb5/krb/init_ctx.c
-@@ -237,7 +237,7 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
-     ctx->enforce_ok_as_delegate = tmp;
- 
-     retval = get_tristate(ctx, KRB5_CONF_DNS_CANONICALIZE_HOSTNAME, "fallback",
--                          CANONHOST_FALLBACK, 1, &tmp);
-+                          CANONHOST_FALLBACK, CANONHOST_FALLBACK, &tmp);
-     if (retval)
-         goto cleanup;
-     ctx->dns_canonicalize_hostname = tmp;
-diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
-index 4d8c917cd..1e7777f1e 100644
---- a/src/tests/dejagnu/config/default.exp
-+++ b/src/tests/dejagnu/config/default.exp
-@@ -268,7 +268,6 @@ foreach i {
-     {KTUTIL $objdir/../../kadmin/ktutil/ktutil}
-     {KLIST $objdir/../../clients/klist/klist}
-     {KDESTROY $objdir/../../clients/kdestroy/kdestroy}
--    {RESOLVE $objdir/../resolve/resolve}
-     {T_INETD $objdir/t_inetd}
-     {KPROPLOG $objdir/../../kprop/kproplog}
-     {KPASSWD $objdir/../../clients/kpasswd/kpasswd}
-@@ -462,7 +461,6 @@ proc setup_runtime_env { } {
- # 0 on failure.
- 
- proc get_hostname { } {
--    global RESOLVE
-     global hostname
-     global tmppwd
- 
-@@ -472,7 +470,7 @@ proc get_hostname { } {
- 
-     envstack_push
-     setup_runtime_env
--    catch "exec $RESOLVE -q >$tmppwd/hostname" exec_output
-+    catch "exec hostname >$tmppwd/hostname" exec_output
-     envstack_pop
-     if ![string match "" $exec_output] {
- 	verbose -log $exec_output
-@@ -710,6 +708,7 @@ proc setup_krb5_conf { {type client} } {
- 	puts $conffile "\[libdefaults\]"
- 	puts $conffile "	default_realm = $REALMNAME"
- 	puts $conffile "	dns_lookup_kdc = false"
-+	puts $conffile "	qualify_shortname = \"\""
- 	if [info exists allow_weak_crypto($type)] {
- 	    puts $conffile "	allow_weak_crypto = $allow_weak_crypto($type)"
- 	} else {
-diff --git a/src/tests/t_sn2princ.py b/src/tests/t_sn2princ.py
-index 26dcb91c2..f3e187286 100755
---- a/src/tests/t_sn2princ.py
-+++ b/src/tests/t_sn2princ.py
-@@ -2,7 +2,8 @@ from k5test import *
- 
- offline = (len(args) > 0 and args[0] != "no")
- 
--conf = {'domain_realm': {'kerberos.org': 'R1',
-+conf = {'libdefaults': {'dns_canonicalize_hostname': 'true'},
-+        'domain_realm': {'kerberos.org': 'R1',
-                          'example.com': 'R2',
-                          'mit.edu': 'R3'}}
- no_rdns_conf = {'libdefaults': {'rdns': 'false'}}
-@@ -28,7 +29,7 @@ def testbase(host, nametype, princhost, princrealm, env=None):
-         fail('Expected %s, got %s' % (expected, out))
- 
- def test(host, princhost, princrealm):
--    # Test with the host-based name type in the default environment.
-+    # Test with the host-based name type with canonicalization enabled.
-     testbase(host, 'srv-hst', princhost, princrealm)
- 
- def testnc(host, princhost, princrealm):
-diff --git a/src/util/k5test.py b/src/util/k5test.py
-index eea92275d..5196cfa43 100644
---- a/src/util/k5test.py
-+++ b/src/util/k5test.py
-@@ -193,7 +193,10 @@ Scripts may use the following functions and variables:
- 
- * plugins: The plugin directory in the build tree (absolute path).
- 
--* hostname: This machine's fully-qualified domain name.
-+* hostname: The local hostname as it will initially appear in
-+  krb5_sname_to_principal() results.  (Shortname qualification is
-+  turned off in the test environment to make this value easy to
-+  discover from Python.)
- 
- * null_input: A file opened to read /dev/null.
- 
-@@ -525,23 +528,6 @@ def _find_srctop():
-     return os.path.abspath(root)
- 
- 
--# Return the local hostname as it will be canonicalized by
--# krb5_sname_to_principal.  We can't simply use socket.getfqdn()
--# because it explicitly prefers results containing periods and
--# krb5_sname_to_principal doesn't care.
--def _get_hostname():
--    hostname = socket.gethostname()
--    try:
--        ai = socket.getaddrinfo(hostname, None, 0, 0, 0, socket.AI_CANONNAME)
--    except socket.gaierror as e:
--        fail('Local hostname "%s" does not resolve: %s.' % (hostname, e[1]))
--    (family, socktype, proto, canonname, sockaddr) = ai[0]
--    try:
--        name = socket.getnameinfo(sockaddr, socket.NI_NAMEREQD)
--    except socket.gaierror:
--        return canonname.lower()
--    return name[0].lower()
--
- # Parse command line arguments, setting global option variables.  Also
- # sets the global variable args to the positional arguments, which may
- # be used by the test script.
-@@ -1263,6 +1249,7 @@ _default_krb5_conf = {
-     'libdefaults': {
-         'default_realm': '$realm',
-         'dns_lookup_kdc': 'false',
-+        'qualify_shortname': '',
-         'plugin_base_dir': '$plugins'},
-     'realms': {'$realm': {
-             'kdc': '$hostname:$port0',
-@@ -1356,7 +1343,7 @@ buildtop = _find_buildtop()
- srctop = _find_srctop()
- plugins = os.path.join(buildtop, 'plugins')
- runenv = _import_runenv()
--hostname = _get_hostname()
-+hostname = socket.gethostname().lower()
- null_input = open(os.devnull, 'r')
- 
- # A DB pass is a tuple of: name, kdc_conf.
diff --git a/Do-expiration-warnings-for-all-init_creds-APIs.patch b/Do-expiration-warnings-for-all-init_creds-APIs.patch
deleted file mode 100644
index 4f642f4..0000000
--- a/Do-expiration-warnings-for-all-init_creds-APIs.patch
+++ /dev/null
@@ -1,425 +0,0 @@
-From 51a9f8e7498591b22558a7a61d42a821030f9c4e Mon Sep 17 00:00:00 2001
-From: Sumit Bose <sbose@redhat.com>
-Date: Fri, 28 Feb 2020 10:11:49 +0100
-Subject: [PATCH] Do expiration warnings for all init_creds APIs
-
-Move the password expiration warning code from gic_pwd.c to
-get_in_tkt.c.  Call it from init_creds_step_reply() on successful
-completion.
-
-[ghudson@mit.edu: added test case; simplified doc comment; moved call
-site to init_creds_step_reply(); rewrote commit message]
-
-ticket: 8893 (new)
-(cherry picked from commit e1efb890f7ac31b32c68ab816ef118dbfb5a8c7e)
----
- src/include/krb5/krb5.hin         |   9 ++-
- src/lib/krb5/krb/get_in_tkt.c     | 112 ++++++++++++++++++++++++++++++
- src/lib/krb5/krb/gic_pwd.c        | 110 -----------------------------
- src/lib/krb5/krb/t_expire_warn.c  |  47 +++++++++----
- src/lib/krb5/krb/t_expire_warn.py |  22 ++++--
- 5 files changed, 165 insertions(+), 135 deletions(-)
-
-diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
-index 6355e6540..f8269fb17 100644
---- a/src/include/krb5/krb5.hin
-+++ b/src/include/krb5/krb5.hin
-@@ -7174,11 +7174,10 @@ typedef void
-  *
-  * Set a callback to receive password and account expiration times.
-  *
-- * This option only applies to krb5_get_init_creds_password().  @a cb will be
-- * invoked if and only if credentials are successfully acquired.  The callback
-- * will receive the @a context from the krb5_get_init_creds_password() call and
-- * the @a data argument supplied with this API.  The remaining arguments should
-- * be interpreted as follows:
-+ * @a cb will be invoked if and only if credentials are successfully acquired.
-+ * The callback will receive the @a context from the calling function and the
-+ * @a data argument supplied with this API.  The remaining arguments should be
-+ * interpreted as follows:
-  *
-  * If @a is_last_req is true, then the KDC reply contained last-req entries
-  * which unambiguously indicated the password expiration, account expiration,
-diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
-index 870df62a1..cc0f70e83 100644
---- a/src/lib/krb5/krb/get_in_tkt.c
-+++ b/src/lib/krb5/krb/get_in_tkt.c
-@@ -1482,6 +1482,116 @@ accept_method_data(krb5_context context, krb5_init_creds_context ctx)
-                                      ctx->method_padata);
- }
- 
-+/* Return the password expiry time indicated by enc_part2.  Set *is_last_req
-+ * if the information came from a last_req value. */
-+static void
-+get_expiry_times(krb5_enc_kdc_rep_part *enc_part2, krb5_timestamp *pw_exp,
-+                 krb5_timestamp *acct_exp, krb5_boolean *is_last_req)
-+{
-+    krb5_last_req_entry **last_req;
-+    krb5_int32 lr_type;
-+
-+    *pw_exp = 0;
-+    *acct_exp = 0;
-+    *is_last_req = FALSE;
-+
-+    /* Look for last-req entries for password or account expiration. */
-+    if (enc_part2->last_req) {
-+        for (last_req = enc_part2->last_req; *last_req; last_req++) {
-+            lr_type = (*last_req)->lr_type;
-+            if (lr_type == KRB5_LRQ_ALL_PW_EXPTIME ||
-+                lr_type == KRB5_LRQ_ONE_PW_EXPTIME) {
-+                *is_last_req = TRUE;
-+                *pw_exp = (*last_req)->value;
-+            } else if (lr_type == KRB5_LRQ_ALL_ACCT_EXPTIME ||
-+                       lr_type == KRB5_LRQ_ONE_ACCT_EXPTIME) {
-+                *is_last_req = TRUE;
-+                *acct_exp = (*last_req)->value;
-+            }
-+        }
-+    }
-+
-+    /* If we didn't find any, use the ambiguous key_exp field. */
-+    if (*is_last_req == FALSE)
-+        *pw_exp = enc_part2->key_exp;
-+}
-+
-+/*
-+ * Send an appropriate warning prompter if as_reply indicates that the password
-+ * is going to expire soon.  If an expire callback was provided, use that
-+ * instead.
-+ */
-+static void
-+warn_pw_expiry(krb5_context context, krb5_get_init_creds_opt *options,
-+               krb5_prompter_fct prompter, void *data,
-+               const char *in_tkt_service, krb5_kdc_rep *as_reply)
-+{
-+    krb5_error_code ret;
-+    krb5_expire_callback_func expire_cb;
-+    void *expire_data;
-+    krb5_timestamp pw_exp, acct_exp, now;
-+    krb5_boolean is_last_req;
-+    krb5_deltat delta;
-+    char ts[256], banner[1024];
-+
-+    if (as_reply == NULL || as_reply->enc_part2 == NULL)
-+        return;
-+
-+    get_expiry_times(as_reply->enc_part2, &pw_exp, &acct_exp, &is_last_req);
-+
-+    k5_gic_opt_get_expire_cb(options, &expire_cb, &expire_data);
-+    if (expire_cb != NULL) {
-+        /* Invoke the expire callback and don't send prompter warnings. */
-+        (*expire_cb)(context, expire_data, pw_exp, acct_exp, is_last_req);
-+        return;
-+    }
-+
-+    /* Don't warn if no password expiry value was sent. */
-+    if (pw_exp == 0)
-+        return;
-+
-+    /* Don't warn if the password is being changed. */
-+    if (in_tkt_service && strcmp(in_tkt_service, "kadmin/changepw") == 0)
-+        return;
-+
-+    /*
-+     * If the expiry time came from a last_req field, assume the KDC wants us
-+     * to warn.  Otherwise, warn only if the expiry time is less than a week
-+     * from now.
-+     */
-+    ret = krb5_timeofday(context, &now);
-+    if (ret != 0)
-+        return;
-+    if (!is_last_req &&
-+        (ts_after(now, pw_exp) || ts_delta(pw_exp, now) > 7 * 24 * 60 * 60))
-+        return;
-+
-+    if (!prompter)
-+        return;
-+
-+    ret = krb5_timestamp_to_string(pw_exp, ts, sizeof(ts));
-+    if (ret != 0)
-+        return;
-+
-+    delta = ts_delta(pw_exp, now);
-+    if (delta < 3600) {
-+        snprintf(banner, sizeof(banner),
-+                 _("Warning: Your password will expire in less than one hour "
-+                   "on %s"), ts);
-+    } else if (delta < 86400 * 2) {
-+        snprintf(banner, sizeof(banner),
-+                 _("Warning: Your password will expire in %d hour%s on %s"),
-+                 delta / 3600, delta < 7200 ? "" : "s", ts);
-+    } else {
-+        snprintf(banner, sizeof(banner),
-+                 _("Warning: Your password will expire in %d days on %s"),
-+                 delta / 86400, ts);
-+    }
-+
-+    /* PROMPTER_INVOCATION */
-+    (*prompter)(context, data, 0, banner, 0, 0);
-+}
-+
- static krb5_error_code
- init_creds_step_reply(krb5_context context,
-                       krb5_init_creds_context ctx,
-@@ -1693,6 +1803,8 @@ init_creds_step_reply(krb5_context context,
- 
-     /* success */
-     ctx->complete = TRUE;
-+    warn_pw_expiry(context, ctx->opt, ctx->prompter, ctx->prompter_data,
-+                   ctx->in_tkt_service, ctx->reply);
- 
- cleanup:
-     krb5_free_pa_data(context, kdc_padata);
-diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
-index 14ce23ba4..54e0a8ebe 100644
---- a/src/lib/krb5/krb/gic_pwd.c
-+++ b/src/lib/krb5/krb/gic_pwd.c
-@@ -133,113 +133,6 @@ krb5_init_creds_set_password(krb5_context context,
-     return 0;
- }
- 
--/* Return the password expiry time indicated by enc_part2.  Set *is_last_req
-- * if the information came from a last_req value. */
--static void
--get_expiry_times(krb5_enc_kdc_rep_part *enc_part2, krb5_timestamp *pw_exp,
--                 krb5_timestamp *acct_exp, krb5_boolean *is_last_req)
--{
--    krb5_last_req_entry **last_req;
--    krb5_int32 lr_type;
--
--    *pw_exp = 0;
--    *acct_exp = 0;
--    *is_last_req = FALSE;
--
--    /* Look for last-req entries for password or account expiration. */
--    if (enc_part2->last_req) {
--        for (last_req = enc_part2->last_req; *last_req; last_req++) {
--            lr_type = (*last_req)->lr_type;
--            if (lr_type == KRB5_LRQ_ALL_PW_EXPTIME ||
--                lr_type == KRB5_LRQ_ONE_PW_EXPTIME) {
--                *is_last_req = TRUE;
--                *pw_exp = (*last_req)->value;
--            } else if (lr_type == KRB5_LRQ_ALL_ACCT_EXPTIME ||
--                       lr_type == KRB5_LRQ_ONE_ACCT_EXPTIME) {
--                *is_last_req = TRUE;
--                *acct_exp = (*last_req)->value;
--            }
--        }
--    }
--
--    /* If we didn't find any, use the ambiguous key_exp field. */
--    if (*is_last_req == FALSE)
--        *pw_exp = enc_part2->key_exp;
--}
--
--/*
-- * Send an appropriate warning prompter if as_reply indicates that the password
-- * is going to expire soon.  If an expire callback was provided, use that
-- * instead.
-- */
--static void
--warn_pw_expiry(krb5_context context, krb5_get_init_creds_opt *options,
--               krb5_prompter_fct prompter, void *data,
--               const char *in_tkt_service, krb5_kdc_rep *as_reply)
--{
--    krb5_error_code ret;
--    krb5_expire_callback_func expire_cb;
--    void *expire_data;
--    krb5_timestamp pw_exp, acct_exp, now;
--    krb5_boolean is_last_req;
--    krb5_deltat delta;
--    char ts[256], banner[1024];
--
--    get_expiry_times(as_reply->enc_part2, &pw_exp, &acct_exp, &is_last_req);
--
--    k5_gic_opt_get_expire_cb(options, &expire_cb, &expire_data);
--    if (expire_cb != NULL) {
--        /* Invoke the expire callback and don't send prompter warnings. */
--        (*expire_cb)(context, expire_data, pw_exp, acct_exp, is_last_req);
--        return;
--    }
--
--    /* Don't warn if no password expiry value was sent. */
--    if (pw_exp == 0)
--        return;
--
--    /* Don't warn if the password is being changed. */
--    if (in_tkt_service && strcmp(in_tkt_service, "kadmin/changepw") == 0)
--        return;
--
--    /*
--     * If the expiry time came from a last_req field, assume the KDC wants us
--     * to warn.  Otherwise, warn only if the expiry time is less than a week
--     * from now.
--     */
--    ret = krb5_timeofday(context, &now);
--    if (ret != 0)
--        return;
--    if (!is_last_req &&
--        (ts_after(now, pw_exp) || ts_delta(pw_exp, now) > 7 * 24 * 60 * 60))
--        return;
--
--    if (!prompter)
--        return;
--
--    ret = krb5_timestamp_to_string(pw_exp, ts, sizeof(ts));
--    if (ret != 0)
--        return;
--
--    delta = ts_delta(pw_exp, now);
--    if (delta < 3600) {
--        snprintf(banner, sizeof(banner),
--                 _("Warning: Your password will expire in less than one hour "
--                   "on %s"), ts);
--    } else if (delta < 86400*2) {
--        snprintf(banner, sizeof(banner),
--                 _("Warning: Your password will expire in %d hour%s on %s"),
--                 delta / 3600, delta < 7200 ? "" : "s", ts);
--    } else {
--        snprintf(banner, sizeof(banner),
--                 _("Warning: Your password will expire in %d days on %s"),
--                 delta / 86400, ts);
--    }
--
--    /* PROMPTER_INVOCATION */
--    (*prompter)(context, data, 0, banner, 0, 0);
--}
--
- /*
-  * Create a temporary options structure for getting a kadmin/changepw ticket,
-  * based on the appplication-specified options.  Propagate all application
-@@ -496,9 +389,6 @@ krb5_get_init_creds_password(krb5_context context,
-         goto cleanup;
- 
- cleanup:
--    if (ret == 0)
--        warn_pw_expiry(context, options, prompter, data, in_tkt_service,
--                       as_reply);
-     free(chpw_opts);
-     zapfree(gakpw.storage.data, gakpw.storage.length);
-     memset(pw0array, 0, sizeof(pw0array));
-diff --git a/src/lib/krb5/krb/t_expire_warn.c b/src/lib/krb5/krb/t_expire_warn.c
-index 1e59acba1..dc8dc8fb3 100644
---- a/src/lib/krb5/krb/t_expire_warn.c
-+++ b/src/lib/krb5/krb/t_expire_warn.c
-@@ -28,6 +28,13 @@
- 
- static int exp_dummy, prompt_dummy;
- 
-+static void
-+check(krb5_error_code code)
-+{
-+    if (code != 0)
-+        abort();
-+}
-+
- static krb5_error_code
- prompter_cb(krb5_context ctx, void *data, const char *name,
-             const char *banner, int num_prompts, krb5_prompt prompts[])
-@@ -52,36 +59,48 @@ int
- main(int argc, char **argv)
- {
-     krb5_context ctx;
-+    krb5_init_creds_context icctx;
-     krb5_get_init_creds_opt *opt;
-     char *user, *password, *service = NULL;
--    krb5_boolean use_cb;
-+    krb5_boolean use_cb, stepwise;
-     krb5_principal client;
-     krb5_creds creds;
- 
--    if (argc < 4) {
--        fprintf(stderr, "Usage: %s username password {1|0} [service]\n",
-+    if (argc < 5) {
-+        fprintf(stderr, "Usage: %s username password {1|0} {1|0} [service]\n",
-                 argv[0]);
-         return 1;
-     }
-     user = argv[1];
-     password = argv[2];
-     use_cb = atoi(argv[3]);
--    if (argc >= 5)
--        service = argv[4];
-+    stepwise = atoi(argv[4]);
-+    if (argc >= 6)
-+        service = argv[5];
- 
--    assert(krb5_init_context(&ctx) == 0);
--    assert(krb5_get_init_creds_opt_alloc(ctx, &opt) == 0);
-+    check(krb5_init_context(&ctx));
-+    check(krb5_get_init_creds_opt_alloc(ctx, &opt));
-     if (use_cb) {
--        assert(krb5_get_init_creds_opt_set_expire_callback(ctx, opt, expire_cb,
--                                                           &exp_dummy) == 0);
-+        check(krb5_get_init_creds_opt_set_expire_callback(ctx, opt, expire_cb,
-+                                                          &exp_dummy));
-+    }
-+    check(krb5_parse_name(ctx, user, &client));
-+    if (stepwise) {
-+        check(krb5_init_creds_init(ctx, client, prompter_cb, &prompt_dummy, 0,
-+                                   opt, &icctx));
-+        krb5_init_creds_set_password(ctx, icctx, password);
-+        if (service != NULL)
-+            check(krb5_init_creds_set_service(ctx, icctx, service));
-+        check(krb5_init_creds_get(ctx, icctx));
-+        krb5_init_creds_free(ctx, icctx);
-+    } else {
-+        check(krb5_get_init_creds_password(ctx, &creds, client, password,
-+                                           prompter_cb, &prompt_dummy, 0,
-+                                           service, opt));
-+        krb5_free_cred_contents(ctx, &creds);
-     }
--    assert(krb5_parse_name(ctx, user, &client) == 0);
--    assert(krb5_get_init_creds_password(ctx, &creds, client, password,
--                                        prompter_cb, &prompt_dummy, 0, service,
--                                        opt) == 0);
-     krb5_get_init_creds_opt_free(ctx, opt);
-     krb5_free_principal(ctx, client);
--    krb5_free_cred_contents(ctx, &creds);
-     krb5_free_context(ctx);
-     return 0;
- }
-diff --git a/src/lib/krb5/krb/t_expire_warn.py b/src/lib/krb5/krb/t_expire_warn.py
-index 781f2728a..e163cc7e4 100755
---- a/src/lib/krb5/krb/t_expire_warn.py
-+++ b/src/lib/krb5/krb/t_expire_warn.py
-@@ -34,23 +34,33 @@ realm.run([kadminl, 'addprinc', '-pw', 'pass', '-pwexpire', '12 hours',
- realm.run([kadminl, 'addprinc', '-pw', 'pass', '-pwexpire', '3 days', 'days'])
- 
- # Check for expected prompter warnings when no expire callback is used.
--output = realm.run(['./t_expire_warn', 'noexpire', 'pass', '0'])
-+output = realm.run(['./t_expire_warn', 'noexpire', 'pass', '0', '0'])
- if output:
-     fail('Unexpected output for noexpire')
--realm.run(['./t_expire_warn', 'minutes', 'pass', '0'],
-+realm.run(['./t_expire_warn', 'minutes', 'pass', '0', '0'],
-           expected_msg=' less than one hour on ')
--realm.run(['./t_expire_warn', 'hours', 'pass', '0'], expected_msg=' hours on ')
--realm.run(['./t_expire_warn', 'days', 'pass', '0'], expected_msg=' days on ')
-+realm.run(['./t_expire_warn', 'hours', 'pass', '0', '0'],
-+          expected_msg=' hours on ')
-+realm.run(['./t_expire_warn', 'days', 'pass', '0', '0'],
-+          expected_msg=' days on ')
-+# Try one case with the stepwise interface.
-+realm.run(['./t_expire_warn', 'days', 'pass', '0', '1'],
-+          expected_msg=' days on ')
- 
- # Check for expected expire callback behavior.  These tests are
- # carefully agnostic about whether the KDC supports last_req fields,
- # and could be made more specific if last_req support is added.
--output = realm.run(['./t_expire_warn', 'noexpire', 'pass', '1'])
-+output = realm.run(['./t_expire_warn', 'noexpire', 'pass', '1', '0'])
- if 'password_expiration = 0\n' not in output or \
-         'account_expiration = 0\n' not in output or \
-         'is_last_req = ' not in output:
-     fail('Expected callback output not seen for noexpire')
--output = realm.run(['./t_expire_warn', 'days', 'pass', '1'])
-+output = realm.run(['./t_expire_warn', 'days', 'pass', '1', '0'])
-+if 'password_expiration = ' not in output or \
-+        'password_expiration = 0\n' in output:
-+    fail('Expected non-zero password expiration not seen for days')
-+# Try one case with the stepwise interface.
-+output = realm.run(['./t_expire_warn', 'days', 'pass', '1', '1'])
- if 'password_expiration = ' not in output or \
-         'password_expiration = 0\n' in output:
-     fail('Expected non-zero password expiration not seen for days')
diff --git a/Eliminate-redundant-PKINIT-responder-invocation.patch b/Eliminate-redundant-PKINIT-responder-invocation.patch
deleted file mode 100644
index 48e6e89..0000000
--- a/Eliminate-redundant-PKINIT-responder-invocation.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From b27a2f1f330afed53b034a66031f9a801b4568b7 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Mon, 23 Mar 2020 19:10:03 -0400
-Subject: [PATCH] Eliminate redundant PKINIT responder invocation
-
-In pkinit_client_prep_questions(), only act if the input padata type
-is KRB5_PADATA_PK_AS_REQ.  Otherwise we will ask questions again when
-the KDC issues a ticket.
-
-Commit 7621d2f9a87214327ca3b2594e34dc7cea84596b (ticket 8242)
-unintentionally changed the behavior of pkinit_load_fs_cert_and_key(),
-causing pkinit_client_prep_questions() to do nothing on its first
-call.  Restore the original behavior of returning 0 when prompting is
-deferred.
-
-Modify the existing "FILE identity, password on key (responder)"
-PKINIT test to check that the responder is only invoked once.
-
-ticket: 8885
-(cherry picked from commit f1286842ce7b9e507a4ce0a47f44ab361a98be63)
----
- src/plugins/preauth/pkinit/pkinit_clnt.c           |  5 +++++
- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 13 +++++++------
- src/tests/t_pkinit.py                              | 11 +++++++----
- 3 files changed, 19 insertions(+), 10 deletions(-)
-
-diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
-index 2f0431991..9b991ffe0 100644
---- a/src/plugins/preauth/pkinit/pkinit_clnt.c
-+++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
-@@ -897,6 +897,11 @@ pkinit_client_prep_questions(krb5_context context,
-     k5_json_object jval = NULL;
-     k5_json_number jflag = NULL;
- 
-+    /* Don't ask questions for the informational padata items or when the
-+     * ticket is issued. */
-+    if (pa_data->pa_type != KRB5_PADATA_PK_AS_REQ)
-+        return 0;
-+
-     if (!reqctx->identity_initialized) {
-         pkinit_client_profile(context, plgctx, reqctx, cb, rock,
-                               &request->server->realm);
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-index dd718c2be..dbb054378 100644
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -4362,17 +4362,18 @@ pkinit_load_fs_cert_and_key(krb5_context context,
- 
-     /* Load the certificate. */
-     retval = get_cert(certname, &x);
--    if (retval != 0 || x == NULL) {
--        retval = oerr(context, 0, _("Cannot read certificate file '%s'"),
-+    if (retval) {
-+        retval = oerr(context, retval, _("Cannot read certificate file '%s'"),
-                       certname);
--        goto cleanup;
-     }
-+    if (retval || x == NULL)
-+        goto cleanup;
-     /* Load the key. */
-     retval = get_key(context, id_cryptoctx, keyname, fsname, &y, password);
--    if (retval != 0 || y == NULL) {
--        retval = oerr(context, 0, _("Cannot read key file '%s'"), fsname);
-+    if (retval)
-+        retval = oerr(context, retval, _("Cannot read key file '%s'"), fsname);
-+    if (retval || y == NULL)
-         goto cleanup;
--    }
- 
-     id_cryptoctx->creds[cindex] = malloc(sizeof(struct _pkinit_cred_info));
-     if (id_cryptoctx->creds[cindex] == NULL) {
-diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py
-index 69daf4987..ecd450e8a 100755
---- a/src/tests/t_pkinit.py
-+++ b/src/tests/t_pkinit.py
-@@ -248,10 +248,13 @@ realm.run(['./adata', realm.host_princ],
- # supplied by the responder.
- # Supply the response in raw form.
- mark('FILE identity, password on key (responder)')
--realm.run(['./responder', '-x', 'pkinit={"%s": 0}' % file_enc_identity,
--           '-r', 'pkinit={"%s": "encrypted"}' % file_enc_identity,
--           '-X', 'X509_user_identity=%s' % file_enc_identity,
--           realm.user_princ])
-+out = realm.run(['./responder', '-x', 'pkinit={"%s": 0}' % file_enc_identity,
-+                 '-r', 'pkinit={"%s": "encrypted"}' % file_enc_identity,
-+                 '-X', 'X509_user_identity=%s' % file_enc_identity,
-+                 realm.user_princ])
-+# Regression test for #8885 (password question asked twice).
-+if out.count('OK: ') != 1:
-+    fail('Wrong number of responder calls')
- # Supply the response through the convenience API.
- realm.run(['./responder', '-X', 'X509_user_identity=%s' % file_enc_identity,
-            '-p', '%s=%s' % (file_enc_identity, 'encrypted'), realm.user_princ])
diff --git a/Fix-input-length-checking-in-SPNEGO-DER-decoding.patch b/Fix-input-length-checking-in-SPNEGO-DER-decoding.patch
deleted file mode 100644
index ae01c8d..0000000
--- a/Fix-input-length-checking-in-SPNEGO-DER-decoding.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5b42970afea248889fd3350448a40045d467ff3f Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Tue, 28 Jul 2020 12:58:26 -0400
-Subject: [PATCH] Fix input length checking in SPNEGO DER decoding
-
-In get_mech_set(), check the length before reading the first byte, and
-decrease the length by the tag byte when reading and verifying the
-sequence length.
-
-In get_req_flags(), check the length before reading the first byte,
-and check the context tag length after decoding it.
-
-ticket: 8933 (new)
-tags: pullup
-target_version: 1.18-next
-target_version: 1.17-next
-
-(cherry picked from commit 64f4b75a22212681ca293f8f09ddd24b0244d5b4)
----
- src/lib/gssapi/spnego/spnego_mech.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
-index 4cf011143..13c351620 100644
---- a/src/lib/gssapi/spnego/spnego_mech.c
-+++ b/src/lib/gssapi/spnego/spnego_mech.c
-@@ -3462,14 +3462,14 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
- 	unsigned char		*start;
- 	int i;
- 
--	if (**buff_in != SEQUENCE_OF)
-+	if (buff_length < 1 || **buff_in != SEQUENCE_OF)
- 		return (NULL);
- 
- 	start = *buff_in;
- 	(*buff_in)++;
- 
--	length = gssint_get_der_length(buff_in, buff_length, &bytes);
--	if (length < 0 || buff_length - bytes < (unsigned int)length)
-+	length = gssint_get_der_length(buff_in, buff_length - 1, &bytes);
-+	if (length < 0 || buff_length - 1 - bytes < (unsigned int)length)
- 		return NULL;
- 
- 	major_status = gss_create_empty_oid_set(minor_status,
-@@ -3549,11 +3549,11 @@ get_req_flags(unsigned char **buff_in, OM_uint32 bodysize,
- {
- 	unsigned int len;
- 
--	if (**buff_in != (CONTEXT | 0x01))
-+	if (bodysize < 1 || **buff_in != (CONTEXT | 0x01))
- 		return (0);
- 
- 	if (g_get_tag_and_length(buff_in, (CONTEXT | 0x01),
--				bodysize, &len) < 0)
-+				 bodysize, &len) < 0 || len != 4)
- 		return GSS_S_DEFECTIVE_TOKEN;
- 
- 	if (*(*buff_in)++ != BIT_STRING)
diff --git a/Fix-leak-in-KERB_AP_OPTIONS_CBT-server-support.patch b/Fix-leak-in-KERB_AP_OPTIONS_CBT-server-support.patch
deleted file mode 100644
index c5ec79a..0000000
--- a/Fix-leak-in-KERB_AP_OPTIONS_CBT-server-support.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ff47523d7d812fba24106f416aafa5d1f2c433a2 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Fri, 24 Jul 2020 16:05:24 -0400
-Subject: [PATCH] Fix leak in KERB_AP_OPTIONS_CBT server support
-
-In check_cbt(), use a local variable to hold the retrieved authdata
-list, and free it before returning.
-
-ticket: 8900
-(cherry picked from commit bf2ddff13c178e0c291f8fb382b040080d159e4f)
----
- src/lib/gssapi/krb5/accept_sec_context.c | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
-index 175a24c4e..3d5b84b15 100644
---- a/src/lib/gssapi/krb5/accept_sec_context.c
-+++ b/src/lib/gssapi/krb5/accept_sec_context.c
-@@ -433,27 +433,30 @@ static const uint8_t null_cb[CB_MD5_LEN];
- /* Look for AP_OPTIONS in authdata.  If present and the options include
-  * KERB_AP_OPTIONS_CBT, set *cbt_out to true. */
- static krb5_error_code
--check_cbt(krb5_context context, krb5_authdata **authdata,
-+check_cbt(krb5_context context, krb5_authdata *const *authdata,
-           krb5_boolean *cbt_out)
- {
-     krb5_error_code code;
-+    krb5_authdata **ad;
-     uint32_t ad_ap_options;
-     const uint32_t KERB_AP_OPTIONS_CBT = 0x4000;
- 
-     *cbt_out = FALSE;
- 
-     code = krb5_find_authdata(context, NULL, authdata,
--                              KRB5_AUTHDATA_AP_OPTIONS, &authdata);
--    if (code || authdata == NULL)
-+                              KRB5_AUTHDATA_AP_OPTIONS, &ad);
-+    if (code || ad == NULL)
-         return code;
--    if (authdata[1] != NULL || authdata[0]->length != 4)
--        return KRB5KRB_AP_ERR_MSG_TYPE;
-+    if (ad[1] != NULL || ad[0]->length != 4) {
-+        code = KRB5KRB_AP_ERR_MSG_TYPE;
-+    } else {
-+        ad_ap_options = load_32_le(ad[0]->contents);
-+        if (ad_ap_options & KERB_AP_OPTIONS_CBT)
-+            *cbt_out = TRUE;
-+    }
- 
--    ad_ap_options = load_32_le(authdata[0]->contents);
--    if (ad_ap_options & KERB_AP_OPTIONS_CBT)
--        *cbt_out = TRUE;
--
--    return 0;
-+    krb5_free_authdata(context, ad);
-+    return code;
- }
- 
- /*
diff --git a/Fix-minor-static-analysis-defects.patch b/Fix-minor-static-analysis-defects.patch
deleted file mode 100644
index 653bce1..0000000
--- a/Fix-minor-static-analysis-defects.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From c3d96fca46cb2cc3ee9f4c2e2a4ed98bad3e310a Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Thu, 15 Oct 2020 18:15:29 -0400
-Subject: [PATCH] Fix minor static analysis defects
-
-Remove an unused variable in krb5_ldap_create().  Handle the return
-value from krb5_dbe_get_string() in the certauth test plugin module.
-Handle the return value from k5_expand_path_tokens() in
-k5_rc_default().  Remove dead assignments in
-krb5_get_credentials_for_user() and kg_accept_krb5().
-
-[ghudson@mit.edu: squashed and edited commit message; simplified
-k5_rc_default() change]
-
-(cherry picked from commit b27461141810fddd299764928649148c5d0e99f3)
----
- src/lib/gssapi/krb5/accept_sec_context.c       | 4 +---
- src/lib/krb5/krb/s4u_creds.c                   | 1 -
- src/lib/krb5/rcache/rc_base.c                  | 2 ++
- src/plugins/certauth/test/main.c               | 3 +++
- src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c | 4 ----
- 5 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
-index 3d5b84b15..e2c5e2b59 100644
---- a/src/lib/gssapi/krb5/accept_sec_context.c
-+++ b/src/lib/gssapi/krb5/accept_sec_context.c
-@@ -671,7 +671,7 @@ kg_accept_krb5(minor_status, context_handle,
-     krb5_auth_context auth_context = NULL;
-     krb5_ticket * ticket = NULL;
-     const gss_OID_desc *mech_used = NULL;
--    OM_uint32 major_status = GSS_S_FAILURE;
-+    OM_uint32 major_status;
-     OM_uint32 tmp_minor_status;
-     krb5_error krb_error_data;
-     krb5_data scratch;
-@@ -878,8 +878,6 @@ kg_accept_krb5(minor_status, context_handle,
-     if (major_status != GSS_S_COMPLETE)
-         goto fail;
- 
--    major_status = GSS_S_FAILURE;
--
-     if (exts->iakerb.conv && !exts->iakerb.verified) {
-         major_status = GSS_S_BAD_SIG;
-         goto fail;
-diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c
-index d8f486dc6..35a8843e5 100644
---- a/src/lib/krb5/krb/s4u_creds.c
-+++ b/src/lib/krb5/krb/s4u_creds.c
-@@ -714,7 +714,6 @@ krb5_get_credentials_for_user(krb5_context context, krb5_flags options,
-         } else if (code != KRB5_CC_NOTFOUND && code != KRB5_CC_NOT_KTYPE) {
-             goto cleanup;
-         }
--        code = 0;
-     }
- 
-     /* Note the authdata we asked for in the output creds. */
-diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c
-index 5f456d1f3..f9a482318 100644
---- a/src/lib/krb5/rcache/rc_base.c
-+++ b/src/lib/krb5/rcache/rc_base.c
-@@ -56,6 +56,8 @@ k5_rc_default(krb5_context context, krb5_rcache *rc_out)
-                            &profstr) == 0 && profstr != NULL) {
-         ret = k5_expand_path_tokens(context, profstr, &rcname);
-         profile_release_string(profstr);
-+        if (ret)
-+            return ret;
-         ret = k5_rc_resolve(context, rcname, rc_out);
-         free(rcname);
-         return ret;
-diff --git a/src/plugins/certauth/test/main.c b/src/plugins/certauth/test/main.c
-index d4633b8cd..7e7a3ef4c 100644
---- a/src/plugins/certauth/test/main.c
-+++ b/src/plugins/certauth/test/main.c
-@@ -171,6 +171,9 @@ test2_authorize(krb5_context context, krb5_certauth_moddata moddata,
- 
-     ret = krb5_dbe_get_string(context, (krb5_db_entry *)db_entry, "hwauth",
-                               &strval);
-+    if (ret)
-+        goto cleanup;
-+
-     ret = (strval != NULL) ? KRB5_CERTAUTH_HWAUTH : 0;
-     krb5_dbe_free_string(context, strval);
- 
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
-index 5b57c799a..2d6605666 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
-@@ -55,7 +55,6 @@ krb5_ldap_create(krb5_context context, char *conf_section, char **db_args)
-     krb5_error_code status = 0;
-     krb5_ldap_realm_params *rparams = NULL;
-     krb5_ldap_context *ldap_context=NULL;
--    krb5_boolean realm_obj_created = FALSE;
-     int mask = 0;
- 
-     /* Clear the global error string */
-@@ -109,9 +108,6 @@ krb5_ldap_create(krb5_context context, char *conf_section, char **db_args)
-     if ((status = krb5_ldap_create_realm(context, rparams, mask)))
-         goto cleanup;
- 
--    /* We just created the Realm container. Here starts our transaction tracking */
--    realm_obj_created = TRUE;
--
-     /* verify realm object */
-     if ((status = krb5_ldap_read_realm_params(context,
-                                               rparams->realm_name,
diff --git a/Fix-typo-in-in-in-the-ksu-man-page.patch b/Fix-typo-in-in-in-the-ksu-man-page.patch
deleted file mode 100644
index 040355c..0000000
--- a/Fix-typo-in-in-in-the-ksu-man-page.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bf8567ed95991628f198e88403e30f78e2d74e15 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Thu, 14 May 2020 15:01:18 -0400
-Subject: [PATCH] Fix typo ("in in") in the ksu man page
-
-(cherry picked from commit 1011841acdc1020f308ef4f569c6622f279d8c3f)
----
- doc/user/user_commands/ksu.rst | 2 +-
- src/man/ksu.man                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/user/user_commands/ksu.rst b/doc/user/user_commands/ksu.rst
-index 8d6c7ef79..933738229 100644
---- a/doc/user/user_commands/ksu.rst
-+++ b/doc/user/user_commands/ksu.rst
-@@ -155,7 +155,7 @@ wrong password is typed in, ksu fails.
- .. note::
- 
-           During authentication, only the tickets that could be
--          obtained without providing a password are cached in in the
-+          obtained without providing a password are cached in the
-           source cache.
- 
- 
-diff --git a/src/man/ksu.man b/src/man/ksu.man
-index 81e34815d..8d4c6a359 100644
---- a/src/man/ksu.man
-+++ b/src/man/ksu.man
-@@ -176,7 +176,7 @@ wrong password is typed in, ksu fails.
- .INDENT 0.0
- .INDENT 3.5
- During authentication, only the tickets that could be
--obtained without providing a password are cached in in the
-+obtained without providing a password are cached in the
- source cache.
- .UNINDENT
- .UNINDENT
diff --git a/Ignore-bad-enctypes-in-krb5_string_to_keysalts.patch b/Ignore-bad-enctypes-in-krb5_string_to_keysalts.patch
deleted file mode 100644
index 14e27a9..0000000
--- a/Ignore-bad-enctypes-in-krb5_string_to_keysalts.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e74f9424e47ab914c46e549fc5a2cbdf2615ef93 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 15 Jul 2020 15:42:20 -0400
-Subject: [PATCH] Ignore bad enctypes in krb5_string_to_keysalts()
-
-Fixes a problem where the presence of legacy/unrecognized keysalts in
-supported_enctypes would prevent the kadmin programs from starting.
-
-[ghudson@mit.edu: ideally we would put a warning in the kadmind log,
-but that is difficult to do when the parsing is done inside a library.
-Even adding a trace log is difficult because the kadm5 str_conv
-functions do not accept contexts.]
-
-ticket: 8929 (new)
-(cherry picked from commit be5396ada0e8dabd68bd0aceb733cfca39a609bc)
----
- src/lib/kadm5/str_conv.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
-index 7cf51d316..798295606 100644
---- a/src/lib/kadm5/str_conv.c
-+++ b/src/lib/kadm5/str_conv.c
-@@ -340,9 +340,10 @@ krb5_string_to_keysalts(const char *string, const char *tupleseps,
-     while ((ksp = strtok_r(p, tseps, &tlasts)) != NULL) {
-         /* Pass a null pointer to subsequent calls to strtok_r(). */
-         p = NULL;
--        ret = string_to_keysalt(ksp, ksaltseps, &etype, &stype);
--        if (ret)
--            goto cleanup;
-+
-+        /* Discard unrecognized keysalts. */
-+        if (string_to_keysalt(ksp, ksaltseps, &etype, &stype) != 0)
-+            continue;
- 
-         /* Ignore duplicate keysalts if caller asks. */
-         if (!dups && krb5_keysalt_is_present(ksalts, nksalts, etype, stype))
diff --git a/Implement-GSS_C_CHANNEL_BOUND_FLAG.patch b/Implement-GSS_C_CHANNEL_BOUND_FLAG.patch
deleted file mode 100644
index 2b41b6b..0000000
--- a/Implement-GSS_C_CHANNEL_BOUND_FLAG.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 651b9b8084ecff5553b7ef6ee723ce7c4438a9d8 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Wed, 5 Jul 2017 11:38:30 -0400
-Subject: [PATCH] Implement GSS_C_CHANNEL_BOUND_FLAG
-
-Define a new channel-bound GSS return flag, and set it in the krb5
-mech if the initiator sent channel bindings matching the acceptor's.
-Do not error out if the acceptor specifies channel bindings and the
-initiator does not send them.
-
-[ghudson@mit.edu: simplified code changes; fleshed out commit message]
-
-[iboukris: cherry-picked from another PR and reduced in scope]
-
-ticket: 8899 (new)
-(cherry picked from commit 429a31146083fac21958631c2af572b08ec91022)
----
- src/lib/gssapi/generic/gssapi_ext.h      |  2 ++
- src/lib/gssapi/krb5/accept_sec_context.c | 18 +++++++++++++-----
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h
-index 218456e44..c675e8ebb 100644
---- a/src/lib/gssapi/generic/gssapi_ext.h
-+++ b/src/lib/gssapi/generic/gssapi_ext.h
-@@ -595,6 +595,8 @@ gss_store_cred_into(
-  * attribute (along with any applicable RFC 5587 attributes).
-  */
- 
-+#define GSS_C_CHANNEL_BOUND_FLAG 2048 /* 0x00000800 */
-+
- OM_uint32 KRB5_CALLCONV
- gssspi_query_meta_data(
-     OM_uint32 *minor_status,
-diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
-index 70dd7fc0c..9d3e2f4fe 100644
---- a/src/lib/gssapi/krb5/accept_sec_context.c
-+++ b/src/lib/gssapi/krb5/accept_sec_context.c
-@@ -427,6 +427,9 @@ kg_process_extension(krb5_context context,
-                          GSS_C_SEQUENCE_FLAG | GSS_C_DCE_STYLE |        \
-                          GSS_C_IDENTIFY_FLAG | GSS_C_EXTENDED_ERROR_FLAG)
- 
-+/* A zero-value channel binding, for comparison */
-+static const uint8_t null_cb[CB_MD5_LEN];
-+
- /*
-  * The krb5 GSS mech appropriates the authenticator checksum field from RFC
-  * 4120 to store structured data instead of a checksum, indicated with checksum
-@@ -435,9 +438,10 @@ kg_process_extension(krb5_context context,
-  *
-  * Interpret the checksum.  Read delegated creds into *deleg_out if it is not
-  * NULL.  Set *flags_out to the allowed subset of token flags, plus
-- * GSS_C_DELEG_FLAG if a delegated credential was present.  Process any
-- * extensions found using exts.  On error, set *code_out to a krb5_error code
-- * for use as a minor status value.
-+ * GSS_C_DELEG_FLAG if a delegated credential was present and
-+ * GSS_C_CHANNEL_BOUND_FLAG if matching channel bindings are present.  Process
-+ * any extensions found using exts.  On error, set *code_out to a krb5_error
-+ * code for use as a minor status value.
-  */
- static OM_uint32
- process_checksum(OM_uint32 *minor_status, krb5_context context,
-@@ -450,7 +454,7 @@ process_checksum(OM_uint32 *minor_status, krb5_context context,
-     krb5_error_code code = 0;
-     OM_uint32 status, option_id, token_flags;
-     size_t cb_len, option_len;
--    krb5_boolean valid;
-+    krb5_boolean valid, token_cb_present = FALSE, cb_match = FALSE;
-     krb5_key subkey;
-     krb5_data option, empty = empty_data();
-     krb5_checksum cb_cksum;
-@@ -516,7 +520,9 @@ process_checksum(OM_uint32 *minor_status, krb5_context context,
-                 goto fail;
-             }
-             assert(cb_cksum.length == cb_len);
--            if (k5_bcmp(token_cb, cb_cksum.contents, cb_len) != 0) {
-+            token_cb_present = (k5_bcmp(token_cb, null_cb, cb_len) != 0);
-+            cb_match = (k5_bcmp(token_cb, cb_cksum.contents, cb_len) == 0);
-+            if (token_cb_present && !cb_match) {
-                 status = GSS_S_BAD_BINDINGS;
-                 goto fail;
-             }
-@@ -525,6 +531,8 @@ process_checksum(OM_uint32 *minor_status, krb5_context context,
-         /* Read the token flags and accept some of them as context flags. */
-         token_flags = k5_input_get_uint32_le(&in);
-         *flags_out = token_flags & INITIATOR_FLAGS;
-+        if (cb_match)
-+            *flags_out |= GSS_C_CHANNEL_BOUND_FLAG;
- 
-         /* Read the delegated credential if present. */
-         if (in.len >= 4 && (token_flags & GSS_C_DELEG_FLAG)) {
diff --git a/Implement-KERB_AP_OPTIONS_CBT-server-side.patch b/Implement-KERB_AP_OPTIONS_CBT-server-side.patch
deleted file mode 100644
index eadc695..0000000
--- a/Implement-KERB_AP_OPTIONS_CBT-server-side.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From bc89c6c720c4170d43010fead23550b80499c32a Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Mon, 9 Mar 2020 16:04:21 +0100
-Subject: [PATCH] Implement KERB_AP_OPTIONS_CBT (server side)
-
-Add server support for Microsoft's KERB_AP_OPTIONS_CBT as described in
-MS-KILE.  If the client includes the AP option in the authenticator
-authdata and the server passed channel bindings, require the bindings
-to match.
-
-[ghudson@mit.edu: refactored to put more logic in the helper function;
-added a comment; clarified commit message]
-
-ticket: 8900 (new)
-(cherry picked from commit 4f7c77b64a048ca5e3199b26b31493698c777a9c)
----
- src/include/krb5/krb5.hin                |  1 +
- src/lib/gssapi/krb5/accept_sec_context.c | 45 +++++++++++++++++++++++-
- 2 files changed, 45 insertions(+), 1 deletion(-)
-
-diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
-index f8269fb17..9264bede1 100644
---- a/src/include/krb5/krb5.hin
-+++ b/src/include/krb5/krb5.hin
-@@ -1915,6 +1915,7 @@ krb5_verify_checksum(krb5_context context, krb5_cksumtype ctype,
- #define KRB5_AUTHDATA_SIGNTICKET        512     /**< formerly 142 in krb5 1.8 */
- #define KRB5_AUTHDATA_FX_ARMOR 71
- #define KRB5_AUTHDATA_AUTH_INDICATOR 97
-+#define KRB5_AUTHDATA_AP_OPTIONS 143
- /** @} */ /* end of KRB5_AUTHDATA group */
- 
- /* password change constants */
-diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
-index 9d3e2f4fe..175a24c4e 100644
---- a/src/lib/gssapi/krb5/accept_sec_context.c
-+++ b/src/lib/gssapi/krb5/accept_sec_context.c
-@@ -430,6 +430,32 @@ kg_process_extension(krb5_context context,
- /* A zero-value channel binding, for comparison */
- static const uint8_t null_cb[CB_MD5_LEN];
- 
-+/* Look for AP_OPTIONS in authdata.  If present and the options include
-+ * KERB_AP_OPTIONS_CBT, set *cbt_out to true. */
-+static krb5_error_code
-+check_cbt(krb5_context context, krb5_authdata **authdata,
-+          krb5_boolean *cbt_out)
-+{
-+    krb5_error_code code;
-+    uint32_t ad_ap_options;
-+    const uint32_t KERB_AP_OPTIONS_CBT = 0x4000;
-+
-+    *cbt_out = FALSE;
-+
-+    code = krb5_find_authdata(context, NULL, authdata,
-+                              KRB5_AUTHDATA_AP_OPTIONS, &authdata);
-+    if (code || authdata == NULL)
-+        return code;
-+    if (authdata[1] != NULL || authdata[0]->length != 4)
-+        return KRB5KRB_AP_ERR_MSG_TYPE;
-+
-+    ad_ap_options = load_32_le(authdata[0]->contents);
-+    if (ad_ap_options & KERB_AP_OPTIONS_CBT)
-+        *cbt_out = TRUE;
-+
-+    return 0;
-+}
-+
- /*
-  * The krb5 GSS mech appropriates the authenticator checksum field from RFC
-  * 4120 to store structured data instead of a checksum, indicated with checksum
-@@ -454,7 +480,7 @@ process_checksum(OM_uint32 *minor_status, krb5_context context,
-     krb5_error_code code = 0;
-     OM_uint32 status, option_id, token_flags;
-     size_t cb_len, option_len;
--    krb5_boolean valid, token_cb_present = FALSE, cb_match = FALSE;
-+    krb5_boolean valid, client_cbt, token_cb_present = FALSE, cb_match = FALSE;
-     krb5_key subkey;
-     krb5_data option, empty = empty_data();
-     krb5_checksum cb_cksum;
-@@ -582,6 +608,23 @@ process_checksum(OM_uint32 *minor_status, krb5_context context,
-         }
-     }
- 
-+    /*
-+     * If the client asserts the KERB_AP_OPTIONS_CBT flag (from MS-KILE) in the
-+     * authenticator authdata, and the acceptor passed channel bindings,
-+     * require matching channel bindings from the client.  The intent is to
-+     * prevent an authenticator generated for use outside of a TLS channel from
-+     * being used inside of one.
-+     */
-+    code = check_cbt(context, authenticator->authorization_data, &client_cbt);
-+    if (code) {
-+        status = GSS_S_FAILURE;
-+        goto fail;
-+    }
-+    if (client_cbt && acceptor_cb != GSS_C_NO_CHANNEL_BINDINGS && !cb_match) {
-+        status = GSS_S_BAD_BINDINGS;
-+        goto fail;
-+    }
-+
-     status = GSS_S_COMPLETE;
- 
- fail:
diff --git a/Improve-KDC-alias-checking-for-S4U-requests.patch b/Improve-KDC-alias-checking-for-S4U-requests.patch
deleted file mode 100644
index 3dbb119..0000000
--- a/Improve-KDC-alias-checking-for-S4U-requests.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From ed87237cdd70f72b309960a294a2bed26cef1579 Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Fri, 4 Sep 2020 14:05:50 +0300
-Subject: [PATCH] Improve KDC alias checking for S4U requests
-
-When processing an S4U2Self request, check for DB aliases when
-matching the TGT client against the request server.  When processing
-an S4U2Proxy request, check for DB aliases when matching the TGT
-client against the evidence ticket server.
-
-[ghudson@mit.edu: minor edits; rewrote commit message]
-
-ticket: 8946 (new)
-(cherry picked from commit 05deeebfc096970b5d9aa67a48b14106cf1b9b56)
----
- src/kdc/kdc_util.c | 74 ++++++++++++++++------------------------------
- 1 file changed, 25 insertions(+), 49 deletions(-)
-
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index e3352f9cc..dcb2df8dc 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -1463,6 +1463,25 @@ cleanup:
-     return code;
- }
- 
-+/* Return true if princ canonicalizes to the same principal as canon. */
-+static krb5_boolean
-+is_client_alias(krb5_context context, krb5_const_principal canon,
-+                krb5_const_principal princ)
-+{
-+    krb5_error_code ret;
-+    krb5_db_entry *self;
-+    krb5_boolean is_self = FALSE;
-+
-+    ret = krb5_db_get_principal(context, princ,
-+                                KRB5_KDB_FLAG_CLIENT_REFERRALS_ONLY, &self);
-+    if (!ret) {
-+        is_self = krb5_principal_compare(context, canon, self->princ);
-+        krb5_db_free_principal(context, self);
-+    }
-+
-+    return is_self;
-+}
-+
- /*
-  * Protocol transition (S4U2Self)
-  */
-@@ -1481,7 +1500,6 @@ kdc_process_s4u2self_req(kdc_realm_t *kdc_active_realm,
- {
-     krb5_error_code             code;
-     krb5_pa_data                *pa_data;
--    int                         flags;
-     krb5_db_entry               *princ;
-     krb5_s4u_userid             *id;
- 
-@@ -1515,51 +1533,11 @@ kdc_process_s4u2self_req(kdc_realm_t *kdc_active_realm,
-     }
-     id = &(*s4u_x509_user)->user_id;
- 
--    /*
--     * We need to compare the client name in the TGT with the requested
--     * server name. Supporting server name aliases without assuming a
--     * global name service makes this difficult to do.
--     *
--     * The comparison below handles the following cases (note that the
--     * term "principal name" below excludes the realm).
--     *
--     * (1) The requested service is a host-based service with two name
--     *     components, in which case we assume the principal name to
--     *     contain sufficient qualifying information. The realm is
--     *     ignored for the purpose of comparison.
--     *
--     * (2) The requested service name is an enterprise principal name:
--     *     the service principal name is compared with the unparsed
--     *     form of the client name (including its realm).
--     *
--     * (3) The requested service is some other name type: an exact
--     *     match is required.
--     *
--     * An alternative would be to look up the server once again with
--     * FLAG_CANONICALIZE | FLAG_CLIENT_REFERRALS_ONLY set, do an exact
--     * match between the returned name and client_princ. However, this
--     * assumes that the client set FLAG_CANONICALIZE when requesting
--     * the TGT and that we have a global name service.
--     */
--    flags = 0;
--    switch (krb5_princ_type(kdc_context, request->server)) {
--    case KRB5_NT_SRV_HST:                   /* (1) */
--        if (krb5_princ_size(kdc_context, request->server) == 2)
--            flags |= KRB5_PRINCIPAL_COMPARE_IGNORE_REALM;
--        break;
--    case KRB5_NT_ENTERPRISE_PRINCIPAL:      /* (2) */
--        flags |= KRB5_PRINCIPAL_COMPARE_ENTERPRISE;
--        break;
--    default:                                /* (3) */
--        break;
--    }
--
--    if (!krb5_principal_compare_flags(kdc_context,
--                                      request->server,
--                                      client_princ,
--                                      flags)) {
--        *status = "INVALID_S4U2SELF_REQUEST";
--        return KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN; /* match Windows error code */
-+    /* If the server is local, check that the request is for self. */
-+    if (!isflagset(c_flags, KRB5_KDB_FLAG_ISSUING_REFERRAL) &&
-+        !is_client_alias(kdc_context, server->princ, client_princ)) {
-+        *status = "INVALID_S4U2SELF_REQUEST_SERVER_MISMATCH";
-+        return KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN; /* match Windows error */
-     }
- 
-     /*
-@@ -1750,9 +1728,7 @@ kdc_process_s4u2proxy_req(kdc_realm_t *kdc_active_realm, unsigned int flags,
-         }
- 
-         client_princ = *stkt_authdata_client;
--    } else if (!krb5_principal_compare(kdc_context,
--                                       server->princ, /* after canon */
--                                       server_princ)) {
-+    } else if (!is_client_alias(kdc_context, server->princ, server_princ)) {
-         *status = "EVIDENCE_TICKET_MISMATCH";
-         return KRB5KDC_ERR_SERVER_NOMATCH;
-     }
diff --git a/Improve-negoex_parse_token-code-hygiene.patch b/Improve-negoex_parse_token-code-hygiene.patch
deleted file mode 100644
index a58c2e6..0000000
--- a/Improve-negoex_parse_token-code-hygiene.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4c96c8fef146337b7d3c0ebb4118a18818dd1f4e Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 9 Jun 2020 16:23:37 -0400
-Subject: [PATCH] Improve negoex_parse_token() code hygiene
-
-If the while loop in negoex_parse_token() runs for zero iterations,
-major will be used initialized.  Currently this cannot happen, but
-only because both of the call sites check for zero-length tokens.
-Initialize major for safety.
-
-[ghudson@mit.edu: rewrote commit message]
-
-(cherry picked from commit 4f91b6f8fa6fe1de662b3fdac0d59b7758ec642a)
----
- src/lib/gssapi/spnego/negoex_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/gssapi/spnego/negoex_util.c b/src/lib/gssapi/spnego/negoex_util.c
-index 700368456..99580fd79 100644
---- a/src/lib/gssapi/spnego/negoex_util.c
-+++ b/src/lib/gssapi/spnego/negoex_util.c
-@@ -454,7 +454,7 @@ negoex_parse_token(OM_uint32 *minor, spnego_gss_ctx_id_t ctx,
-                    gss_const_buffer_t token,
-                    struct negoex_message **messages_out, size_t *count_out)
- {
--    OM_uint32 major;
-+    OM_uint32 major = GSS_S_COMPLETE;
-     size_t count = 0;
-     struct k5input in;
-     struct negoex_message *messages = NULL, *newptr;
diff --git a/Minimize-usage-of-tgs_server-in-KDC.patch b/Minimize-usage-of-tgs_server-in-KDC.patch
deleted file mode 100644
index f08458e..0000000
--- a/Minimize-usage-of-tgs_server-in-KDC.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From 5e79319edf3836d12dbc710ec1e2dd4405c9df35 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Fri, 25 Sep 2020 11:12:34 -0400
-Subject: [PATCH] Minimize usage of tgs_server in KDC
-
-Where possible, use the realm of the request server principal
-(canonicalized via KDB lookup, if available) in preference to
-tgs_server.  This change facilitates alias realm support and potential
-future support for serving multiple realms from the same KDB.
-
-S4U2Self local user testing currently uses the uncanonicalized request
-realm after this change, which will require attention for alias realm
-support.
-
-FAST armor ticket checking is unaffected by this change (it still
-compares against tgs_server).  This check poses no issue for realm
-aliases, as both tgs_server and the armor ticket server should have
-canonical realms, but it will require attention for multi-realm KDB
-support.
-
-Remove is_local_principal() as it is no longer used.  Add an
-is_local_tgs_principal() helper and shorten is_cross_tgs_principal().
-
-Move the header ticket lineage check from kdc_process_tgs_req() to
-process_tgs_req(), where we have the canonical request server name and
-a more natural indication of whether the request was an S4U2Self
-request.
-
-(cherry picked from commit 90fedf8188fc47aa5a476a969af34671555df389)
----
- src/kdc/do_as_req.c  | 21 ++++++--------
- src/kdc/do_tgs_req.c | 16 ++++++++---
- src/kdc/kdc_util.c   | 68 ++++++++++----------------------------------
- src/kdc/kdc_util.h   |  3 +-
- src/kdc/tgs_policy.c | 16 ++++++-----
- 5 files changed, 46 insertions(+), 78 deletions(-)
-
-diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
-index c2dfea9b8..e0ac33649 100644
---- a/src/kdc/do_as_req.c
-+++ b/src/kdc/do_as_req.c
-@@ -620,18 +620,6 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
-     }
-     state->rock.client = state->client;
- 
--    /*
--     * If the backend returned a principal that is not in the local
--     * realm, then we need to refer the client to that realm.
--     */
--    if (!is_local_principal(kdc_active_realm, state->client->princ)) {
--        /* Entry is a referral to another realm */
--        state->status = "REFERRAL";
--        au_state->cl_realm = &state->client->princ->realm;
--        errcode = KRB5KDC_ERR_WRONG_REALM;
--        goto errout;
--    }
--
-     au_state->stage = SRVC_PRINC;
- 
-     s_flags = 0;
-@@ -651,6 +639,15 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
-         goto errout;
-     }
- 
-+    /* If the KDB module returned a different realm for the client and server,
-+     * we need to issue a client realm referral. */
-+    if (!data_eq(state->server->princ->realm, state->client->princ->realm)) {
-+        state->status = "REFERRAL";
-+        au_state->cl_realm = &state->client->princ->realm;
-+        errcode = KRB5KDC_ERR_WRONG_REALM;
-+        goto errout;
-+    }
-+
-     errcode = get_local_tgt(kdc_context, &state->request->server->realm,
-                             state->server, &state->local_tgt,
-                             &state->local_tgt_storage, &state->local_tgt_key);
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index d345797c4..8ea418e43 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -268,7 +268,7 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt,
-         goto cleanup;
-     }
- 
--    if (!is_local_principal(kdc_active_realm, header_ticket->server))
-+    if (!data_eq(header_server->princ->realm, sprinc->realm))
-         setflag(c_flags, KRB5_KDB_FLAG_CROSS_REALM);
-     if (is_referral)
-         setflag(c_flags, KRB5_KDB_FLAG_ISSUING_REFERRAL);
-@@ -295,6 +295,15 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt,
-         au_state->s4u2self_user = NULL;
-     }
- 
-+    /* Aside from cross-realm S4U2Self requests, do not accept header tickets
-+     * for local users issued by foreign realms. */
-+    if (s4u_x509_user == NULL && data_eq(cprinc->realm, sprinc->realm) &&
-+        isflagset(c_flags, KRB5_KDB_FLAG_CROSS_REALM)) {
-+        krb5_klog_syslog(LOG_INFO, _("PROCESS_TGS: failed lineage check"));
-+        retval = KRB5KDC_ERR_POLICY;
-+        goto cleanup;
-+    }
-+
-     if (errcode)
-         goto cleanup;
- 
-@@ -583,13 +592,12 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt,
- 
-     /*
-      * Only add the realm of the presented tgt to the transited list if
--     * it is different than the local realm (cross-realm) and it is different
-+     * it is different than the server realm (cross-realm) and it is different
-      * than the realm of the client (since the realm of the client is already
-      * implicitly part of the transited list and should not be explicitly
-      * listed).
-      */
--    /* realm compare is like strcmp, but knows how to deal with these args */
--    if (krb5_realm_compare(kdc_context, header_ticket->server, tgs_server) ||
-+    if (!isflagset(c_flags, KRB5_KDB_FLAG_CROSS_REALM) ||
-         krb5_realm_compare(kdc_context, header_ticket->server,
-                            enc_tkt_reply.client)) {
-         /* tgt issued by local realm or issued by realm of client */
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index b2042862a..e0b65a87c 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -78,12 +78,6 @@ static krb5_error_code find_server_key(krb5_context,
-                                        krb5_kvno, krb5_keyblock **,
-                                        krb5_kvno *);
- 
--krb5_boolean
--is_local_principal(kdc_realm_t *kdc_active_realm, krb5_const_principal princ1)
--{
--    return krb5_realm_compare(kdc_context, princ1, tgs_server);
--}
--
- /*
-  * Returns TRUE if the kerberos principal is the name of a Kerberos ticket
-  * service.
-@@ -104,13 +98,16 @@ krb5_is_tgs_principal(krb5_const_principal principal)
- krb5_boolean
- is_cross_tgs_principal(krb5_const_principal principal)
- {
--    if (!krb5_is_tgs_principal(principal))
--        return FALSE;
--    if (!data_eq(*krb5_princ_component(kdc_context, principal, 1),
--                 *krb5_princ_realm(kdc_context, principal)))
--        return TRUE;
--    else
--        return FALSE;
-+    return krb5_is_tgs_principal(principal) &&
-+        !data_eq(principal->data[1], principal->realm);
-+}
-+
-+/* Return true if princ is the name of a local TGS for any realm. */
-+krb5_boolean
-+is_local_tgs_principal(krb5_const_principal principal)
-+{
-+    return krb5_is_tgs_principal(principal) &&
-+        data_eq(principal->data[1], principal->realm);
- }
- 
- /*
-@@ -143,17 +140,6 @@ comp_cksum(krb5_context kcontext, krb5_data *source, krb5_ticket *ticket,
-     return(0);
- }
- 
--/* Return true if padata contains an entry of either S4U2Self type. */
--static inline krb5_boolean
--has_s4u2self_padata(krb5_pa_data **padata)
--{
--    if (krb5int_find_pa_data(NULL, padata, KRB5_PADATA_FOR_USER) != NULL)
--        return TRUE;
--    if (krb5int_find_pa_data(NULL, padata, KRB5_PADATA_S4U_X509_USER) != NULL)
--        return TRUE;
--    return FALSE;
--}
--
- /* If a header ticket is decrypted, *ticket_out is filled in even on error. */
- krb5_error_code
- kdc_process_tgs_req(kdc_realm_t *kdc_active_realm,
-@@ -170,7 +156,6 @@ kdc_process_tgs_req(kdc_realm_t *kdc_active_realm,
-     krb5_authdata **authdata = NULL;
-     krb5_data             scratch1;
-     krb5_data           * scratch = NULL;
--    krb5_boolean          foreign_server = FALSE;
-     krb5_auth_context     auth_context = NULL;
-     krb5_authenticator  * authenticator = NULL;
-     krb5_checksum       * his_cksum = NULL;
-@@ -199,19 +184,6 @@ kdc_process_tgs_req(kdc_realm_t *kdc_active_realm,
-         goto cleanup;
-     }
- 
--    /* If the "server" principal in the ticket is not something
--       in the local realm, then we must refuse to service the request
--       if the client claims to be from the local realm.
--
--       If we don't do this, then some other realm's nasty KDC can
--       claim to be authenticating a client from our realm, and we'll
--       give out tickets concurring with it!
--
--       we set a flag here for checking below.
--    */
--    foreign_server = !is_local_principal(kdc_active_realm,
--                                         apreq->ticket->server);
--
-     if ((retval = krb5_auth_con_init(kdc_context, &auth_context)))
-         goto cleanup;
- 
-@@ -265,15 +237,6 @@ kdc_process_tgs_req(kdc_realm_t *kdc_active_realm,
-         goto cleanup_authenticator;
-     }
- 
--    /* make sure the client is of proper lineage (see above) */
--    if (foreign_server && !has_s4u2self_padata(request->padata) &&
--        is_local_principal(kdc_active_realm, ticket->enc_part2->client)) {
--        /* someone in a foreign realm claiming to be local */
--        krb5_klog_syslog(LOG_INFO, _("PROCESS_TGS: failed lineage check"));
--        retval = KRB5KDC_ERR_POLICY;
--        goto cleanup_authenticator;
--    }
--
-     /*
-      * Check application checksum vs. tgs request
-      *
-@@ -591,12 +554,12 @@ int
- check_anon(kdc_realm_t *kdc_active_realm,
-            krb5_principal client, krb5_principal server)
- {
--    /* If restrict_anon is set, reject requests from anonymous to principals
--     * other than the local TGT. */
-+    /* If restrict_anon is set, reject requests from anonymous clients to
-+     * server principals other than local TGTs. */
-     if (kdc_active_realm->realm_restrict_anon &&
-         krb5_principal_compare_any_realm(kdc_context, client,
-                                          krb5_anonymous_principal()) &&
--        !krb5_principal_compare(kdc_context, server, tgs_server))
-+        !is_local_tgs_principal(server))
-         return -1;
-     return 0;
- }
-@@ -1527,7 +1490,7 @@ kdc_process_s4u2self_req(kdc_realm_t *kdc_active_realm,
-     /*
-      * Do not attempt to lookup principals in foreign realms.
-      */
--    if (is_local_principal(kdc_active_realm, id->user)) {
-+    if (data_eq(server->princ->realm, id->user->realm)) {
-         krb5_db_entry no_server;
-         krb5_pa_data **e_data = NULL;
- 
-@@ -1663,8 +1626,7 @@ kdc_process_s4u2proxy_req(kdc_realm_t *kdc_active_realm, unsigned int flags,
-          */
-         if (isflagset(flags, KRB5_KDB_FLAG_ISSUING_REFERRAL) ||
-             !is_cross_tgs_principal(server->princ) ||
--            !krb5_principal_compare_any_realm(kdc_context, server->princ,
--                                              tgs_server) ||
-+            !data_eq(server->princ->data[1], proxy->princ->realm) ||
-             !krb5_principal_compare(kdc_context, client_princ, server_princ)) {
-             *status = "XREALM_EVIDENCE_TICKET_MISMATCH";
-             return KRB5KDC_ERR_BADOPTION;
-diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
-index 04007a8f5..a6bac4388 100644
---- a/src/kdc/kdc_util.h
-+++ b/src/kdc/kdc_util.h
-@@ -37,10 +37,9 @@
- #include "reqstate.h"
- 
- krb5_error_code check_hot_list (krb5_ticket *);
--krb5_boolean is_local_principal(kdc_realm_t *kdc_active_realm,
--                                krb5_const_principal princ1);
- krb5_boolean krb5_is_tgs_principal (krb5_const_principal);
- krb5_boolean is_cross_tgs_principal(krb5_const_principal);
-+krb5_boolean is_local_tgs_principal(krb5_const_principal);
- krb5_error_code
- add_to_transited (krb5_data *,
-                   krb5_data *,
-diff --git a/src/kdc/tgs_policy.c b/src/kdc/tgs_policy.c
-index 3f4fa8499..a5a00f0cc 100644
---- a/src/kdc/tgs_policy.c
-+++ b/src/kdc/tgs_policy.c
-@@ -252,19 +252,21 @@ check_tgs_s4u2proxy(kdc_realm_t *kdc_active_realm,
- }
- 
- static int
--check_tgs_u2u(kdc_realm_t *kdc_active_realm,
--              krb5_kdc_req *req, const char **status)
-+check_tgs_u2u(kdc_realm_t *kdc_active_realm, krb5_kdc_req *req,
-+              krb5_const_principal server_princ, const char **status)
- {
-+    krb5_const_principal second_server_princ;
-+
-     if (req->kdc_options & KDC_OPT_ENC_TKT_IN_SKEY) {
-         /* Check that second ticket is in request. */
-         if (!req->second_ticket || !req->second_ticket[0]) {
-             *status = "NO_2ND_TKT";
-             return KDC_ERR_BADOPTION;
-         }
--        /* Check that second ticket is a TGT. */
--        if (!krb5_principal_compare(kdc_context,
--                                    req->second_ticket[0]->server,
--                                    tgs_server)) {
-+        /* Check that second ticket is a TGT to the server realm. */
-+        second_server_princ = req->second_ticket[0]->server;
-+        if (!is_local_tgs_principal(second_server_princ) ||
-+            !data_eq(second_server_princ->data[1], server_princ->realm)) {
-             *status = "2ND_TKT_NOT_TGS";
-             return KDC_ERR_POLICY;
-         }
-@@ -353,7 +355,7 @@ validate_tgs_request(kdc_realm_t *kdc_active_realm,
-         return(KRB_AP_ERR_REPEAT);
-     }
- 
--    errcode = check_tgs_u2u(kdc_active_realm, request, status);
-+    errcode = check_tgs_u2u(kdc_active_realm, request, server->princ, status);
-     if (errcode != 0)
-         return errcode;
- 
diff --git a/Omit-KDC-indicator-check-for-S4U2Self-requests.patch b/Omit-KDC-indicator-check-for-S4U2Self-requests.patch
deleted file mode 100644
index d5eacc1..0000000
--- a/Omit-KDC-indicator-check-for-S4U2Self-requests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f0ac5c1efef5401f669dc176e62c09b0b01fa2d0 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Wed, 6 May 2020 16:03:13 -0400
-Subject: [PATCH] Omit KDC indicator check for S4U2Self requests
-
-As there was no initial ticket exchange from the client for an
-S4U2Self request, the auth indicator check is inapplicable (and would
-always fail if any auth indicators are required).
-
-ticket: 8902 (new)
-(cherry picked from commit 183631fbf72351c2d5fc7d60b2d9fc4d09fe7465)
----
- src/kdc/do_tgs_req.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index 241f34e2a..463a9c0dd 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -392,8 +392,8 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt,
-     }
-     authtime = subject_tkt->times.authtime;
- 
--    /* Extract auth indicators from the subject ticket, except for S4U2Self
--     * requests (where the client didn't authenticate). */
-+    /* Extract and check auth indicators from the subject ticket, except for
-+     * S4U2Self requests (where the client didn't authenticate). */
-     if (s4u_x509_user == NULL) {
-         errcode = get_auth_indicators(kdc_context, subject_tkt, local_tgt,
-                                       &local_tgt_key, &auth_indicators);
-@@ -401,12 +401,12 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt,
-             status = "GET_AUTH_INDICATORS";
-             goto cleanup;
-         }
--    }
- 
--    errcode = check_indicators(kdc_context, server, auth_indicators);
--    if (errcode) {
--        status = "HIGHER_AUTHENTICATION_REQUIRED";
--        goto cleanup;
-+        errcode = check_indicators(kdc_context, server, auth_indicators);
-+        if (errcode) {
-+            status = "HIGHER_AUTHENTICATION_REQUIRED";
-+            goto cleanup;
-+        }
-     }
- 
-     if (is_referral)
diff --git a/Omit-PA_FOR_USER-if-we-can-t-compute-its-checksum.patch b/Omit-PA_FOR_USER-if-we-can-t-compute-its-checksum.patch
deleted file mode 100644
index 8e1c248..0000000
--- a/Omit-PA_FOR_USER-if-we-can-t-compute-its-checksum.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5251097c927f476fe83ffe544b73fd2d785aaf2a Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Sat, 6 Jun 2020 11:03:37 +0200
-Subject: [PATCH] Omit PA_FOR_USER if we can't compute its checksum
-
-OpenSSL in FIPS mode will refuse to perform hmac-md5.  Omit the legacy
-PA_FOR_USER element in this case rather than failing out.
-
-[ghudson@mit.edu: minor code and comment edits; wrote commit message]
-
-ticket: 8912 (new)
-(cherry picked from commit 03f122bdb22cfa53c7d855ed929c9541e56365e0)
----
- src/lib/krb5/krb/s4u_creds.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c
-index fc5c886d6..d8f486dc6 100644
---- a/src/lib/krb5/krb/s4u_creds.c
-+++ b/src/lib/krb5/krb/s4u_creds.c
-@@ -534,6 +534,13 @@ krb5_get_self_cred_from_kdc(krb5_context context,
-         if (s4u_user.user_id.user != NULL && s4u_user.user_id.user->length) {
-             code = build_pa_for_user(context, tgtptr, &s4u_user.user_id,
-                                      &in_padata[1]);
-+            /*
-+             * If we couldn't compute the hmac-md5 checksum, send only the
-+             * KRB5_PADATA_S4U_X509_USER; this will still work against modern
-+             * Windows and MIT KDCs.
-+             */
-+            if (code == KRB5_CRYPTO_INTERNAL)
-+                code = 0;
-             if (code != 0) {
-                 krb5_free_pa_data(context, in_padata);
-                 goto cleanup;
diff --git a/Pass-channel-bindings-through-SPNEGO.patch b/Pass-channel-bindings-through-SPNEGO.patch
deleted file mode 100644
index 0e307c3..0000000
--- a/Pass-channel-bindings-through-SPNEGO.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 17d9b74328f247de5f9d820ae008726632d11d2a Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Tue, 28 Apr 2020 18:15:55 +0200
-Subject: [PATCH] Pass channel bindings through SPNEGO
-
-ticket: 8907 (new)
-(cherry picked from commit d16325a24c34ec9a5f6fb4910987f162e0d4d9cd)
----
- src/lib/gssapi/spnego/gssapiP_negoex.h |  8 ++---
- src/lib/gssapi/spnego/negoex_ctx.c     | 34 +++++++++++----------
- src/lib/gssapi/spnego/spnego_mech.c    | 41 +++++++++++++-------------
- 3 files changed, 43 insertions(+), 40 deletions(-)
-
-diff --git a/src/lib/gssapi/spnego/gssapiP_negoex.h b/src/lib/gssapi/spnego/gssapiP_negoex.h
-index 44b08f523..489ab7c42 100644
---- a/src/lib/gssapi/spnego/gssapiP_negoex.h
-+++ b/src/lib/gssapi/spnego/gssapiP_negoex.h
-@@ -201,10 +201,10 @@ negoex_restrict_auth_schemes(spnego_gss_ctx_id_t ctx,
- OM_uint32
- negoex_init(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
-             gss_name_t target_name, OM_uint32 req_flags, OM_uint32 time_req,
--            gss_buffer_t input_token, gss_buffer_t output_token,
--            OM_uint32 *time_rec);
-+            gss_buffer_t input_token, gss_channel_bindings_t bindings,
-+            gss_buffer_t output_token, OM_uint32 *time_rec);
- 
- OM_uint32
- negoex_accept(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
--              gss_buffer_t input_token, gss_buffer_t output_token,
--              OM_uint32 *time_rec);
-+              gss_buffer_t input_token, gss_channel_bindings_t bindings,
-+              gss_buffer_t output_token, OM_uint32 *time_rec);
-diff --git a/src/lib/gssapi/spnego/negoex_ctx.c b/src/lib/gssapi/spnego/negoex_ctx.c
-index 18d9d4147..8848ee4db 100644
---- a/src/lib/gssapi/spnego/negoex_ctx.c
-+++ b/src/lib/gssapi/spnego/negoex_ctx.c
-@@ -276,7 +276,8 @@ static OM_uint32
- mech_init(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
-           gss_name_t target, OM_uint32 req_flags, OM_uint32 time_req,
-           struct negoex_message *messages, size_t nmessages,
--          gss_buffer_t output_token, OM_uint32 *time_rec)
-+          gss_channel_bindings_t bindings, gss_buffer_t output_token,
-+          OM_uint32 *time_rec)
- {
-     OM_uint32 major, first_major = 0, first_minor = 0;
-     struct negoex_auth_mech *mech = NULL;
-@@ -316,10 +317,9 @@ mech_init(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
-         mech = K5_TAILQ_FIRST(&ctx->negoex_mechs);
- 
-         major = gss_init_sec_context(minor, cred, &mech->mech_context, target,
--                                     mech->oid, req_flags, time_req,
--                                     GSS_C_NO_CHANNEL_BINDINGS, input_token,
--                                     &ctx->actual_mech, output_token,
--                                     &ctx->ctx_flags, time_rec);
-+                                     mech->oid, req_flags, time_req, bindings,
-+                                     input_token, &ctx->actual_mech,
-+                                     output_token, &ctx->ctx_flags, time_rec);
- 
-         if (major == GSS_S_COMPLETE)
-             mech->complete = 1;
-@@ -351,7 +351,8 @@ mech_init(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
- static OM_uint32
- mech_accept(OM_uint32 *minor, spnego_gss_ctx_id_t ctx,
-             gss_cred_id_t cred, struct negoex_message *messages,
--            size_t nmessages, gss_buffer_t output_token, OM_uint32 *time_rec)
-+            size_t nmessages, gss_channel_bindings_t bindings,
-+            gss_buffer_t output_token, OM_uint32 *time_rec)
- {
-     OM_uint32 major, tmpmin;
-     struct negoex_auth_mech *mech;
-@@ -395,10 +396,10 @@ mech_accept(OM_uint32 *minor, spnego_gss_ctx_id_t ctx,
-         gss_release_cred(&tmpmin, &ctx->deleg_cred);
- 
-     major = gss_accept_sec_context(minor, &mech->mech_context, cred,
--                                   &msg->token, GSS_C_NO_CHANNEL_BINDINGS,
--                                   &ctx->internal_name, &ctx->actual_mech,
--                                   output_token, &ctx->ctx_flags,
--                                   time_rec, &ctx->deleg_cred);
-+                                   &msg->token, bindings, &ctx->internal_name,
-+                                   &ctx->actual_mech, output_token,
-+                                   &ctx->ctx_flags, time_rec,
-+                                   &ctx->deleg_cred);
- 
-     if (major == GSS_S_COMPLETE)
-         mech->complete = 1;
-@@ -609,8 +610,8 @@ make_output_token(OM_uint32 *minor, spnego_gss_ctx_id_t ctx,
- OM_uint32
- negoex_init(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
-             gss_name_t target_name, OM_uint32 req_flags, OM_uint32 time_req,
--            gss_buffer_t input_token, gss_buffer_t output_token,
--            OM_uint32 *time_rec)
-+            gss_buffer_t input_token, gss_channel_bindings_t bindings,
-+            gss_buffer_t output_token, OM_uint32 *time_rec)
- {
-     OM_uint32 major, tmpmin;
-     gss_buffer_desc mech_output_token = GSS_C_EMPTY_BUFFER;
-@@ -663,7 +664,8 @@ negoex_init(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
-     /* Process the input token and/or produce an output token.  This may prune
-      * the mech list, but on success there will be at least one mech entry. */
-     major = mech_init(minor, ctx, cred, target_name, req_flags, time_req,
--                      messages, nmessages, &mech_output_token, time_rec);
-+                      messages, nmessages, bindings, &mech_output_token,
-+                      time_rec);
-     if (major != GSS_S_COMPLETE)
-         goto cleanup;
-     assert(!K5_TAILQ_EMPTY(&ctx->negoex_mechs));
-@@ -701,8 +703,8 @@ cleanup:
- 
- OM_uint32
- negoex_accept(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
--              gss_buffer_t input_token, gss_buffer_t output_token,
--              OM_uint32 *time_rec)
-+              gss_buffer_t input_token, gss_channel_bindings_t bindings,
-+              gss_buffer_t output_token, OM_uint32 *time_rec)
- {
-     OM_uint32 major, tmpmin;
-     gss_buffer_desc mech_output_token = GSS_C_EMPTY_BUFFER;
-@@ -754,7 +756,7 @@ negoex_accept(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, gss_cred_id_t cred,
-      * prune the list to a single mech.  Continue on error if an output token
-      * is generated, so that we send the token to the initiator.
-      */
--    major = mech_accept(minor, ctx, cred, messages, nmessages,
-+    major = mech_accept(minor, ctx, cred, messages, nmessages, bindings,
-                         &mech_output_token, time_rec);
-     if (major != GSS_S_COMPLETE && mech_output_token.length == 0)
-         goto cleanup;
-diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
-index 594fc5894..4cf011143 100644
---- a/src/lib/gssapi/spnego/spnego_mech.c
-+++ b/src/lib/gssapi/spnego/spnego_mech.c
-@@ -130,6 +130,7 @@ init_ctx_reselect(OM_uint32 *, spnego_gss_ctx_id_t, OM_uint32,
- static OM_uint32
- init_ctx_call_init(OM_uint32 *, spnego_gss_ctx_id_t, spnego_gss_cred_id_t,
- 		   OM_uint32, gss_name_t, OM_uint32, OM_uint32, gss_buffer_t,
-+		   gss_channel_bindings_t,
- 		   gss_buffer_t, OM_uint32 *, send_token_flag *);
- 
- static OM_uint32
-@@ -144,8 +145,8 @@ acc_ctx_vfy_oid(OM_uint32 *, spnego_gss_ctx_id_t, gss_OID,
- 		OM_uint32 *, send_token_flag *);
- static OM_uint32
- acc_ctx_call_acc(OM_uint32 *, spnego_gss_ctx_id_t, spnego_gss_cred_id_t,
--		 gss_buffer_t, gss_buffer_t, OM_uint32 *, OM_uint32 *,
--		 send_token_flag *);
-+		 gss_buffer_t, gss_channel_bindings_t, gss_buffer_t,
-+		 OM_uint32 *, OM_uint32 *, send_token_flag *);
- 
- static gss_OID
- negotiate_mech(spnego_gss_ctx_id_t, gss_OID_set, OM_uint32 *);
-@@ -905,6 +906,7 @@ init_ctx_call_init(OM_uint32 *minor_status,
- 		   OM_uint32 req_flags,
- 		   OM_uint32 time_req,
- 		   gss_buffer_t mechtok_in,
-+		   gss_channel_bindings_t bindings,
- 		   gss_buffer_t mechtok_out,
- 		   OM_uint32 *time_rec,
- 		   send_token_flag *send_token)
-@@ -921,15 +923,14 @@ init_ctx_call_init(OM_uint32 *minor_status,
- 	if (gss_oid_equal(sc->internal_mech, &negoex_mech)) {
- 		ret = negoex_init(minor_status, sc, mcred, target_name,
- 				  mech_req_flags, time_req, mechtok_in,
--				  mechtok_out, time_rec);
-+				  bindings, mechtok_out, time_rec);
- 	} else {
- 		ret = gss_init_sec_context(minor_status, mcred,
- 					   &sc->ctx_handle, target_name,
- 					   sc->internal_mech, mech_req_flags,
--					   time_req, GSS_C_NO_CHANNEL_BINDINGS,
--					   mechtok_in, &sc->actual_mech,
--					   mechtok_out, &sc->ctx_flags,
--					   time_rec);
-+					   time_req, bindings, mechtok_in,
-+					   &sc->actual_mech, mechtok_out,
-+					   &sc->ctx_flags, time_rec);
- 	}
- 
- 	/* Bail out if the acceptor gave us an error token but the mech didn't
-@@ -981,8 +982,8 @@ init_ctx_call_init(OM_uint32 *minor_status,
- 	gss_delete_sec_context(&tmpmin, &sc->ctx_handle, GSS_C_NO_BUFFER);
- 	tmpret = init_ctx_call_init(&tmpmin, sc, spcred, acc_negState,
- 				    target_name, req_flags, time_req,
--				    mechtok_in, mechtok_out, time_rec,
--				    send_token);
-+				    mechtok_in, bindings, mechtok_out,
-+				    time_rec, send_token);
- 	if (HARD_ERROR(tmpret))
- 		goto fail;
- 	*minor_status = tmpmin;
-@@ -1004,7 +1005,7 @@ spnego_gss_init_sec_context(
- 			gss_OID mech_type,
- 			OM_uint32 req_flags,
- 			OM_uint32 time_req,
--			gss_channel_bindings_t input_chan_bindings,
-+			gss_channel_bindings_t bindings,
- 			gss_buffer_t input_token,
- 			gss_OID *actual_mech,
- 			gss_buffer_t output_token,
-@@ -1084,8 +1085,8 @@ spnego_gss_init_sec_context(
- 	if (!spnego_ctx->mech_complete) {
- 		ret = init_ctx_call_init(minor_status, spnego_ctx, spcred,
- 					 acc_negState, target_name, req_flags,
--					 time_req, mechtok_in, &mechtok_out,
--					 time_rec, &send_token);
-+					 time_req, mechtok_in, bindings,
-+					 &mechtok_out, time_rec, &send_token);
- 		if (ret != GSS_S_COMPLETE)
- 			goto cleanup;
- 
-@@ -1542,8 +1543,9 @@ cleanup:
- static OM_uint32
- acc_ctx_call_acc(OM_uint32 *minor_status, spnego_gss_ctx_id_t sc,
- 		 spnego_gss_cred_id_t spcred, gss_buffer_t mechtok_in,
--		 gss_buffer_t mechtok_out, OM_uint32 *time_rec,
--		 OM_uint32 *negState, send_token_flag *tokflag)
-+		 gss_channel_bindings_t bindings, gss_buffer_t mechtok_out,
-+		 OM_uint32 *time_rec, OM_uint32 *negState,
-+		 send_token_flag *tokflag)
- {
- 	OM_uint32 ret, tmpmin;
- 	gss_OID_desc mechoid;
-@@ -1568,13 +1570,12 @@ acc_ctx_call_acc(OM_uint32 *minor_status, spnego_gss_ctx_id_t sc,
- 	mcred = (spcred == NULL) ? GSS_C_NO_CREDENTIAL : spcred->mcred;
- 	if (negoex) {
- 		ret = negoex_accept(minor_status, sc, mcred, mechtok_in,
--				    mechtok_out, time_rec);
-+				    bindings, mechtok_out, time_rec);
- 	} else {
- 		(void) gss_release_name(&tmpmin, &sc->internal_name);
- 		(void) gss_release_cred(&tmpmin, &sc->deleg_cred);
- 		ret = gss_accept_sec_context(minor_status, &sc->ctx_handle,
--					     mcred, mechtok_in,
--					     GSS_C_NO_CHANNEL_BINDINGS,
-+					     mcred, mechtok_in, bindings,
- 					     &sc->internal_name,
- 					     &sc->actual_mech, mechtok_out,
- 					     &sc->ctx_flags, time_rec,
-@@ -1620,7 +1621,7 @@ spnego_gss_accept_sec_context(
- 			    gss_ctx_id_t *context_handle,
- 			    gss_cred_id_t verifier_cred_handle,
- 			    gss_buffer_t input_token,
--			    gss_channel_bindings_t input_chan_bindings,
-+			    gss_channel_bindings_t bindings,
- 			    gss_name_t *src_name,
- 			    gss_OID *mech_type,
- 			    gss_buffer_t output_token,
-@@ -1734,8 +1735,8 @@ spnego_gss_accept_sec_context(
- 	 */
- 	if (negState != REQUEST_MIC && mechtok_in != GSS_C_NO_BUFFER) {
- 		ret = acc_ctx_call_acc(minor_status, sc, spcred, mechtok_in,
--				       &mechtok_out, time_rec, &negState,
--				       &return_token);
-+				       bindings, &mechtok_out, time_rec,
-+				       &negState, &return_token);
- 	}
- 
- 	/* Step 3: process or generate the MIC, if the negotiated mech is
diff --git a/Pass-gss_localname-through-SPNEGO.patch b/Pass-gss_localname-through-SPNEGO.patch
deleted file mode 100644
index e641a91..0000000
--- a/Pass-gss_localname-through-SPNEGO.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cec820485e8b854fe3ee42d0a67a77e7ad20595e Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Sun, 26 Apr 2020 19:55:54 -0400
-Subject: [PATCH] Pass gss_localname() through SPNEGO
-
-ticket: 8897 (new)
-(cherry picked from commit f7b8a6432bd289bdc528017be122305f95b8e285)
----
- src/lib/gssapi/spnego/gssapiP_spnego.h | 8 ++++++++
- src/lib/gssapi/spnego/spnego_mech.c    | 9 ++++++++-
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h
-index a93763314..066ec736f 100644
---- a/src/lib/gssapi/spnego/gssapiP_spnego.h
-+++ b/src/lib/gssapi/spnego/gssapiP_spnego.h
-@@ -357,6 +357,14 @@ OM_uint32 KRB5_CALLCONV spnego_gss_wrap_size_limit
- 	OM_uint32	*max_input_size
- );
- 
-+OM_uint32 KRB5_CALLCONV spnego_gss_localname
-+(
-+	OM_uint32 *minor_status,
-+	const gss_name_t pname,
-+	const gss_const_OID mech_type,
-+	gss_buffer_t localname
-+);
-+
- OM_uint32 KRB5_CALLCONV spnego_gss_get_mic
- (
- 	OM_uint32 *minor_status,
-diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
-index ec0bae6a4..594fc5894 100644
---- a/src/lib/gssapi/spnego/spnego_mech.c
-+++ b/src/lib/gssapi/spnego/spnego_mech.c
-@@ -237,7 +237,7 @@ static struct gss_config spnego_mechanism =
- 	spnego_gss_inquire_context,	/* gss_inquire_context */
- 	NULL,				/* gss_internal_release_oid */
- 	spnego_gss_wrap_size_limit,	/* gss_wrap_size_limit */
--	NULL,				/* gssd_pname_to_uid */
-+	spnego_gss_localname,
- 	NULL,				/* gss_userok */
- 	NULL,				/* gss_export_name */
- 	spnego_gss_duplicate_name,	/* gss_duplicate_name */
-@@ -2371,6 +2371,13 @@ spnego_gss_wrap_size_limit(
- 	return (ret);
- }
- 
-+OM_uint32 KRB5_CALLCONV
-+spnego_gss_localname(OM_uint32 *minor_status, const gss_name_t pname,
-+		     const gss_const_OID mech_type, gss_buffer_t localname)
-+{
-+	return gss_localname(minor_status, pname, GSS_C_NO_OID, localname);
-+}
-+
- OM_uint32 KRB5_CALLCONV
- spnego_gss_get_mic(
- 		OM_uint32 *minor_status,
diff --git a/Refactor-KDC-authdata-list-management-helpers.patch b/Refactor-KDC-authdata-list-management-helpers.patch
deleted file mode 100644
index 00aed49..0000000
--- a/Refactor-KDC-authdata-list-management-helpers.patch
+++ /dev/null
@@ -1,335 +0,0 @@
-From 9335481c00cd15170adec244ccff0a00a014bbab Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Wed, 5 Feb 2020 18:46:11 -0500
-Subject: [PATCH] Refactor KDC authdata list management helpers
-
-Remove the unused concat_authorization_data().  Split merge_authdata()
-into two helpers, one to destructively merge without filtering and one
-to add copied elements while filtering out KDC-only authdata types.
-Remove context parameters where they aren't needed (taking advantage
-of knowledge that some libkrb5 functions don't use their context
-parameters).
-
-(cherry picked from commit b2190fdc253de6024001e0f1ff9fe56c31042bb7)
----
- src/kdc/kdc_authdata.c | 138 +++++++++++++++++++----------------------
- src/kdc/kdc_util.c     |  50 ---------------
- src/kdc/kdc_util.h     |   5 --
- 3 files changed, 64 insertions(+), 129 deletions(-)
-
-diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c
-index 1ebe87246..010922c27 100644
---- a/src/kdc/kdc_authdata.c
-+++ b/src/kdc/kdc_authdata.c
-@@ -108,7 +108,7 @@ unload_authdata_plugins(krb5_context context)
- /* Return true if authdata should be filtered when copying from untrusted
-  * authdata.  If desired_type is non-zero, look only for that type. */
- static krb5_boolean
--is_kdc_issued_authdatum(krb5_context context, krb5_authdata *authdata,
-+is_kdc_issued_authdatum(krb5_authdata *authdata,
-                         krb5_authdatatype desired_type)
- {
-     krb5_boolean result = FALSE;
-@@ -117,7 +117,7 @@ is_kdc_issued_authdatum(krb5_context context, krb5_authdata *authdata,
-     krb5_authdatatype *ad_types, *containee_types = NULL;
- 
-     if (authdata->ad_type == KRB5_AUTHDATA_IF_RELEVANT) {
--        if (krb5int_get_authdata_containee_types(context, authdata, &count,
-+        if (krb5int_get_authdata_containee_types(NULL, authdata, &count,
-                                                  &containee_types) != 0)
-             goto cleanup;
-         ad_types = containee_types;
-@@ -152,7 +152,7 @@ cleanup:
- /* Return true if authdata contains any elements which should only come from
-  * the KDC.  If desired_type is non-zero, look only for that type. */
- static krb5_boolean
--has_kdc_issued_authdata(krb5_context context, krb5_authdata **authdata,
-+has_kdc_issued_authdata(krb5_authdata **authdata,
-                         krb5_authdatatype desired_type)
- {
-     int i;
-@@ -160,7 +160,7 @@ has_kdc_issued_authdata(krb5_context context, krb5_authdata **authdata,
-     if (authdata == NULL)
-         return FALSE;
-     for (i = 0; authdata[i] != NULL; i++) {
--        if (is_kdc_issued_authdatum(context, authdata[i], desired_type))
-+        if (is_kdc_issued_authdatum(authdata[i], desired_type))
-             return TRUE;
-     }
-     return FALSE;
-@@ -181,66 +181,71 @@ has_mandatory_for_kdc_authdata(krb5_context context, krb5_authdata **authdata)
-     return FALSE;
- }
- 
--/*
-- * Add the elements of in_authdata to out_authdata.  If copy is false,
-- * in_authdata is invalid on successful return.  If ignore_kdc_issued is true,
-- * KDC-issued authdata is not copied.
-- */
-+/* Add elements from *new_elements to *existing_list, reallocating as
-+ * necessary.  On success, release *new_elements and set it to NULL. */
- static krb5_error_code
--merge_authdata(krb5_context context, krb5_authdata **in_authdata,
--               krb5_authdata ***out_authdata, krb5_boolean copy,
--               krb5_boolean ignore_kdc_issued)
-+merge_authdata(krb5_authdata ***existing_list, krb5_authdata ***new_elements)
- {
--    krb5_error_code ret;
--    size_t i, j, nadata = 0;
--    krb5_authdata **in_copy = NULL, **authdata = *out_authdata;
-+    size_t count = 0, ncount = 0;
-+    krb5_authdata **list = *existing_list, **nlist = *new_elements;
- 
--    if (in_authdata == NULL || in_authdata[0] == NULL)
-+    if (nlist == NULL)
-         return 0;
- 
--    if (authdata != NULL) {
--        for (nadata = 0; authdata[nadata] != NULL; nadata++)
--            ;
--    }
-+    for (count = 0; list != NULL && list[count] != NULL; count++);
-+    for (ncount = 0; nlist[ncount] != NULL; ncount++);
- 
--    for (i = 0; in_authdata[i] != NULL; i++)
--        ;
--
--    if (copy) {
--        ret = krb5_copy_authdata(context, in_authdata, &in_copy);
--        if (ret)
--            return ret;
--        in_authdata = in_copy;
--    }
--
--    authdata = realloc(authdata, (nadata + i + 1) * sizeof(krb5_authdata *));
--    if (authdata == NULL) {
--        krb5_free_authdata(context, in_copy);
-+    list = realloc(list, (count + ncount + 1) * sizeof(*list));
-+    if (list == NULL)
-         return ENOMEM;
-+
-+    memcpy(list + count, nlist, ncount * sizeof(*nlist));
-+    list[count + ncount] = NULL;
-+    free(nlist);
-+
-+    if (list[0] == NULL) {
-+        free(list);
-+        list = NULL;
-     }
- 
--    for (i = 0, j = 0; in_authdata[i] != NULL; i++) {
--        if (ignore_kdc_issued &&
--            is_kdc_issued_authdatum(context, in_authdata[i], 0)) {
--            free(in_authdata[i]->contents);
--            free(in_authdata[i]);
-+    *new_elements = NULL;
-+    *existing_list = list;
-+    return 0;
-+}
-+
-+/* Add a copy of new_elements to *existing_list, omitting KDC-issued
-+ * authdata. */
-+static krb5_error_code
-+add_filtered_authdata(krb5_authdata ***existing_list,
-+                      krb5_authdata **new_elements)
-+{
-+    krb5_error_code ret;
-+    krb5_authdata **copy;
-+    size_t i, j;
-+
-+    if (new_elements == NULL)
-+        return 0;
-+
-+    ret = krb5_copy_authdata(NULL, new_elements, &copy);
-+    if (ret)
-+        return ret;
-+
-+    /* Remove KDC-issued elements from copy. */
-+    j = 0;
-+    for (i = 0; copy[i] != NULL; i++) {
-+        if (is_kdc_issued_authdatum(copy[i], 0)) {
-+            free(copy[i]->contents);
-+            free(copy[i]);
-         } else {
--            authdata[nadata + j++] = in_authdata[i];
-+            copy[j++] = copy[i];
-         }
-     }
-+    copy[j] = NULL;
- 
--    authdata[nadata + j] = NULL;
--
--    free(in_authdata);
--
--    if (authdata[0] == NULL) {
--        free(authdata);
--        authdata = NULL;
--    }
--
--    *out_authdata = authdata;
--
--    return 0;
-+    /* Destructively merge the filtered copy into existing_list. */
-+    ret = merge_authdata(existing_list, &copy);
-+    krb5_free_authdata(NULL, copy);
-+    return ret;
- }
- 
- /* Copy TGS-REQ authorization data into the ticket authdata. */
-@@ -289,10 +294,7 @@ copy_request_authdata(krb5_context context, krb5_keyblock *client_key,
-         goto cleanup;
-     }
- 
--    /* Add a copy of the requested authdata to the ticket, ignoring KDC-issued
--     * types. */
--    ret = merge_authdata(context, req->unenc_authdata, tkt_authdata, TRUE,
--                         TRUE);
-+    ret = add_filtered_authdata(tkt_authdata, req->unenc_authdata);
- 
- cleanup:
-     free(plaintext.data);
-@@ -307,9 +309,7 @@ copy_tgt_authdata(krb5_context context, krb5_kdc_req *request,
-     if (has_mandatory_for_kdc_authdata(context, tgt_authdata))
-         return KRB5KDC_ERR_POLICY;
- 
--    /* Add a copy of the TGT authdata to the ticket, ignoring KDC-issued
--     * types. */
--    return merge_authdata(context, tgt_authdata, tkt_authdata, TRUE, TRUE);
-+    return add_filtered_authdata(tkt_authdata, tgt_authdata);
- }
- 
- /* Fetch authorization data from KDB module. */
-@@ -374,8 +374,7 @@ fetch_kdb_authdata(krb5_context context, unsigned int flags,
- 
-     /* Put the KDB authdata first in the ticket.  A successful merge places the
-      * combined list in db_authdata and releases the old ticket authdata. */
--    ret = merge_authdata(context, enc_tkt_reply->authorization_data,
--                         &db_authdata, FALSE, FALSE);
-+    ret = merge_authdata(&db_authdata, &enc_tkt_reply->authorization_data);
-     if (ret)
-         krb5_free_authdata(context, db_authdata);
-     else
-@@ -404,8 +403,7 @@ make_signedpath_data(krb5_context context, krb5_const_principal client,
-             return ret;
- 
-         for (i = 0, j = 0; authdata[i] != NULL; i++) {
--            if (is_kdc_issued_authdatum(context, authdata[i],
--                                        KRB5_AUTHDATA_SIGNTICKET))
-+            if (is_kdc_issued_authdatum(authdata[i], KRB5_AUTHDATA_SIGNTICKET))
-                 continue;
- 
-             sign_authdata[j++] = authdata[i];
-@@ -635,12 +633,8 @@ make_signedpath(krb5_context context, krb5_const_principal for_user_princ,
-     if (ret)
-         goto cleanup;
- 
--    /* Add the authdata to the ticket, without copying or filtering. */
--    ret = merge_authdata(context, if_relevant,
--                         &enc_tkt_reply->authorization_data, FALSE, FALSE);
--    if (ret)
--        goto cleanup;
--    if_relevant = NULL;         /* merge_authdata() freed */
-+    /* Add the signedpath authdata to the ticket. */
-+    ret = merge_authdata(&enc_tkt_reply->authorization_data, &if_relevant);
- 
- cleanup:
-     free(sp.delegated);
-@@ -665,7 +659,7 @@ free_deleg_path(krb5_context context, krb5_principal *deleg_path)
- static krb5_boolean
- has_pac(krb5_context context, krb5_authdata **authdata)
- {
--    return has_kdc_issued_authdata(context, authdata, KRB5_AUTHDATA_WIN2K_PAC);
-+    return has_kdc_issued_authdata(authdata, KRB5_AUTHDATA_WIN2K_PAC);
- }
- 
- /* Verify AD-SIGNTICKET authdata if we need to, and insert an AD-SIGNEDPATH
-@@ -746,11 +740,7 @@ add_auth_indicators(krb5_context context, krb5_data *const *auth_indicators,
-         goto cleanup;
- 
-     /* Add the wrapped authdata to the ticket, without copying or filtering. */
--    ret = merge_authdata(context, cammac, &enc_tkt_reply->authorization_data,
--                         FALSE, FALSE);
--    if (ret)
--        goto cleanup;
--    cammac = NULL;              /* merge_authdata() freed */
-+    ret = merge_authdata(&enc_tkt_reply->authorization_data, &cammac);
- 
- cleanup:
-     krb5_free_data(context, der_indicators);
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index 6330387d0..a4a05b9fa 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -78,56 +78,6 @@ static krb5_error_code find_server_key(krb5_context,
-                                        krb5_kvno, krb5_keyblock **,
-                                        krb5_kvno *);
- 
--/*
-- * concatenate first two authdata arrays, returning an allocated replacement.
-- * The replacement should be freed with krb5_free_authdata().
-- */
--krb5_error_code
--concat_authorization_data(krb5_context context,
--                          krb5_authdata **first, krb5_authdata **second,
--                          krb5_authdata ***output)
--{
--    int i, j;
--    krb5_authdata **ptr, **retdata;
--
--    /* count up the entries */
--    i = 0;
--    if (first)
--        for (ptr = first; *ptr; ptr++)
--            i++;
--    if (second)
--        for (ptr = second; *ptr; ptr++)
--            i++;
--
--    retdata = (krb5_authdata **)malloc((i+1)*sizeof(*retdata));
--    if (!retdata)
--        return ENOMEM;
--    retdata[i] = 0;                     /* null-terminated array */
--    for (i = 0, j = 0, ptr = first; j < 2 ; ptr = second, j++)
--        while (ptr && *ptr) {
--            /* now walk & copy */
--            retdata[i] = (krb5_authdata *)malloc(sizeof(*retdata[i]));
--            if (!retdata[i]) {
--                krb5_free_authdata(context, retdata);
--                return ENOMEM;
--            }
--            *retdata[i] = **ptr;
--            if (!(retdata[i]->contents =
--                  (krb5_octet *)malloc(retdata[i]->length))) {
--                free(retdata[i]);
--                retdata[i] = 0;
--                krb5_free_authdata(context, retdata);
--                return ENOMEM;
--            }
--            memcpy(retdata[i]->contents, (*ptr)->contents, retdata[i]->length);
--
--            ptr++;
--            i++;
--        }
--    *output = retdata;
--    return 0;
--}
--
- krb5_boolean
- is_local_principal(kdc_realm_t *kdc_active_realm, krb5_const_principal princ1)
- {
-diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
-index 2c9d8cf69..42b7ee208 100644
---- a/src/kdc/kdc_util.h
-+++ b/src/kdc/kdc_util.h
-@@ -52,11 +52,6 @@ compress_transited (krb5_data *,
-                     krb5_principal,
-                     krb5_data *);
- krb5_error_code
--concat_authorization_data (krb5_context,
--                           krb5_authdata **,
--                           krb5_authdata **,
--                           krb5_authdata ***);
--krb5_error_code
- fetch_last_req_info (krb5_db_entry *, krb5_last_req_entry ***);
- 
- krb5_error_code
diff --git a/Refactor-krb5-GSS-checksum-handling.patch b/Refactor-krb5-GSS-checksum-handling.patch
deleted file mode 100644
index c80426b..0000000
--- a/Refactor-krb5-GSS-checksum-handling.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-From c90cef2ebfbefc595798dd5dbb805575e1be0fbf Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Fri, 30 Jun 2017 16:03:01 -0400
-Subject: [PATCH] Refactor krb5 GSS checksum handling
-
-Separate out checksum handling from kg_accept_krb5() into a new helper
-process_checksum().
-
-[ghudson@mit.edu: simplified checksum processing and made it use
-k5-input.h instead of TREAD_ macros; moved more flag handling into
-helper]
-
-[iboukris: adjusted helper function arguments, allowing access to the
-full authenticator for subsequent changes]
-
-(cherry picked from commit 64d56233f9816a2a93f6e8d3030c8ed6ce397735)
-[rharwood@redhat.com: problem with typo fix commit, I think]
----
- src/lib/gssapi/krb5/accept_sec_context.c | 383 +++++++++++------------
- 1 file changed, 179 insertions(+), 204 deletions(-)
-
-diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
-index c5bddb1e8..70dd7fc0c 100644
---- a/src/lib/gssapi/krb5/accept_sec_context.c
-+++ b/src/lib/gssapi/krb5/accept_sec_context.c
-@@ -98,6 +98,7 @@
-  */
- 
- #include "k5-int.h"
-+#include "k5-input.h"
- #include "gssapiP_krb5.h"
- #ifdef HAVE_MEMORY_H
- #include <memory.h>
-@@ -413,6 +414,174 @@ kg_process_extension(krb5_context context,
-     return code;
- }
- 
-+/* The length of the MD5 channel bindings in an 0x8003 checksum */
-+#define CB_MD5_LEN 16
-+
-+/* The minimum length of an 0x8003 checksum value (4-byte channel bindings
-+ * length, 16-byte channel bindings, 4-byte flags) */
-+#define MIN_8003_LEN (4 + CB_MD5_LEN + 4)
-+
-+/* The flags we accept from the initiator's authenticator checksum. */
-+#define INITIATOR_FLAGS (GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG |           \
-+                         GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG |        \
-+                         GSS_C_SEQUENCE_FLAG | GSS_C_DCE_STYLE |        \
-+                         GSS_C_IDENTIFY_FLAG | GSS_C_EXTENDED_ERROR_FLAG)
-+
-+/*
-+ * The krb5 GSS mech appropriates the authenticator checksum field from RFC
-+ * 4120 to store structured data instead of a checksum, indicated with checksum
-+ * type 0x8003 (see RFC 4121 section 4.1.1).  Some implementations instead send
-+ * no checksum, or a regular checksum over empty data.
-+ *
-+ * Interpret the checksum.  Read delegated creds into *deleg_out if it is not
-+ * NULL.  Set *flags_out to the allowed subset of token flags, plus
-+ * GSS_C_DELEG_FLAG if a delegated credential was present.  Process any
-+ * extensions found using exts.  On error, set *code_out to a krb5_error code
-+ * for use as a minor status value.
-+ */
-+static OM_uint32
-+process_checksum(OM_uint32 *minor_status, krb5_context context,
-+                 gss_channel_bindings_t acceptor_cb,
-+                 krb5_auth_context auth_context, krb5_flags ap_req_options,
-+                 krb5_authenticator *authenticator, krb5_gss_ctx_ext_t exts,
-+                 krb5_gss_cred_id_t *deleg_out, krb5_ui_4 *flags_out,
-+                 krb5_error_code *code_out)
-+{
-+    krb5_error_code code = 0;
-+    OM_uint32 status, option_id, token_flags;
-+    size_t cb_len, option_len;
-+    krb5_boolean valid;
-+    krb5_key subkey;
-+    krb5_data option, empty = empty_data();
-+    krb5_checksum cb_cksum;
-+    const uint8_t *token_cb, *option_bytes;
-+    struct k5input in;
-+    const krb5_checksum *cksum = authenticator->checksum;
-+
-+    cb_cksum.contents = NULL;
-+
-+    if (cksum == NULL) {
-+        /*
-+         * Some SMB client implementations use handcrafted GSSAPI code that
-+         * does not provide a checksum.  MS-KILE documents that the Microsoft
-+         * implementation considers a missing checksum acceptable; the server
-+         * assumes all flags are unset in this case, and does not check channel
-+         * bindings.
-+         */
-+        *flags_out = 0;
-+    } else if (cksum->checksum_type != CKSUMTYPE_KG_CB) {
-+        /* Samba sends a regular checksum. */
-+        code = krb5_auth_con_getkey_k(context, auth_context, &subkey);
-+        if (code) {
-+            status = GSS_S_FAILURE;
-+            goto fail;
-+        }
-+
-+        /* Verifying the checksum ensures that this authenticator wasn't
-+         * replayed from one with a checksum over actual data. */
-+        code = krb5_k_verify_checksum(context, subkey,
-+                                      KRB5_KEYUSAGE_AP_REQ_AUTH_CKSUM, &empty,
-+                                      cksum, &valid);
-+        krb5_k_free_key(context, subkey);
-+        if (code || !valid) {
-+            status = GSS_S_BAD_SIG;
-+            goto fail;
-+        }
-+
-+        /* Use ap_options from the request to guess the mutual flag. */
-+        *flags_out = GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG;
-+        if (ap_req_options & AP_OPTS_MUTUAL_REQUIRED)
-+            *flags_out |= GSS_C_MUTUAL_FLAG;
-+    } else {
-+        /* The checksum must contain at least a fixed 24-byte part. */
-+        if (cksum->length < MIN_8003_LEN) {
-+            status = GSS_S_BAD_BINDINGS;
-+            goto fail;
-+        }
-+
-+        k5_input_init(&in, cksum->contents, cksum->length);
-+        cb_len = k5_input_get_uint32_le(&in);
-+        if (cb_len != CB_MD5_LEN) {
-+            code = KG_BAD_LENGTH;
-+            status = GSS_S_FAILURE;
-+            goto fail;
-+        }
-+
-+        token_cb = k5_input_get_bytes(&in, cb_len);
-+        if (acceptor_cb != GSS_C_NO_CHANNEL_BINDINGS) {
-+            code = kg_checksum_channel_bindings(context, acceptor_cb,
-+                                                &cb_cksum);
-+            if (code) {
-+                status = GSS_S_BAD_BINDINGS;
-+                goto fail;
-+            }
-+            assert(cb_cksum.length == cb_len);
-+            if (k5_bcmp(token_cb, cb_cksum.contents, cb_len) != 0) {
-+                status = GSS_S_BAD_BINDINGS;
-+                goto fail;
-+            }
-+        }
-+
-+        /* Read the token flags and accept some of them as context flags. */
-+        token_flags = k5_input_get_uint32_le(&in);
-+        *flags_out = token_flags & INITIATOR_FLAGS;
-+
-+        /* Read the delegated credential if present. */
-+        if (in.len >= 4 && (token_flags & GSS_C_DELEG_FLAG)) {
-+            option_id = k5_input_get_uint16_le(&in);
-+            option_len = k5_input_get_uint16_le(&in);
-+            option_bytes = k5_input_get_bytes(&in, option_len);
-+            option = make_data((uint8_t *)option_bytes, option_len);
-+            if (in.status) {
-+                code = KG_BAD_LENGTH;
-+                status = GSS_S_FAILURE;
-+                goto fail;
-+            }
-+            if (option_id != KRB5_GSS_FOR_CREDS_OPTION) {
-+                status = GSS_S_FAILURE;
-+                goto fail;
-+            }
-+
-+            /* Store the delegated credential. */
-+            code = rd_and_store_for_creds(context, auth_context, &option,
-+                                          deleg_out);
-+            if (code) {
-+                status = GSS_S_FAILURE;
-+                goto fail;
-+            }
-+            *flags_out |= GSS_C_DELEG_FLAG;
-+        }
-+
-+        /* Process any extensions at the end of the checksum.  Extensions use
-+         * 4-byte big-endian tag and length instead of 2-byte little-endian. */
-+        while (in.len > 0) {
-+            option_id = k5_input_get_uint32_be(&in);
-+            option_len = k5_input_get_uint32_be(&in);
-+            option_bytes = k5_input_get_bytes(&in, option_len);
-+            option = make_data((uint8_t *)option_bytes, option_len);
-+            if (in.status) {
-+                code = KG_BAD_LENGTH;
-+                status = GSS_S_FAILURE;
-+                goto fail;
-+            }
-+
-+            code = kg_process_extension(context, auth_context, option_id,
-+                                        &option, exts);
-+            if (code) {
-+                status = GSS_S_FAILURE;
-+                goto fail;
-+            }
-+        }
-+    }
-+
-+    status = GSS_S_COMPLETE;
-+
-+fail:
-+    free(cb_cksum.contents);
-+    *code_out = code;
-+    return status;
-+}
-+
- static OM_uint32
- kg_accept_krb5(minor_status, context_handle,
-                verifier_cred_handle, input_token,
-@@ -433,17 +602,13 @@ kg_accept_krb5(minor_status, context_handle,
-     krb5_gss_ctx_ext_t exts;
- {
-     krb5_context context;
--    unsigned char *ptr, *ptr2;
-+    unsigned char *ptr;
-     char *sptr;
--    OM_uint32 tmp;
--    size_t md5len;
-     krb5_gss_cred_id_t cred = 0;
-     krb5_data ap_rep, ap_req;
--    unsigned int i;
-     krb5_error_code code;
-     krb5_address addr, *paddr;
-     krb5_authenticator *authdat = 0;
--    krb5_checksum reqcksum;
-     krb5_gss_name_t name = NULL;
-     krb5_ui_4 gss_flags = 0;
-     krb5_gss_ctx_id_rec *ctx = NULL;
-@@ -451,8 +616,6 @@ kg_accept_krb5(minor_status, context_handle,
-     gss_buffer_desc token;
-     krb5_auth_context auth_context = NULL;
-     krb5_ticket * ticket = NULL;
--    int option_id;
--    krb5_data option;
-     const gss_OID_desc *mech_used = NULL;
-     OM_uint32 major_status = GSS_S_FAILURE;
-     OM_uint32 tmp_minor_status;
-@@ -463,7 +626,6 @@ kg_accept_krb5(minor_status, context_handle,
-     krb5int_access kaccess;
-     int cred_rcache = 0;
-     int no_encap = 0;
--    int token_deleg_flag = 0;
-     krb5_flags ap_req_options = 0;
-     krb5_enctype negotiated_etype;
-     krb5_authdata_context ad_context = NULL;
-@@ -489,7 +651,6 @@ kg_accept_krb5(minor_status, context_handle,
-     output_token->length = 0;
-     output_token->value = NULL;
-     token.value = 0;
--    reqcksum.contents = 0;
-     ap_req.data = 0;
-     ap_rep.data = 0;
- 
-@@ -654,195 +815,16 @@ kg_accept_krb5(minor_status, context_handle,
- 
-     krb5_auth_con_getauthenticator(context, auth_context, &authdat);
- 
--    if (authdat->checksum == NULL) {
--        /*
--         * Some SMB client implementations use handcrafted GSSAPI code that
--         * does not provide a checksum.  MS-KILE documents that the Microsoft
--         * implementation considers a missing checksum acceptable; the server
--         * assumes all flags are unset in this case, and does not check channel
--         * bindings.
--         */
--        gss_flags = 0;
--    } else if (authdat->checksum->checksum_type != CKSUMTYPE_KG_CB) {
--        /* Samba does not send 0x8003 GSS-API checksums */
--        krb5_boolean valid;
--        krb5_key subkey;
--        krb5_data zero;
-+    major_status = process_checksum(minor_status, context, input_chan_bindings,
-+                                    auth_context, ap_req_options,
-+                                    authdat, exts,
-+                                    delegated_cred_handle ? &deleg_cred : NULL,
-+                                    &gss_flags, &code);
- 
--        code = krb5_auth_con_getkey_k(context, auth_context, &subkey);
--        if (code) {
--            major_status = GSS_S_FAILURE;
--            goto fail;
--        }
-+    if (major_status != GSS_S_COMPLETE)
-+        goto fail;
- 
--        zero.length = 0;
--        zero.data = "";
--
--        code = krb5_k_verify_checksum(context,
--                                      subkey,
--                                      KRB5_KEYUSAGE_AP_REQ_AUTH_CKSUM,
--                                      &zero,
--                                      authdat->checksum,
--                                      &valid);
--        krb5_k_free_key(context, subkey);
--        if (code || !valid) {
--            major_status = GSS_S_BAD_SIG;
--            goto fail;
--        }
--
--        /* Use ap_options from the request to guess the mutual flag. */
--        gss_flags = GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG;
--        if (ap_req_options & AP_OPTS_MUTUAL_REQUIRED)
--            gss_flags |= GSS_C_MUTUAL_FLAG;
--    } else {
--        /* gss krb5 v1 */
--
--        /* stash this now, for later. */
--        code = krb5_c_checksum_length(context, CKSUMTYPE_RSA_MD5, &md5len);
--        if (code) {
--            major_status = GSS_S_FAILURE;
--            goto fail;
--        }
--
--        /* verify that the checksum is correct */
--
--        /*
--          The checksum may be either exactly 24 bytes, in which case
--          no options are specified, or greater than 24 bytes, in which case
--          one or more options are specified. Currently, the only valid
--          option is KRB5_GSS_FOR_CREDS_OPTION ( = 1 ).
--        */
--
--        if ((authdat->checksum->checksum_type != CKSUMTYPE_KG_CB) ||
--            (authdat->checksum->length < 24)) {
--            code = 0;
--            major_status = GSS_S_BAD_BINDINGS;
--            goto fail;
--        }
--
--        ptr = (unsigned char *) authdat->checksum->contents;
--
--        TREAD_INT(ptr, tmp, 0);
--
--        if (tmp != md5len) {
--            code = KG_BAD_LENGTH;
--            major_status = GSS_S_FAILURE;
--            goto fail;
--        }
--
--        /*
--          The following section of code attempts to implement the
--          optional channel binding facility as described in RFC2743.
--
--          Since this facility is optional channel binding may or may
--          not have been provided by either the client or the server.
--
--          If the server has specified input_chan_bindings equal to
--          GSS_C_NO_CHANNEL_BINDINGS then we skip the check.  If
--          the server does provide channel bindings then we compute
--          a checksum and compare against those provided by the
--          client.         */
--
--        if ((code = kg_checksum_channel_bindings(context,
--                                                 input_chan_bindings,
--                                                 &reqcksum))) {
--            major_status = GSS_S_BAD_BINDINGS;
--            goto fail;
--        }
--
--        /* Always read the clients bindings - eventhough we might ignore them */
--        TREAD_STR(ptr, ptr2, reqcksum.length);
--
--        if (input_chan_bindings != GSS_C_NO_CHANNEL_BINDINGS ) {
--            if (memcmp(ptr2, reqcksum.contents, reqcksum.length) != 0) {
--                xfree(reqcksum.contents);
--                reqcksum.contents = 0;
--                code = 0;
--                major_status = GSS_S_BAD_BINDINGS;
--                goto fail;
--            }
--
--        }
--
--        xfree(reqcksum.contents);
--        reqcksum.contents = 0;
--
--        /* Read the token flags.  Remember if GSS_C_DELEG_FLAG was set, but
--         * mask it out until we actually read a delegated credential. */
--        TREAD_INT(ptr, gss_flags, 0);
--        token_deleg_flag = (gss_flags & GSS_C_DELEG_FLAG);
--        gss_flags &= ~GSS_C_DELEG_FLAG;
--
--        /* if the checksum length > 24, there are options to process */
--
--        i = authdat->checksum->length - 24;
--        if (i && token_deleg_flag) {
--            if (i >= 4) {
--                TREAD_INT16(ptr, option_id, 0);
--                TREAD_INT16(ptr, option.length, 0);
--                i -= 4;
--
--                if (i < option.length) {
--                    code = KG_BAD_LENGTH;
--                    major_status = GSS_S_FAILURE;
--                    goto fail;
--                }
--
--                /* have to use ptr2, since option.data is wrong type and
--                   macro uses ptr as both lvalue and rvalue */
--
--                TREAD_STR(ptr, ptr2, option.length);
--                option.data = (char *) ptr2;
--
--                i -= option.length;
--
--                if (option_id != KRB5_GSS_FOR_CREDS_OPTION) {
--                    major_status = GSS_S_FAILURE;
--                    goto fail;
--                }
--
--                /* store the delegated credential */
--
--                code = rd_and_store_for_creds(context, auth_context, &option,
--                                              (delegated_cred_handle) ?
--                                              &deleg_cred : NULL);
--                if (code) {
--                    major_status = GSS_S_FAILURE;
--                    goto fail;
--                }
--
--                gss_flags |= GSS_C_DELEG_FLAG;
--            } /* if i >= 4 */
--            /* ignore any additional trailing data, for now */
--        }
--        while (i > 0) {
--            /* Process Type-Length-Data options */
--            if (i < 8) {
--                code = KG_BAD_LENGTH;
--                major_status = GSS_S_FAILURE;
--                goto fail;
--            }
--            TREAD_INT(ptr, option_id, 1);
--            TREAD_INT(ptr, option.length, 1);
--            i -= 8;
--            if (i < option.length) {
--                code = KG_BAD_LENGTH;
--                major_status = GSS_S_FAILURE;
--                goto fail;
--            }
--            TREAD_STR(ptr, ptr2, option.length);
--            option.data = (char *)ptr2;
--
--            i -= option.length;
--
--            code = kg_process_extension(context, auth_context,
--                                        option_id, &option, exts);
--            if (code != 0) {
--                major_status = GSS_S_FAILURE;
--                goto fail;
--            }
--        }
--    }
-+    major_status = GSS_S_FAILURE;
- 
-     if (exts->iakerb.conv && !exts->iakerb.verified) {
-         major_status = GSS_S_BAD_SIG;
-@@ -869,12 +851,7 @@ kg_accept_krb5(minor_status, context_handle,
-     ctx->mech_used = (gss_OID) mech_used;
-     ctx->auth_context = auth_context;
-     ctx->initiate = 0;
--    ctx->gss_flags = (GSS_C_TRANS_FLAG |
--                      ((gss_flags) & (GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG |
--                                      GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG |
--                                      GSS_C_SEQUENCE_FLAG | GSS_C_DELEG_FLAG |
--                                      GSS_C_DCE_STYLE | GSS_C_IDENTIFY_FLAG |
--                                      GSS_C_EXTENDED_ERROR_FLAG)));
-+    ctx->gss_flags = gss_flags | GSS_C_TRANS_FLAG;
-     ctx->seed_init = 0;
-     ctx->cred_rcache = cred_rcache;
- 
-@@ -1161,8 +1138,6 @@ fail:
- 
-         krb5_auth_con_free(context, auth_context);
-     }
--    if (reqcksum.contents)
--        xfree(reqcksum.contents);
-     if (ap_rep.data)
-         krb5_free_data_contents(context, &ap_rep);
-     if (major_status == GSS_S_COMPLETE ||
diff --git a/Refresh-manually-acquired-creds-from-client-keytab.patch b/Refresh-manually-acquired-creds-from-client-keytab.patch
deleted file mode 100644
index ff28434..0000000
--- a/Refresh-manually-acquired-creds-from-client-keytab.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 7316aaa0e9249a88e919f2596d881f78970548bc Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 26 Feb 2020 18:27:17 -0500
-Subject: [PATCH] Refresh manually acquired creds from client keytab
-
-If a client keytab is present but credentials are acquired manually,
-the credentials would not be refreshed because no refresh_time config
-var is set in the cache.  Change kg_cred_time_to_refresh() to attempt
-a refresh from the client keytab on any credentials which will expire
-in the next 30 seconds.
-
-[ghudson@mit.edu: adjused code and added test case]
-
-ticket: 7976
-(cherry picked from commit 729896467e3c77904666019d6cbbda583ae49b95)
----
- src/lib/gssapi/krb5/acquire_cred.c  | 14 +++++++++++---
- src/tests/gssapi/t_client_keytab.py | 18 ++++++++++++++++++
- 2 files changed, 29 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
-index acc1868f8..4062f4741 100644
---- a/src/lib/gssapi/krb5/acquire_cred.c
-+++ b/src/lib/gssapi/krb5/acquire_cred.c
-@@ -557,15 +557,23 @@ set_refresh_time(krb5_context context, krb5_ccache ccache,
- krb5_boolean
- kg_cred_time_to_refresh(krb5_context context, krb5_gss_cred_id_rec *cred)
- {
--    krb5_timestamp now;
-+    krb5_timestamp now, soon;
- 
-     if (krb5_timeofday(context, &now))
-         return FALSE;
-+    soon = ts_incr(now, 30);
-     if (cred->refresh_time != 0 && !ts_after(cred->refresh_time, now)) {
--        set_refresh_time(context, cred->ccache,
--                         ts_incr(cred->refresh_time, 30));
-+        set_refresh_time(context, cred->ccache, soon);
-         return TRUE;
-     }
-+
-+    /* If the creds will expire soon, try to refresh even if they weren't
-+     * acquired with a client keytab. */
-+    if (ts_after(soon, cred->expire)) {
-+        set_refresh_time(context, cred->ccache, soon);
-+        return TRUE;
-+    }
-+
-     return FALSE;
- }
- 
-diff --git a/src/tests/gssapi/t_client_keytab.py b/src/tests/gssapi/t_client_keytab.py
-index e474a27c7..7847b3ecd 100755
---- a/src/tests/gssapi/t_client_keytab.py
-+++ b/src/tests/gssapi/t_client_keytab.py
-@@ -124,4 +124,22 @@ realm.kinit(realm.user_princ, password('user'))
- realm.run(['./t_ccselect', phost], env=bad_cktname,
-           expected_msg=realm.user_princ)
- 
-+mark('refresh of manually acquired creds')
-+
-+# Test 17: no name/ccache specified, manually acquired creds which
-+# will expire soon.  Verify that creds are refreshed using the current
-+# client name, with refresh_time set in the refreshed ccache.
-+realm.kinit('bob', password('bob'), ['-l', '15s'])
-+realm.run(['./t_ccselect', phost], expected_msg='bob')
-+realm.run([klist, '-C'], expected_msg='refresh_time = ')
-+
-+# Test 18: no name/ccache specified, manually acquired creds with a
-+# client principal not present in the client keytab.  A refresh is
-+# attempted but fails, and an expired ticket error results.
-+realm.kinit(realm.admin_princ, password('admin'), ['-l', '-1s'])
-+msgs = ('Getting initial credentials for user/admin@KRBTEST.COM',
-+        '/Matching credential not found')
-+realm.run(['./t_ccselect', phost], expected_code=1,
-+          expected_msg='Ticket expired', expected_trace=msgs)
-+
- success('Client keytab tests')
diff --git a/Remove-resolver-test-utility.patch b/Remove-resolver-test-utility.patch
deleted file mode 100644
index e5dd78d..0000000
--- a/Remove-resolver-test-utility.patch
+++ /dev/null
@@ -1,547 +0,0 @@
-From 3e75969e0c0a52ec3ca8195200fcdadaa63b324f Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Thu, 28 May 2020 18:41:02 -0400
-Subject: [PATCH] Remove resolver test utility
-
-tests/resolve is no longer used after the previous commit.
-
-[rharwood@redhat.com: .gitignore]
----
- src/configure.ac                       |   5 +-
- src/tests/Makefile.in                  |   4 +-
- src/tests/resolve/Makefile.in          |  28 ---
- src/tests/resolve/addrinfo-test.c      | 306 -------------------------
- src/tests/resolve/deps                 |  14 --
- src/tests/resolve/fake-addrinfo-test.c |   3 -
- src/tests/resolve/resolve.c            | 115 ----------
- 7 files changed, 4 insertions(+), 471 deletions(-)
- delete mode 100644 src/tests/resolve/Makefile.in
- delete mode 100644 src/tests/resolve/addrinfo-test.c
- delete mode 100644 src/tests/resolve/deps
- delete mode 100644 src/tests/resolve/fake-addrinfo-test.c
- delete mode 100644 src/tests/resolve/resolve.c
-
-diff --git a/src/configure.ac b/src/configure.ac
-index aafc462f9..00b5ea4c5 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -1540,7 +1540,6 @@ V5_AC_OUTPUT_MAKEFILE(.
- 	appl/simple appl/simple/client appl/simple/server
- 	appl/gss-sample appl/user_user
- 
--	tests tests/resolve tests/asn.1 tests/create tests/hammer
--	tests/verify tests/gssapi tests/dejagnu tests/threads tests/shlib
--	tests/gss-threads tests/misc
-+	tests tests/asn.1 tests/create tests/hammer tests/verify tests/gssapi
-+	tests/dejagnu tests/threads tests/shlib tests/gss-threads tests/misc
- )
-diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
-index 3f88f1713..6b7749129 100644
---- a/src/tests/Makefile.in
-+++ b/src/tests/Makefile.in
-@@ -1,7 +1,7 @@
- mydir=tests
- BUILDTOP=$(REL)..
--SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
--	gss-threads misc threads softpkcs11
-+SUBDIRS = asn.1 create hammer verify gssapi dejagnu shlib gss-threads misc \
-+	threads softpkcs11
- 
- RUN_DB_TEST = $(RUN_SETUP) KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf \
- 	GSS_MECH_CONFIG=mech.conf LC_ALL=C $(VALGRIND)
-diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
-deleted file mode 100644
-index 1f5954089..000000000
---- a/src/tests/resolve/Makefile.in
-+++ /dev/null
-@@ -1,28 +0,0 @@
--mydir=tests$(S)resolve
--BUILDTOP=$(REL)..$(S)..
--
--OBJS=resolve.o addrinfo-test.o fake-addrinfo-test.o
--SRCS=$(srcdir)/resolve.c $(srcdir)/addrinfo-test.c \
--	$(srcdir)/fake-addrinfo-test.c
--
--all: resolve addrinfo-test fake-addrinfo-test
--
--resolve: resolve.o
--	$(CC_LINK) -o $@ resolve.o $(SUPPORT_LIB) $(LIBS)
--
--addrinfo-test: addrinfo-test.o
--	$(CC_LINK) -o $@ addrinfo-test.o $(SUPPORT_LIB) $(LIBS)
--
--fake-addrinfo-test: fake-addrinfo-test.o
--	$(CC_LINK) -o $@ fake-addrinfo-test.o $(SUPPORT_LIB) $(LIBS)
--
--check: resolve addrinfo-test fake-addrinfo-test
--	$(RUN_TEST) ./resolve
--	$(RUN_TEST) ./addrinfo-test -p telnet
--	$(RUN_TEST) ./fake-addrinfo-test -p telnet
--
--install:
--
--clean:
--	$(RM) resolve addrinfo-test fake-addrinfo-test
--
-diff --git a/src/tests/resolve/addrinfo-test.c b/src/tests/resolve/addrinfo-test.c
-deleted file mode 100644
-index e77640b62..000000000
---- a/src/tests/resolve/addrinfo-test.c
-+++ /dev/null
-@@ -1,306 +0,0 @@
--/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
--/* tests/resolve/addrinfo-test.c */
--/*
-- * Copyright 2004 by the Massachusetts Institute of Technology.
-- * All Rights Reserved.
-- *
-- * Export of this software from the United States of America may
-- *   require a specific license from the United States Government.
-- *   It is the responsibility of any person or organization contemplating
-- *   export to obtain such a license before exporting.
-- *
-- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-- * distribute this software and its documentation for any purpose and
-- * without fee is hereby granted, provided that the above copyright
-- * notice appear in all copies and that both that copyright notice and
-- * this permission notice appear in supporting documentation, and that
-- * the name of M.I.T. not be used in advertising or publicity pertaining
-- * to distribution of the software without specific, written prior
-- * permission.  Furthermore if you modify this software you must label
-- * your software as modified software and not distribute it in such a
-- * fashion that it might be confused with the original M.I.T. software.
-- * M.I.T. makes no representations about the suitability of
-- * this software for any purpose.  It is provided "as is" without express
-- * or implied warranty.
-- */
--
--/*
-- * A simple program to test the functionality of the getaddrinfo function.
-- *
-- * Usage:
-- *   addrinfo-test [-t|-u|-R|-I] [-d|-s|-r] [-p port] [-P] [hostname]
-- *
-- *   When invoked with no arguments, NULL is used for the node name,
-- *   which (at least with a non-null "port") means a socket address
-- *   is desired that can be used with connect() or bind() (depending
-- *   on whether "-P" is given).
-- */
--
--#include <k5-platform.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <netdb.h>
--#include <netinet/in.h> /* needed for IPPROTO_* on NetBSD */
--#ifdef USE_FAKE_ADDRINFO
--#include "fake-addrinfo.h"
--#endif
--
--static const char *protoname (int p) {
--    static char buf[30];
--
--#define X(N) if (p == IPPROTO_ ## N) return #N
--
--    X(TCP);
--    X(UDP);
--    X(ICMP);
--#ifdef IPPROTO_IPV6
--    X(IPV6);
--#endif
--#ifdef IPPROTO_GRE
--    X(GRE);
--#endif
--#ifdef IPPROTO_NONE
--    X(NONE);
--#endif
--    X(RAW);
--#ifdef IPPROTO_COMP
--    X(COMP);
--#endif
--
--    snprintf(buf, sizeof(buf), " %-2d", p);
--    return buf;
--}
--
--static const char *socktypename (int t) {
--    static char buf[30];
--    switch (t) {
--    case SOCK_DGRAM: return "DGRAM";
--    case SOCK_STREAM: return "STREAM";
--    case SOCK_RAW: return "RAW";
--    case SOCK_RDM: return "RDM";
--    case SOCK_SEQPACKET: return "SEQPACKET";
--    }
--    snprintf(buf, sizeof(buf), " %-2d", t);
--    return buf;
--}
--
--static char *whoami;
--
--static void usage () {
--    fprintf(stderr,
--            "usage:\n"
--            "\t%s [ options ] [host]\n"
--            "options:\n"
--            "\t-t\tspecify protocol IPPROTO_TCP\n"
--            "\t-u\tspecify protocol IPPROTO_UDP\n"
--            "\t-R\tspecify protocol IPPROTO_RAW\n"
--            "\t-I\tspecify protocol IPPROTO_ICMP\n"
--            "\n"
--            "\t-d\tspecify socket type SOCK_DGRAM\n"
--            "\t-s\tspecify socket type SOCK_STREAM\n"
--            "\t-r\tspecify socket type SOCK_RAW\n"
--            "\n"
--            "\t-4\tspecify address family AF_INET\n"
--#ifdef AF_INET6
--            "\t-6\tspecify address family AF_INET6\n"
--#endif
--            "\n"
--            "\t-p P\tspecify port P (service name or port number)\n"
--            "\t-N\thostname is numeric, skip DNS query\n"
--            "\t-n\tservice/port is numeric (sets AI_NUMERICSERV)\n"
--            "\t-P\tset AI_PASSIVE\n"
--            "\n"
--            "default: protocol 0, socket type 0, address family 0, null port\n"
--            ,
--            whoami);
--    /* [ -t | -u | -R | -I ] [ -d | -s | -r ] [ -p port ] */
--    exit (1);
--}
--
--static const char *familyname (int f) {
--    static char buf[30];
--    switch (f) {
--    default:
--        snprintf(buf, sizeof(buf), "AF %d", f);
--        return buf;
--    case AF_INET: return "AF_INET";
--#ifdef AF_INET6
--    case AF_INET6: return "AF_INET6";
--#endif
--    }
--}
--
--#define eaistr(X) (X == EAI_SYSTEM ? strerror(errno) : gai_strerror(X))
--
--int main (int argc, char *argv[])
--{
--    struct addrinfo *ap, *ap2;
--    int err, numerichost = 0, numericserv = 0;
--    char *hname, *port = 0, *sep;
--    struct addrinfo hints;
--
--    whoami = strrchr(argv[0], '/');
--    if (whoami == 0)
--        whoami = argv[0];
--    else
--        whoami = whoami+1;
--
--    memset(&hints, 0, sizeof(hints));
--    hints.ai_flags = 0;
--    hints.ai_socktype = 0;
--
--    hname = 0;
--    hints.ai_family = 0;
--
--    if (argc == 1)
--        usage ();
--
--    while (++argv, --argc > 0) {
--        char *arg;
--        arg = *argv;
--
--        if (*arg != '-')
--            hname = arg;
--        else if (arg[1] == 0 || arg[2] != 0)
--            usage ();
--        else
--            switch (arg[1]) {
--            case 'u':
--                hints.ai_protocol = IPPROTO_UDP;
--                break;
--            case 't':
--                hints.ai_protocol = IPPROTO_TCP;
--                break;
--            case 'R':
--                hints.ai_protocol = IPPROTO_RAW;
--                break;
--            case 'I':
--                hints.ai_protocol = IPPROTO_ICMP;
--                break;
--            case 'd':
--                hints.ai_socktype = SOCK_DGRAM;
--                break;
--            case 's':
--                hints.ai_socktype = SOCK_STREAM;
--                break;
--            case 'r':
--                hints.ai_socktype = SOCK_RAW;
--                break;
--            case 'p':
--                if (argv[1] == 0 || argv[1][0] == 0 || argv[1][0] == '-')
--                    usage ();
--                port = argv[1];
--                argc--, argv++;
--                break;
--            case '4':
--                hints.ai_family = AF_INET;
--                break;
--#ifdef AF_INET6
--            case '6':
--                hints.ai_family = AF_INET6;
--                break;
--#endif
--            case 'N':
--                numerichost = 1;
--                break;
--            case 'n':
--                numericserv = 1;
--                break;
--            case 'P':
--                hints.ai_flags |= AI_PASSIVE;
--                break;
--            default:
--                usage ();
--            }
--    }
--
--    if (hname && !numerichost)
--        hints.ai_flags |= AI_CANONNAME;
--    if (numerichost) {
--#ifdef AI_NUMERICHOST
--        hints.ai_flags |= AI_NUMERICHOST;
--#else
--        fprintf(stderr, "AI_NUMERICHOST not defined on this platform\n");
--        exit(1);
--#endif
--    }
--    if (numericserv) {
--#ifdef AI_NUMERICSERV
--        hints.ai_flags |= AI_NUMERICSERV;
--#else
--        fprintf(stderr, "AI_NUMERICSERV not defined on this platform\n");
--        exit(1);
--#endif
--    }
--
--    printf("getaddrinfo(hostname %s, service %s,\n"
--           "            hints { ",
--           hname ? hname : "(null)", port ? port : "(null)");
--    sep = "";
--#define Z(FLAG) if (hints.ai_flags & AI_##FLAG) printf("%s%s", sep, #FLAG), sep = "|"
--    Z(CANONNAME);
--    Z(PASSIVE);
--#ifdef AI_NUMERICHOST
--    Z(NUMERICHOST);
--#endif
--#ifdef AI_NUMERICSERV
--    Z(NUMERICSERV);
--#endif
--    if (sep[0] == 0)
--        printf ("no-flags");
--    if (hints.ai_family)
--        printf(" %s", familyname(hints.ai_family));
--    if (hints.ai_socktype)
--        printf(" SOCK_%s", socktypename(hints.ai_socktype));
--    if (hints.ai_protocol)
--        printf(" IPPROTO_%s", protoname(hints.ai_protocol));
--    printf(" }):\n");
--
--    err = getaddrinfo(hname, port, &hints, &ap);
--    if (err) {
--        printf("\terror => %s\n", eaistr(err));
--        return 1;
--    }
--
--    for (ap2 = ap; ap2; ap2 = ap2->ai_next) {
--        char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
--        /* If we don't do this, even AIX's own getnameinfo will reject
--           the sockaddr structures.  The sa_len field doesn't get set
--           either, on AIX, but getnameinfo won't complain.  */
--        if (ap2->ai_addr->sa_family == 0) {
--            printf("BAD: sa_family zero! fixing...\n");
--            ap2->ai_addr->sa_family = ap2->ai_family;
--        } else if (ap2->ai_addr->sa_family != ap2->ai_family) {
--            printf("BAD: sa_family != ai_family! fixing...\n");
--            ap2->ai_addr->sa_family = ap2->ai_family;
--        }
--        if (getnameinfo(ap2->ai_addr, ap2->ai_addrlen, hbuf, sizeof(hbuf),
--                        pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
--            strlcpy(hbuf, "...", sizeof(hbuf));
--            strlcpy(pbuf, "...", sizeof(pbuf));
--        }
--        printf("%p:\n"
--               "\tfamily = %s\tproto = %-4s\tsocktype = %s\n",
--               (void *) ap2, familyname(ap2->ai_family),
--               protoname (ap2->ai_protocol),
--               socktypename (ap2->ai_socktype));
--        if (ap2->ai_canonname) {
--            if (ap2->ai_canonname[0])
--                printf("\tcanonname = %s\n", ap2->ai_canonname);
--            else
--                printf("BAD: ai_canonname is set but empty!\n");
--        } else if (ap2 == ap && (hints.ai_flags & AI_CANONNAME)) {
--            printf("BAD: first ai_canonname is null!\n");
--        }
--        printf("\taddr = %-28s\tport = %s\n", hbuf, pbuf);
--
--        err = getnameinfo(ap2->ai_addr, ap2->ai_addrlen, hbuf, sizeof (hbuf),
--                          pbuf, sizeof(pbuf), NI_NAMEREQD);
--        if (err)
--            printf("\tgetnameinfo(NI_NAMEREQD): %s\n", eaistr(err));
--        else
--            printf("\tgetnameinfo => %s, %s\n", hbuf, pbuf);
--    }
--    freeaddrinfo(ap);
--    return 0;
--}
-diff --git a/src/tests/resolve/deps b/src/tests/resolve/deps
-deleted file mode 100644
-index 762d9adab..000000000
---- a/src/tests/resolve/deps
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#
--# Generated makefile dependencies follow.
--#
--$(OUTPRE)resolve.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
--  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
--  resolve.c
--$(OUTPRE)addrinfo-test.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
--  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
--  addrinfo-test.c
--$(OUTPRE)fake-addrinfo-test.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
--  $(top_srcdir)/include/fake-addrinfo.h $(top_srcdir)/include/k5-platform.h \
--  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/port-sockets.h \
--  $(top_srcdir)/include/socket-utils.h addrinfo-test.c \
--  fake-addrinfo-test.c
-diff --git a/src/tests/resolve/fake-addrinfo-test.c b/src/tests/resolve/fake-addrinfo-test.c
-deleted file mode 100644
-index 86365a5ba..000000000
---- a/src/tests/resolve/fake-addrinfo-test.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
--#define USE_FAKE_ADDRINFO
--#include "addrinfo-test.c"
-diff --git a/src/tests/resolve/resolve.c b/src/tests/resolve/resolve.c
-deleted file mode 100644
-index ea0239113..000000000
---- a/src/tests/resolve/resolve.c
-+++ /dev/null
-@@ -1,115 +0,0 @@
--/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
--/* tests/resolve/resolve.c */
--/*
-- * Copyright 1995 by the Massachusetts Institute of Technology.
-- * All Rights Reserved.
-- *
-- * Export of this software from the United States of America may
-- *   require a specific license from the United States Government.
-- *   It is the responsibility of any person or organization contemplating
-- *   export to obtain such a license before exporting.
-- *
-- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-- * distribute this software and its documentation for any purpose and
-- * without fee is hereby granted, provided that the above copyright
-- * notice appear in all copies and that both that copyright notice and
-- * this permission notice appear in supporting documentation, and that
-- * the name of M.I.T. not be used in advertising or publicity pertaining
-- * to distribution of the software without specific, written prior
-- * permission.  Furthermore if you modify this software you must label
-- * your software as modified software and not distribute it in such a
-- * fashion that it might be confused with the original M.I.T. software.
-- * M.I.T. makes no representations about the suitability of
-- * this software for any purpose.  It is provided "as is" without express
-- * or implied warranty.
-- */
--
--/*
-- * A simple program to test the functionality of the resolver library.
-- * It simply will try to get the IP address of the host, and then look
-- * up the name from the address. If the resulting name does not contain the
-- * domain name, then the resolve library is broken.
-- *
-- * Warning: It is possible to fool this program into thinking everything is
-- * alright by a clever use of /etc/hosts - but this is better than nothing.
-- *
-- * Usage:
-- *   resolve [hostname]
-- *
-- *   When invoked with no arguments, gethostname is used for the local host.
-- *
-- */
--
--/* This program tests the resolve library and sees if it is broken... */
--
--#include "k5-platform.h"
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <arpa/inet.h>
--#include <netdb.h>
--#ifdef HAVE_SYS_PARAM_H
--#include <sys/param.h>
--#endif
--
--int
--main(int argc, char **argv)
--{
--    struct addrinfo *ai = NULL, hint;
--    char myname[MAXHOSTNAMELEN + 1], namebuf[NI_MAXHOST], abuf[256];
--    const char *addrstr;
--    int err, quiet = 0;
--
--    argc--; argv++;
--    while (argc) {
--        if ((strcmp(*argv, "--quiet") == 0) ||
--            (strcmp(*argv, "-q") == 0)) {
--            quiet++;
--        } else
--            break;
--        argc--; argv++;
--    }
--
--    if (argc >= 1) {
--        strlcpy(myname, *argv, sizeof(myname));
--    } else {
--        if(gethostname(myname, MAXHOSTNAMELEN)) {
--            perror("gethostname failure");
--            exit(1);
--        }
--    }
--
--    myname[MAXHOSTNAMELEN] = '\0';  /* for safety */
--
--    /* Look up the address... */
--    if (!quiet)
--        printf("Hostname:  %s\n", myname);
--
--    memset(&hint, 0, sizeof(hint));
--    hint.ai_flags = AI_CANONNAME;
--    err = getaddrinfo(myname, 0, &hint, &ai);
--    if (err) {
--        fprintf(stderr,
--                "Could not look up address for hostname '%s' - fatal\n",
--                myname);
--        exit(2);
--    }
--
--    if (!quiet) {
--        addrstr = inet_ntop(ai->ai_family, ai->ai_addr, abuf, sizeof(abuf));
--        if (addrstr != NULL)
--            printf("Host address: %s\n", addrstr);
--    }
--
--    err = getnameinfo(ai->ai_addr, ai->ai_addrlen, namebuf, sizeof(namebuf),
--                      NULL, 0, NI_NAMEREQD);
--    if (err && !quiet)
--        fprintf(stderr, "Error looking up IP address\n");
--
--    printf("%s%s\n", quiet ? "" : "FQDN: ", err ? ai->ai_canonname : namebuf);
--
--    if (!quiet)
--        printf("Resolve library appears to have passed the test\n");
--
--    freeaddrinfo(ai);
--    return 0;
--}
diff --git a/Replace-gssrpc-tests-with-a-Python-script.patch b/Replace-gssrpc-tests-with-a-Python-script.patch
deleted file mode 100644
index ced6543..0000000
--- a/Replace-gssrpc-tests-with-a-Python-script.patch
+++ /dev/null
@@ -1,861 +0,0 @@
-From 404cc1152880a567fc27bb7c691a1a732692bbf9 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Sat, 15 Feb 2020 20:34:23 -0500
-Subject: [PATCH] Replace gssrpc tests with a Python script
-
-Replace the dejagnu RPC test framework with a short Python script to
-do the same tests as fullrun.exp and gsserr.exp.  Modify the server
-test program to facilitate use by k5test.py.
-
-expire.exp, together with a comment in the client test program, was
-designed to test a libdb2 btree bug via the gssrpc server-side
-authentication code.  That code was subsequently changed not to use
-libdb2, before it was merged into the main krb5 tree (in revision 1.23
-of svc_auth_gssapi.c, according to the changelog removed in commit
-2a43d772be1e45faa8e488d436b6e867371563fb).  Remove the comment and do
-not replace that test sequence.
-
-[rharwood@redhat.com: .gitignore]
----
- src/configure.ac                             |   2 -
- src/lib/rpc/unit-test/Makefile.in            |  36 +--
- src/lib/rpc/unit-test/client.c               |  26 ---
- src/lib/rpc/unit-test/config/unix.exp        | 176 --------------
- src/lib/rpc/unit-test/lib/helpers.exp        | 234 -------------------
- src/lib/rpc/unit-test/rpc_test.0/expire.exp  |  49 ----
- src/lib/rpc/unit-test/rpc_test.0/fullrun.exp |  91 --------
- src/lib/rpc/unit-test/rpc_test.0/gsserr.exp  |  30 ---
- src/lib/rpc/unit-test/server.c               |  13 +-
- src/lib/rpc/unit-test/t_rpc.py               |  29 +++
- 10 files changed, 41 insertions(+), 645 deletions(-)
- delete mode 100644 src/lib/rpc/unit-test/config/unix.exp
- delete mode 100644 src/lib/rpc/unit-test/lib/helpers.exp
- delete mode 100644 src/lib/rpc/unit-test/rpc_test.0/expire.exp
- delete mode 100644 src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
- delete mode 100644 src/lib/rpc/unit-test/rpc_test.0/gsserr.exp
- create mode 100644 src/lib/rpc/unit-test/t_rpc.py
-
-diff --git a/src/configure.ac b/src/configure.ac
-index 29be532cb..aafc462f9 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -1102,8 +1102,6 @@ extern void endrpcent();],
- AC_MSG_RESULT($k5_cv_type_endrpcent)
- AC_DEFINE_UNQUOTED(ENDRPCENT_TYPE, $k5_cv_type_endrpcent, [Define as return type of endrpcent])
- K5_GEN_FILE(include/gssrpc/types.h:include/gssrpc/types.hin)
--PASS=tcp
--AC_SUBST(PASS)
- 
- # for pkinit
- AC_ARG_ENABLE([pkinit],
-diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
-index 0b6e5203d..309ae2b21 100644
---- a/src/lib/rpc/unit-test/Makefile.in
-+++ b/src/lib/rpc/unit-test/Makefile.in
-@@ -16,10 +16,6 @@ server: server.o rpc_test_svc.o $(GSSRPC_DEPLIBS) $(KRB5_BASE_DEPLIBS)
- 
- client.o server.o: rpc_test.h
- 
--runenv.exp: Makefile
--	$(RUN_SETUP); for i in $(RUN_VARS); do \
--		eval echo "set env\($$i\) \$$$$i"; done > runenv.exp
--
- # If rpc_test.h and rpc_test_*.c do not work on your system, you can
- # try using rpcgen by uncommenting these lines (be sure to uncomment
- # then in the generated not Makefile.in).
-@@ -34,37 +30,9 @@ runenv.exp: Makefile
- # 	rm -f rpc_test.h rpc_test_clnt.c rpc_test_svc.c
- # 
- 
--check unit-test: unit-test-@DO_TEST@
--
--unit-test-:
--	@echo "+++"
--	@echo "+++ WARNING: lib/rpc unit tests not run."
--	@echo "+++ Either tcl, runtest, or Perl is unavailable."
--	@echo "+++"
--	@echo 'Skipped rpc tests: runtest or Perl not found' >> $(SKIPTESTS)
--
--unit-test-ok: unit-test-body
--
--PASS=@PASS@
--unit-test-body: runenv.sh runenv.exp
--	$(RM) krb5cc_rpc_test_*
--	$(ENV_SETUP) $(VALGRIND) $(START_SERVERS)
--	RPC_TEST_KEYTAB=/tmp/rpc_test_keytab.$$$$ ; export RPC_TEST_KEYTAB ; \
--	trap "echo Failed, cleaning up... ; rm -f $$RPC_TEST_KEYTAB ; $(ENV_SETUP) $(STOP_SERVERS) ; trap '' 0 ; exit 1" 0 1 2 3 14 15 ; \
--	if $(ENV_SETUP) \
--		$(RUNTEST) SERVER=./server CLIENT=./client \
--		KINIT=$(BUILDTOP)/clients/kinit/kinit \
--		KDESTROY=$(BUILDTOP)/clients/kdestroy/kdestroy \
--		PRIOCNTL_HACK=@PRIOCNTL_HACK@ VALGRIND="$(VALGRIND)" \
--		PASS="$(PASS)" --tool rpc_test $(RUNTESTFLAGS) ; \
--	then \
--		echo Cleaning up... ; \
--		rm -f $$RPC_TEST_KEYTAB krb5cc_rpc_test_* ; \
--		$(ENV_SETUP) $(STOP_SERVERS) ; \
--		trap 0 ; exit 0 ; \
--	else exit 1 ; fi
-+check-pytests:
-+	$(RUNPYTEST) $(srcdir)/t_rpc.py $(PYTESTFLAGS)
- 
- clean:
- 	$(RM) server client
--	$(RM) dbg.log rpc_test.log rpc_test.sum runenv.exp
- 
-diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c
-index 5edde49df..c9a812bc5 100644
---- a/src/lib/rpc/unit-test/client.c
-+++ b/src/lib/rpc/unit-test/client.c
-@@ -231,32 +231,6 @@ main(argc, argv)
-      else
- 	  gssrpc_xdr_free(xdr_wrapstring, echo_resp);
- 
--     /*
--      * Test fix for secure-rpc/586, part 1: btree keys must be
--      * unique.  Create another context from the same credentials; it
--      * should have the same expiration time and will cause the server
--      * to abort if the clients are not differentiated.
--      *
--      * Test fix for secure-rpc/586, part 2: btree keys cannot be
--      * mutated in place.  To test this: a second client, *with a
--      * later expiration time*, must be run.  The second client should
--      * destroy itself *after* the first one; if the key-mutating bug
--      * is not fixed, the second client_data will be in the btree
--      * before the first, but its key will be larger; thus, when the
--      * first client calls AUTH_DESTROY, the server won't find it in
--      * the btree and call abort.
--      *
--      * For unknown reasons, running just a second client didn't
--      * tickle the bug; the btree code seemed to guess which node to
--      * look at first.  Running a total of three clients does ticket
--      * the bug.  Thus, the full test sequence looks like this:
--      *
--      * 	kinit -l 20m user && client server test@ddn 200
--      * 	sleep 1
--      * 	kini -l 30m user && client server test@ddn 300
--      * 	sleep 1
--      * 	kinit -l 40m user && client server test@ddn 400
--      */
-      if (! auth_once) {
- 	  tmp_auth = clnt->cl_auth;
- 	  clnt->cl_auth = auth_gssapi_create_default(clnt, target);
-diff --git a/src/lib/rpc/unit-test/config/unix.exp b/src/lib/rpc/unit-test/config/unix.exp
-deleted file mode 100644
-index 18da62be4..000000000
---- a/src/lib/rpc/unit-test/config/unix.exp
-+++ /dev/null
-@@ -1,176 +0,0 @@
--#
--# $Id$
--#
--
--source runenv.exp
--
--set kill /bin/kill
--set sleep /bin/sleep
--set kinit $KINIT
--set kdestroy $KDESTROY
--
--set hostname [exec hostname]
--
--# Hack around Solaris 9 kernel race condition that causes last output
--# from a pty to get dropped.
--if { $PRIOCNTL_HACK } {
--    catch {exec priocntl -s -c FX -m 30 -p 30 -i pid [getpid]}
--    rename spawn oldspawn
--    proc spawn { args } {
--	upvar 1 spawn_id spawn_id
--	set newargs {}
--	set inflags 1
--	set eatnext 0
--	foreach arg $args {
--	    if { $arg == "-ignore" \
--		     || $arg == "-open" \
--		     || $arg == "-leaveopen" } {
--		lappend newargs $arg
--		set eatnext 1
--		continue
--	    }
--	    if [string match "-*" $arg] {
--		lappend newargs $arg
--		continue
--	    }
--	    if { $eatnext } {
--		set eatnext 0
--		lappend newargs $arg
--		continue
--	    }
--	    if { $inflags } {
--		set inflags 0
--		set newargs [concat $newargs {priocntl -e -c FX -p 0}]
--	    }
--	    lappend newargs $arg
--	}
--	set pid [eval oldspawn $newargs]
--	return $pid
--    }
--}
--
--if { [string length $VALGRIND] } {
--    rename spawn valgrind_aux_spawn
--    proc spawn { args } {
--	global VALGRIND
--	upvar 1 spawn_id spawn_id
--	set newargs {}
--	set inflags 1
--	set eatnext 0
--	foreach arg $args {
--	    if { $arg == "-ignore" \
--		     || $arg == "-open" \
--		     || $arg == "-leaveopen" } {
--		lappend newargs $arg
--		set eatnext 1
--		continue
--	    }
--	    if [string match "-*" $arg] {
--		lappend newargs $arg
--		continue
--	    }
--	    if { $eatnext } {
--		set eatnext 0
--		lappend newargs $arg
--		continue
--	    }
--	    if { $inflags } {
--		set inflags 0
--		# Only run valgrind for local programs, not
--		# system ones.
--#&&![string match "/bin/sh" $arg] sh is used to start kadmind!
--		if [string match "/" [string index $arg 0]]&&![string match "/bin/ls" $arg]&&![regexp {/kshd$} $arg] {
--		    set newargs [concat $newargs $VALGRIND]
--		} elseif [string match "." [string index $arg 0]] {
--		    set newargs [concat $newargs $VALGRIND]
--		}
--	    }
--	    lappend newargs $arg
--	}
--	set pid [eval valgrind_aux_spawn $newargs]
--	return $pid
--    }
--}
--
--# this will initialize the database and keytab
--load_lib "helpers.exp"
--
--proc rpc_test_version {} {
--	global CLIENT
--	global SERVER
--
--	clone_output "$CLIENT version <unknown>"
--	clone_output "$SERVER version <unknown>"
--}
--
--proc rpc_test_load {} {
--	#
--}
--
--# rpc_test_exit -- clean up and exit
--proc rpc_test_exit {} {
--	global server_id
--	global server_pid
--	global server_started
--	global kill
--
-- 	if {[catch {
--		expect {
--			-i $server_id
--			eof { 
--				fail "server exited!"
--				verbose $expect_out(buffer) 1
--			}
--			timeout { pass "server survived" }
--		}
--	} tmp]} {
--		fail "server exited! (expect failed)"
--	}
--}
--
--#
--# rpc_test_start -- start the rpc_test server running
--#
--proc rpc_test_start { } {
-- 	global SERVER PROT
--	global server_id
--	global server_pid
--	global server_started
--	global server_port
--	global env
--
--	if [info exists server_pid] { rpc_test_exit }
--
--	set env(KRB5_KTNAME) FILE:$env(RPC_TEST_KEYTAB)
--
-- 	verbose "% $SERVER" 1
--	set server_pid [spawn $SERVER $PROT]
--	set server_id $spawn_id
--        set server_started 1
--	set server_port -1
--
--	unset env(KRB5_KTNAME)
--
--	set timeout 30
--
--	expect {
--		-re "port: (\[0-9\]*)\r\n" {
--			set server_port $expect_out(1,string)
--		}
--		"running" { }
--		eof { 
--			send_error "server exited!"
--			verbose $expect_out(buffer) 1
--		}
--		timeout { 
--			send_error "server didn't start in $timeout seconds"
--			verbose $expect_out(buffer) 1
--		}
--	}
--
--}
--
--set MULTIPASS {
--    {tcp PROT=-t dummy=[rpc_test_start]}
--    {udp PROT=-u dummy=[rpc_test_start]}
--}
-diff --git a/src/lib/rpc/unit-test/lib/helpers.exp b/src/lib/rpc/unit-test/lib/helpers.exp
-deleted file mode 100644
-index eb2797c53..000000000
---- a/src/lib/rpc/unit-test/lib/helpers.exp
-+++ /dev/null
-@@ -1,234 +0,0 @@
--if {[info commands exp_version] != {}} {
--	set exp_version_4 [regexp {^4} [exp_version]]
--} else {
--	set exp_version_4 [regexp {^4} [expect_version]]
--}
--
--# Backward compatibility until we're using expect 5 everywhere
--if {$exp_version_4} {
--	global wait_error_index wait_errno_index wait_status_index
--	set wait_error_index 0
--	set wait_errno_index 1
--	set wait_status_index 1
--} else {
--	set wait_error_index 2
--	set wait_errno_index 3
--	set wait_status_index 3
--}
--				
--proc set_from_env {varname default_value} {
--    global env
--    upvar $varname v
--
--    if [info exists env($varname)] {
--	set v $env($varname)
--    } else {
--	set v $default_value
--    }
--}
--proc expect_tcl_prompt {} {
--    global kadmin_tcl_spawn_id
--    expect {
--	-i $kadmin_tcl_spawn_id
--	-re "^% $" { }
--	-re . { perror "unexpected output {$expect_out(buffer)} from subprocess, expecting tcl prompt" }
--	timeout { perror "timeout waiting for tcl prompt" }
--	eof { perror "eof from subprocess when expecting tcl prompt" }
--    }
--}
--proc send_tcl_cmd_await_echo {cmd} {
--    global kadmin_tcl_spawn_id
--    send -i $kadmin_tcl_spawn_id "$cmd\n"
--    expect {
--	-i $kadmin_tcl_spawn_id
--	-ex "$cmd\r\n" { }
--	timeout { perror "timeout waiting for tcl subprocess to echo input" }
--	eof { perror "eof waiting for tcl subprocess to echo input" }
--    }
--}
--proc expect_kadm_ok {} {
--    global kadmin_tcl_spawn_id
--    expect {
--	-i $kadmin_tcl_spawn_id
--	-re "^OK KADM5_OK \[^\n\]*\n" {}
--	-re "^ERROR \[^\n\]*\n" { perror "kadmin tcl subprocess reported unexpected error" }
--	-re "^marshall_new_creds: \[^\n\]*\n" { exp_continue }
--	-re "^gssapi_\[^\n\]*\n" { exp_continue }
--	-re "^\r?\n" { exp_continue }
--	eof	{ perror "kadmin tcl subprocess died" }
--	default { perror "didn't get ok back" }
--    }
--}
--proc setup_database {} {
--    global env spawn_id kadmin_tcl_spawn_id TESTDIR CANON_HOST
--
--    # XXXXX
--    set_from_env TOP {/x/x/x/x/x}
--    send_user "TOP=$TOP\n"
--
--    set_from_env TESTDIR $env(TOP)/testing
--    set_from_env CLNTTCL $TESTDIR/util/kadm5_clnt_tcl
--    set_from_env TCLUTIL $TESTDIR/tcl/util.t
--    set env(TCLUTIL) $TCLUTIL
--    set env(PATH) "$TOP/install/admin:$env(PATH)"
--
--    # $VERBOSE ?
--
--    if [info exists spawn_id] { set x $spawn_id }
--    spawn $CLNTTCL
--    set kadmin_tcl_spawn_id $spawn_id
--    if [info exists x] { set spawn_id $x }
--
--    expect_tcl_prompt
--    # tcl 8.4 for some reason screws up autodetection of output EOL
--    # translation.  Work around it for now.
--    send_tcl_cmd_await_echo "if { \[info commands fconfigure\] != \"\" } { fconfigure stdout -translation lf }"
--    expect_tcl_prompt
--    send_tcl_cmd_await_echo "source {$TCLUTIL}"
--    expect_tcl_prompt
--    send_tcl_cmd_await_echo "set h {$CANON_HOST}"
--    expect {
--	-ex "$CANON_HOST\r\n" { }
--	timeout { perror "timeout waiting for subprocess" }
--	eof { perror "eof from subprocess" }
--    }
--    expect_tcl_prompt
--
--    send_tcl_cmd_await_echo {kadm5_init admin admin $KADM5_ADMIN_SERVICE null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 server_handle}
--    expect_kadm_ok
--    expect "^% "
--    send_tcl_cmd_await_echo {kadm5_create_principal $server_handle [simple_principal server/$h] {KADM5_PRINCIPAL} admin}
--    expect_kadm_ok
--    expect "^% "
--    send_tcl_cmd_await_echo {kadm5_randkey_principal $server_handle server/$h key null}
--    expect_kadm_ok
--    expect "^% "
--    send_tcl_cmd_await_echo {kadm5_create_principal $server_handle [simple_principal notserver/$h] {KADM5_PRINCIPAL} admin}
--    expect_kadm_ok
--    expect "^% "
--    send_tcl_cmd_await_echo {kadm5_randkey_principal $server_handle notserver/$h key null}
--    expect_kadm_ok
--    expect "^% "
--    send_tcl_cmd_await_echo {kadm5_destroy $server_handle}
--    expect_kadm_ok
--    expect "^% "
--    wait -nowait -i $spawn_id
--    close -i $spawn_id
--}
--
--if ![info exists CANON_HOST] {
--    set CANON_HOST $env(QUALNAME)
--    setup_database
--    file delete $env(RPC_TEST_KEYTAB)
--    exec $env(TOP)/cli/kadmin -p admin -w admin ktadd -k $env(RPC_TEST_KEYTAB) server/$CANON_HOST
--}
--
--
--proc kinit {princ pass lifetime} {
--	global kinit
--	global wait_error_index wait_errno_index wait_status_index
--
--	spawn -noecho $kinit -5 -l $lifetime $princ
--	expect {
--		-re "Password for $princ.*: " { send "$pass\n"; expect eof }
--		timeout { perror "Timeout waiting for kinit"; close }
--		eof
--	}
--
--	set ret [wait]
--	if {[lindex $ret $wait_error_index] == -1} {
--	 	perror \
--	    "wait(kinit $princ) returned error [lindex $ret $wait_errno_index]"
--	} else {
--		if {[lindex $ret $wait_status_index] != 0} {
--			perror \
--		    "kinit $princ failed with [lindex $ret $wait_status_index]"
--		}
--	}
--}
--
--proc flush_server {} {
--	global server_id
--	global expect_out
--
--	verbose "flushing server output" 1
--
--	while {1} {
--		set timeout 5
--
--		expect {
--			-i $server_id
--			-re "^.+$" {
--			    verbose "server output: $expect_out(buffer)"
--			}
--			timeout { break }
--		}
--	}
--}
--
--proc start_client {testname ccname user password lifetime count
--		  {target ""}} {
--	global env CLIENT PROT hostname server_port spawn_id verbose
--
--	if {$target == ""} {
--		set target "server@$hostname"
--	}
--
--	set env(KRB5CCNAME) FILE:[pwd]/krb5cc_rpc_test_$ccname
--	kinit $user $password $lifetime
--
--	if {$verbose > 0} {
--		spawn $CLIENT -a 1 -s 1 -m 1 $PROT $hostname $server_port $target $count
--	} else {
--		spawn $CLIENT $PROT $hostname $server_port $target $count
--	}
--
--	verbose "$testname: client $ccname started"
--
--	unset env(KRB5CCNAME)
--}
--
--proc eof_client {testname ccname id status} {
--	verbose "$testname: eof'ing for client $ccname" 1
--
--	expect {
--		-i $id
--		-re "^marshall_new_creds\[^\n\]*\n" { exp_continue }
--		-re "^gssapi_\[^\n\]*\n" { exp_continue }
--		-re "^\r?\n" { exp_continue }
--		eof { verbose $expect_out(buffer) 1 }
--		timeout { 
--			fail "$testname: timeout waiting for client $ccname to exit"
--		}
--	}
--	wait_client $testname $ccname $id $status
--}
--
--
--proc wait_client {testname ccname id status} {
--	global env
--	global kill
--	global kdestroy
--	global wait_error_index wait_errno_index wait_status_index
--
--	verbose "$testname: waiting for client $ccname" 1
--
--	set ret [wait -i $id]
--	if {[lindex $ret $wait_error_index] == -1} {
--		fail \
--       "$testname: wait $ccname returned error [lindex $ret $wait_errno_index]"
--	} else {
--		if {[lindex $ret $wait_status_index] == $status} {
--			pass "$testname: client $ccname"
--		} else {
--			fail "$testname: client $ccname: unexpected return status [lindex $ret $wait_status_index], should be $status."
--		}
--	}
--
--	set env(KRB5CCNAME) FILE:[pwd]/krb5cc_rpc_test_$ccname
-- 	if {[catch "exec $kdestroy -5"] != 0} {
-- 		perror "$testname: cannot destroy client $ccname ccache"
-- 	}
--
--	unset env(KRB5CCNAME)
--}
-diff --git a/src/lib/rpc/unit-test/rpc_test.0/expire.exp b/src/lib/rpc/unit-test/rpc_test.0/expire.exp
-deleted file mode 100644
-index e19cca0ef..000000000
---- a/src/lib/rpc/unit-test/rpc_test.0/expire.exp
-+++ /dev/null
-@@ -1,49 +0,0 @@
--set timeout 40
--
--load_lib "helpers.exp"
--
--global server_started
--
--proc expired {} {
--    global spawn_id server_id
--
--    start_client expired expired testuser notathena -1m 100
--    eof_client expired expired $spawn_id 2
--
--    expect {
--	-i $server_id
--	-re "rpc_test server: Authen.*failed:.*credential.*expired" { pass "expired" }
--	timeout { fail "expired: timeout waiting for expired creds error" }
--    }
--
--    flush_server
--}
--
--# This test doesn't work after #6948, because the client won't try to
--# authenticate using an expired TGT.
--#if { $server_started } {expired }
--
--proc overlap {} {
--    global spawn_id
--
--    start_client expire 1 testuser notathena 20m 100
--    set client1_id $spawn_id
--    flush_server
--    
--    start_client expire 2 testuser notathena 40m 300
--    set client2_id $spawn_id
--    flush_server
--    
--    start_client expire 3 testuser notathena 60m 500
--    set client3_id $spawn_id
--    flush_server
--    
--    eof_client expire 1 $client1_id 0
--    eof_client expire 2 $client2_id 0
--    eof_client expire 3 $client3_id 0
--
--    flush_server
--}
--if { $server_started } {overlap} 
--
--
-diff --git a/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp b/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
-deleted file mode 100644
-index 73083de1f..000000000
---- a/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
-+++ /dev/null
-@@ -1,91 +0,0 @@
--set timeout 120
--
--load_lib "helpers.exp"
--
--global spawn_id
--global server_id
--global server_started
--
--if { !$server_started } {return} 
--
--# Start the client and do a full run
--start_client "full run" fullrun testuser notathena 8h 1026
--set client_id $spawn_id
--
--#
--# test: did we get 11 dots?
--#
--verbose "Starting RPC echo test.  This will take about 50 seconds.\n"
--
--set ver_line "rpc_test server: bad verifier\[^\r\n\]*\[\r\n]+"
--
--set dots 0
--set server_lines 0
--while {1} {
--	expect {
--		-i $server_id
--		-re $ver_line {
--			verbose "Got line from server."
--			incr server_lines
--		}
--		default {
--			exp_continue
--		}
--
--		-i $client_id
--		. { 
--			incr dots
--			verbose "$expect_out(buffer)" 1
--			if ($dots==11) { break }
--		}
--		eof {
--			#
--			# test: was the exit status right?
--			#
--			wait_client "full run" fullrun $client_id 0
--			break
--		}
--
--		timeout { 
--			verbose "Timeout waiting for dot\n" 1
--			fail "full run: timeout waiting for dot"
--			break
--		}
--	}
--}
--if {$dots==11} {
--	pass "fullrun: echo test"
--} else {
--	fail "fullrun: echo test: expected 11 dots, got $dots"
--}
--
--#
--# test: server logged four bad verifiers?
--#
--verbose "full run: checking server output"
--
--# Small timeout, since the server should have already printed everything
--set timeout 5
--
--while {$server_lines < 4} {
--	expect {
--		-i $server_id
--		-re $ver_line {
--			incr server_lines
--		}
--		-re ".+\r\n" {
--			verbose "Unexpected server output: $expect_out(buffer)"
--		}
--		default {
--			break
--		}
--	}
--}
--
--if {$server_lines == 4} {
--	pass "fullrun: bad verifiers"
--} else {
--	fail "fullrun: expected four bad verifiers, got $server_lines"
--}
--
--flush_server
-diff --git a/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp b/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp
-deleted file mode 100644
-index 005971989..000000000
---- a/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp
-+++ /dev/null
-@@ -1,30 +0,0 @@
--set timeout 30
--
--load_lib "helpers.exp"
--
--global spawn_id
--global server_id
--global server_started
--global hostname
--
--if { !$server_started } {return} 
--
--start_client "gss err" gsserr testuser notathena 8h 1026 notserver@$hostname
--
--eof_client "gss err" gsserr $spawn_id 2
--
--#
--# test: server logged an authentication attempted failed?
--#
--verbose "gss err: checking server output"
--
--expect {
--	-i $server_id
--	-re "rpc_test server: Authent.*failed: .* not found in keytab" {
--	    pass "gss err: server logged auth error"
--	}
--	eof { fail "gss err: server exited" }
--	timeout { fail "gss err: timeout waiting for server output" }
--}
--
--flush_server
-diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c
-index 13e99bb06..c3bbcbf8c 100644
---- a/src/lib/rpc/unit-test/server.c
-+++ b/src/lib/rpc/unit-test/server.c
-@@ -37,7 +37,7 @@ static void rpc_test_badverf(gss_name_t client, gss_name_t server,
- 			     caddr_t data);
- 
- #ifndef SERVICE_NAME
--#define SERVICE_NAME "server"
-+#define SERVICE_NAME "host"
- #endif
- 
- static void usage()
-@@ -120,7 +120,6 @@ main(int argc, char **argv)
- 		  prot == IPPROTO_TCP ? "tcp" : "udp");
- 	  exit(1);
-      }
--     printf("port: %d\n", (int)transp->xp_port);
- 
-      if (svcauth_gssapi_set_names(names, 0) == FALSE) {
- 	  fprintf(stderr, "unable to set gssapi names\n");
-@@ -144,6 +143,8 @@ main(int argc, char **argv)
-      signal(SIGTERM, handlesig);
- #endif
-      printf("running\n");
-+     printf("port: %d\n", (int)transp->xp_port);
-+     fflush(stdout);
- 
-      svc_run();
-      fprintf(stderr, "svc_run returned");
-@@ -177,6 +178,7 @@ static void rpc_test_badverf(gss_name_t client, gss_name_t server,
- 	    inet_ntoa(rqst->rq_xprt->xp_raddr.sin_addr),
- 	    ntohs(rqst->rq_xprt->xp_raddr.sin_port),
- 	    (int) server_name.length, (char *) server_name.value);
-+     fflush(stdout);
- 
-      (void) gss_release_buffer(&minor_stat, &client_name);
-      (void) gss_release_buffer(&minor_stat, &server_name);
-@@ -211,6 +213,7 @@ void rpc_test_badauth(OM_uint32 major, OM_uint32 minor,
-      printf("rpc_test server: Authentication attempt failed: %s", a);
-      log_badauth_display_status(major, minor);
-      printf("\n");
-+     fflush(stdout);
- }
- 
- void log_miscerr(struct svc_req *rqst, struct rpc_msg *msg,
-@@ -220,6 +223,7 @@ void log_miscerr(struct svc_req *rqst, struct rpc_msg *msg,
- 
-      a = inet_ntoa(rqst->rq_xprt->xp_raddr.sin_addr);
-      printf("Miscellaneous RPC error: %s, %s\n", a, error);
-+     fflush(stdout);
- }
- 
- void log_badauth_display_status(OM_uint32 major, OM_uint32 minor)
-@@ -243,10 +247,12 @@ void log_badauth_display_status_1(OM_uint32 code, int type, int rec)
- 		    log_badauth_display_status_1(gssstat,GSS_C_GSS_CODE,1);
- 		    log_badauth_display_status_1(minor_stat,
- 						 GSS_C_MECH_CODE, 1);
--	       } else
-+	       } else {
- 		    printf("GSS-API authentication error %.*s: "
- 			   "recursive failure!\n", (int) msg.length,
- 			   (char *)msg.value);
-+	       }
-+	       fflush(stdout);
- 	       return;
- 	  }
- 
-@@ -256,4 +262,5 @@ void log_badauth_display_status_1(OM_uint32 code, int type, int rec)
- 	  if (!msg_ctx)
- 	       break;
-      }
-+     fflush(stdout);
- }
-diff --git a/src/lib/rpc/unit-test/t_rpc.py b/src/lib/rpc/unit-test/t_rpc.py
-new file mode 100644
-index 000000000..4e565d25c
---- /dev/null
-+++ b/src/lib/rpc/unit-test/t_rpc.py
-@@ -0,0 +1,29 @@
-+import re
-+
-+from k5test import *
-+
-+realm = K5Realm()
-+
-+server = realm.start_server(['./server', '-t'], 'running')
-+line = server.stdout.readline()
-+portstr = re.match(r'^port: (\d+)$', line).group(1)
-+
-+realm.run(['./client', '-t', hostname, portstr, 'host@' + hostname, '1026'],
-+          expected_msg='...........')
-+
-+for i in range(4):
-+    line = server.stdout.readline()
-+    if 'rpc_test server: bad verifier from user@KRBTEST.COM at ' not in line:
-+        fail('unexpected server message: ' + line)
-+    output(line)
-+
-+realm.addprinc('nokey/' + hostname)
-+
-+realm.run(['./client', '-t', hostname, portstr, 'nokey@' + hostname, '1026'],
-+          expected_code=2)
-+
-+line = server.stdout.readline()
-+if 'rpc_test server: Authentication attempt failed: ' not in line:
-+    fail('unexpected server message: ' + line)
-+
-+success('gssrpc auth_gssapi tests')
diff --git a/Unify-kvno-option-documentation.patch b/Unify-kvno-option-documentation.patch
deleted file mode 100644
index b6f5e01..0000000
--- a/Unify-kvno-option-documentation.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 52e3695cc5ef00766e12adfe8ed276c2885e71bb Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Thu, 20 Aug 2020 17:49:29 -0400
-Subject: [PATCH] Unify kvno option documentation
-
-Add missing kvno options to the kvno.rst synopsis and option
-descriptions, and to the kvno usage message.  Remove mention of '-h'
-(help text), from kvno.rst as it is an implicit option.  Note that the
-three new caching options were added in release 1.19.
-
-Indicate the two exclusions (-u/-S and --u2u with the S4U2Self options)
-and dependency (-P on S4U2Self) where they are missing.
-
-Switch xusage() to print only a single localized string, rather than
-running each line of output through localization separately.
-
-Leave kvno -C undocumented for now, as the semantics of
-KRB5_GC_CANONICALIZE are minimally useful and likely to change.
-
-[ghudson@mit.edu: edited documentation and commit message]
-
-ticket: 7476
-tags: pullup
-target_version: 1.18-next
-
-(cherry picked from commit becd1ad6830b526d08ddaf5b2b6f213154c6446c)
----
- doc/user/user_commands/kvno.rst | 24 +++++++++++++-----------
- src/clients/kvno/kvno.c         | 15 +++++++++------
- src/man/kvno.man                | 24 +++++++++++++-----------
- 3 files changed, 35 insertions(+), 28 deletions(-)
-
-diff --git a/doc/user/user_commands/kvno.rst b/doc/user/user_commands/kvno.rst
-index 718313576..65c44e1c0 100644
---- a/doc/user/user_commands/kvno.rst
-+++ b/doc/user/user_commands/kvno.rst
-@@ -10,13 +10,9 @@ SYNOPSIS
- [**-c** *ccache*]
- [**-e** *etype*]
- [**-q**]
--[**-h**]
-+[**-u** | **-S** *sname*]
- [**-P**]
--[**-S** *sname*]
--[**-I** *for_user*]
--[**-U** *for_user*]
--[**-F** *cert_file*]
--[**--u2u** *ccache*]
-+[[{**-F** *cert_file* | {**-I** | **-U**} *for_user*} [**-P**]] | **--u2u** *ccache*]
- *service1 service2* ...
- 
- 
-@@ -39,13 +35,18 @@ OPTIONS
-     of all the services named on the command line.  This is useful in
-     certain backward compatibility situations.
- 
-+**-k** *keytab*
-+    Decrypt the acquired tickets using *keytab* to confirm their
-+    validity.
-+
- **-q**
-     Suppress printing output when successful.  If a service ticket
-     cannot be obtained, an error message will still be printed and
-     kvno will exit with nonzero status.
- 
--**-h**
--    Prints a usage statement and exits.
-+**-u**
-+    Use the unknown name type in requested service principal names.
-+    This option Cannot be used with *-S*.
- 
- **-P**
-     Specifies that the *service1 service2* ...  arguments are to be
-@@ -76,16 +77,17 @@ OPTIONS
- 
- **--cached-only**
-     Only retrieve credentials already present in the cache, not from
--    the KDC.
-+    the KDC.  (Added in release 1.19.)
- 
- **--no-store**
-     Do not store retrieved credentials in the cache.  If
-     **--out-cache** is also specified, credentials will still be
--    stored into the output credential cache.
-+    stored into the output credential cache.  (Added in release 1.19.)
- 
- **--out-cache** *ccache*
-     Initialize *ccache* and store all retrieved credentials into it.
--    Do not store acquired credentials in the input cache.
-+    Do not store acquired credentials in the input cache.  (Added in
-+    release 1.19.)
- 
- **--u2u** *ccache*
-     Requests a user-to-user ticket.  *ccache* must contain a local
-diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
-index 9d85864f6..c5f6bf700 100644
---- a/src/clients/kvno/kvno.c
-+++ b/src/clients/kvno/kvno.c
-@@ -38,15 +38,18 @@
- static char *prog;
- static int quiet = 0;
- 
-+#define XUSAGE_BREAK "\n\t"
-+
- static void
- xusage()
- {
--    fprintf(stderr, _("usage: %s [-C] [-u] [-c ccache] [-e etype]\n"), prog);
--    fprintf(stderr, _("\t[-k keytab] [-S sname] [{-I | -U} for_user | "
--                      "[-F cert_file] [-P]]\n"));
--    fprintf(stderr, _("\t[--cached-only] [--no-store] [--out-cache ccache] "
--                      "[--u2u ccache]\n"));
--    fprintf(stderr, _("\tservice1 service2 ...\n"));
-+    fprintf(stderr, _("usage: %s [-c ccache] [-e etype] [-k keytab] [-q] "
-+                      "[-u | -S sname]" XUSAGE_BREAK
-+                      "[[{-F cert_file | {-I | -U} for_user} [-P]] | "
-+                      "--u2u ccache]" XUSAGE_BREAK
-+                      "[--cached-only] [--no-store] [--out-cache] "
-+                      "service1 service2 ...\n"),
-+            prog);
-     exit(1);
- }
- 
-diff --git a/src/man/kvno.man b/src/man/kvno.man
-index b9f6739eb..22318324d 100644
---- a/src/man/kvno.man
-+++ b/src/man/kvno.man
-@@ -36,13 +36,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
- [\fB\-c\fP \fIccache\fP]
- [\fB\-e\fP \fIetype\fP]
- [\fB\-q\fP]
--[\fB\-h\fP]
-+[\fB\-u\fP | \fB\-S\fP \fIsname\fP]
- [\fB\-P\fP]
--[\fB\-S\fP \fIsname\fP]
--[\fB\-I\fP \fIfor_user\fP]
--[\fB\-U\fP \fIfor_user\fP]
--[\fB\-F\fP \fIcert_file\fP]
--[\fB\-\-u2u\fP \fIccache\fP]
-+[[{\fB\-F\fP \fIcert_file\fP | {\fB\-I\fP | \fB\-U\fP} \fIfor_user\fP} [\fB\-P\fP]] | \fB\-\-u2u\fP \fIccache\fP]
- \fIservice1 service2\fP ...
- .SH DESCRIPTION
- .sp
-@@ -60,13 +56,18 @@ Specifies the enctype which will be requested for the session key
- of all the services named on the command line.  This is useful in
- certain backward compatibility situations.
- .TP
-+\fB\-k\fP \fIkeytab\fP
-+Decrypt the acquired tickets using \fIkeytab\fP to confirm their
-+validity.
-+.TP
- \fB\-q\fP
- Suppress printing output when successful.  If a service ticket
- cannot be obtained, an error message will still be printed and
- kvno will exit with nonzero status.
- .TP
--\fB\-h\fP
--Prints a usage statement and exits.
-+\fB\-u\fP
-+Use the unknown name type in requested service principal names.
-+This option Cannot be used with \fI\-S\fP\&.
- .TP
- \fB\-P\fP
- Specifies that the \fIservice1 service2\fP ...  arguments are to be
-@@ -97,16 +98,17 @@ certificate file must be in PEM format.
- .TP
- \fB\-\-cached\-only\fP
- Only retrieve credentials already present in the cache, not from
--the KDC.
-+the KDC.  (Added in release 1.19.)
- .TP
- \fB\-\-no\-store\fP
- Do not store retrieved credentials in the cache.  If
- \fB\-\-out\-cache\fP is also specified, credentials will still be
--stored into the output credential cache.
-+stored into the output credential cache.  (Added in release 1.19.)
- .TP
- \fB\-\-out\-cache\fP \fIccache\fP
- Initialize \fIccache\fP and store all retrieved credentials into it.
--Do not store acquired credentials in the input cache.
-+Do not store acquired credentials in the input cache.  (Added in
-+release 1.19.)
- .TP
- \fB\-\-u2u\fP \fIccache\fP
- Requests a user\-to\-user ticket.  \fIccache\fP must contain a local
diff --git a/Use-two-queues-for-concurrent-t_otp.py-daemons.patch b/Use-two-queues-for-concurrent-t_otp.py-daemons.patch
deleted file mode 100644
index 4e81cd0..0000000
--- a/Use-two-queues-for-concurrent-t_otp.py-daemons.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3e0d464f55320b393e32285f31710c24758a9101 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Wed, 4 Mar 2020 17:18:51 -0500
-Subject: [PATCH] Use two queues for concurrent t_otp.py daemons
-
-t_otp.py occasionally fails during the #8708 regression test, reading
-a true answer instead of the expected false answer during the first
-verify() call.  Most likely the daemons are writing their answers to
-the shared queue out of order.  Use a separate queue for the second
-daemon to ensure correct correlation of results.
-
-(cherry picked from commit c03f67eefec05db19e84e889fab7c25904929633)
----
- src/tests/t_otp.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/tests/t_otp.py b/src/tests/t_otp.py
-index cba871a0f..c3b820a41 100755
---- a/src/tests/t_otp.py
-+++ b/src/tests/t_otp.py
-@@ -256,16 +256,17 @@ verify(daemon, queue, True, realm.user_princ, 'accept')
- ## tokens configured, with the first rejecting and the second
- ## accepting.  With the bug, the KDC incorrectly rejects the request
- ## and then performs invalid memory accesses, most likely crashing.
-+queue2 = Queue()
- daemon1 = UDPRadiusDaemon(args=(server_addr, secret_file, 'accept1', queue))
--daemon2 = UnixRadiusDaemon(args=(socket_file, None, 'accept2', queue))
-+daemon2 = UnixRadiusDaemon(args=(socket_file, None, 'accept2', queue2))
- daemon1.start()
- queue.get()
- daemon2.start()
--queue.get()
-+queue2.get()
- oconf = '[' + otpconfig_1('udp') + ', ' + otpconfig_1('unix') + ']'
- realm.run([kadminl, 'setstr', realm.user_princ, 'otp', oconf])
- realm.kinit(realm.user_princ, 'accept2', flags=flags)
- verify(daemon1, queue, False, realm.user_princ.split('@')[0], 'accept2')
--verify(daemon2, queue, True, realm.user_princ, 'accept2')
-+verify(daemon2, queue2, True, realm.user_princ, 'accept2')
- 
- success('OTP tests')
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/downstream-Adjust-build-configuration.patch b/downstream-Adjust-build-configuration.patch
deleted file mode 100644
index 47f6c31..0000000
--- a/downstream-Adjust-build-configuration.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 30ece66508c8e10f704cd2860dfd421ebee15897 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 23 Aug 2016 16:45:26 -0400
-Subject: [PATCH] [downstream] Adjust build configuration
-
-Build binaries in this package as RELRO PIEs, libraries as partial RELRO,
-and install shared libraries with the execute bit set on them.  Prune out
-the -L/usr/lib* and PIE flags where they might leak out and affect
-apps which just want to link with the libraries. FIXME: needs to check and
-not just assume that the compiler supports using these flags.
-
-Last-updated: krb5-1.15-beta1
----
- src/build-tools/krb5-config.in | 7 +++++++
- src/config/pre.in              | 2 +-
- src/config/shlib.conf          | 5 +++--
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
-index c17cb5eb5..1891dea99 100755
---- a/src/build-tools/krb5-config.in
-+++ b/src/build-tools/krb5-config.in
-@@ -226,6 +226,13 @@ if test -n "$do_libs"; then
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)##'`
- 
-+    if test `dirname $libdir` = /usr ; then
-+        lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"`
-+    fi
-+    lib_flags=`echo $lib_flags | sed -e "s#-fPIE##g" -e "s#-pie##g"`
-+    lib_flags=`echo $lib_flags | sed -e "s#-Wl,-z,relro##g"`
-+    lib_flags=`echo $lib_flags | sed -e "s#-Wl,-z,now##g"`
-+
-     if test $library = 'kdb'; then
- 	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
- 	library=krb5
-diff --git a/src/config/pre.in b/src/config/pre.in
-index 917357df9..a8540ae2a 100644
---- a/src/config/pre.in
-+++ b/src/config/pre.in
-@@ -185,7 +185,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
- INSTALL_SCRIPT=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_SHLIB=@INSTALL_SHLIB@
--INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
-+INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755
- ## This is needed because autoconf will sometimes define @exec_prefix@ to be
- ## ${prefix}.
- prefix=@prefix@
-diff --git a/src/config/shlib.conf b/src/config/shlib.conf
-index 3e4af6c02..2b20c3fda 100644
---- a/src/config/shlib.conf
-+++ b/src/config/shlib.conf
-@@ -423,7 +423,7 @@ mips-*-netbsd*)
- 	# Linux ld doesn't default to stuffing the SONAME field...
- 	# Use objdump -x to examine the fields of the library
- 	# UNDEF_CHECK is suppressed by --enable-asan
--	LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $(UNDEF_CHECK)'
-+	LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $(UNDEF_CHECK)  -Wl,-z,relro -Wl,--warn-shared-textrel'
- 	UNDEF_CHECK='-Wl,--no-undefined'
- 	# $(EXPORT_CHECK) runs export-check.pl when in maintainer mode.
- 	LDCOMBINE_TAIL='-Wl,--version-script binutils.versions $(EXPORT_CHECK)'
-@@ -435,7 +435,8 @@ mips-*-netbsd*)
- 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
- 	PROFFLAGS=-pg
- 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
--	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
-+	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) -pie -Wl,-z,relro -Wl,-z,now $(LDFLAGS)'
-+	INSTALL_SHLIB='${INSTALL} -m755'
- 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
- 	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
- 	CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
diff --git a/downstream-Use-backported-version-of-OpenSSL-3-KDF-i.patch b/downstream-Use-backported-version-of-OpenSSL-3-KDF-i.patch
deleted file mode 100644
index 56565b1..0000000
--- a/downstream-Use-backported-version-of-OpenSSL-3-KDF-i.patch
+++ /dev/null
@@ -1,752 +0,0 @@
-From 040dd62418b918adc993b9cc3e1e80fc232286c4 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 15 Nov 2019 20:05:16 +0000
-Subject: [PATCH] [downstream] Use backported version of OpenSSL-3 KDF
- interface
-
-Last-updated: krb5-1.17
----
- src/configure.ac                              |   4 +
- src/lib/crypto/krb/derive.c                   | 356 +++++++++++++-----
- .../preauth/pkinit/pkinit_crypto_openssl.c    | 257 ++++++++-----
- 3 files changed, 428 insertions(+), 189 deletions(-)
-
-diff --git a/src/configure.ac b/src/configure.ac
-index d4e4da525..29be532cb 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -282,6 +282,10 @@ AC_SUBST(CRYPTO_IMPL)
- AC_SUBST(CRYPTO_IMPL_CFLAGS)
- AC_SUBST(CRYPTO_IMPL_LIBS)
- 
-+AC_CHECK_FUNCS(EVP_KDF_CTX_new_id EVP_KDF_ctrl EVP_KDF_derive,
-+               AC_DEFINE(OSSL_KDFS, 1, [Define if using OpenSSL KDFs]),
-+               AC_MSG_ERROR([backported OpenSSL KDFs not found]))
-+
- AC_ARG_WITH([prng-alg],
- AC_HELP_STRING([--with-prng-alg=ALG], [use specified PRNG algorithm. @<:@fortuna@:>@]),
- [PRNG_ALG=$withval
-diff --git a/src/lib/crypto/krb/derive.c b/src/lib/crypto/krb/derive.c
-index 6707a7308..915a173dd 100644
---- a/src/lib/crypto/krb/derive.c
-+++ b/src/lib/crypto/krb/derive.c
-@@ -27,6 +27,13 @@
- 
- #include "crypto_int.h"
- 
-+#ifdef OSSL_KDFS
-+#include <openssl/evp.h>
-+#include <openssl/kdf.h>
-+#else
-+#error "Refusing to build without OpenSSL KDFs!"
-+#endif
-+
- static krb5_key
- find_cached_dkey(struct derived_key *list, const krb5_data *constant)
- {
-@@ -77,55 +84,193 @@ cleanup:
-     return ENOMEM;
- }
- 
-+#ifdef OSSL_KDFS
- static krb5_error_code
--derive_random_rfc3961(const struct krb5_enc_provider *enc,
--                      krb5_key inkey, krb5_data *outrnd,
--                      const krb5_data *in_constant)
-+openssl_kbdkf_counter_hmac(const struct krb5_hash_provider *hash,
-+                           krb5_key inkey, krb5_data *outrnd,
-+                           const krb5_data *label, const krb5_data *context)
- {
--    size_t blocksize, keybytes, n;
-+    krb5_error_code ret = KRB5_CRYPTO_INTERNAL;
-+    EVP_KDF_CTX *ctx = NULL;
-+    const EVP_MD *digest;
-+
-+    if (!strcmp(hash->hash_name, "SHA1"))
-+        digest = EVP_sha1();
-+    else if (!strcmp(hash->hash_name, "SHA-256"))
-+        digest = EVP_sha256();
-+    else if (!strcmp(hash->hash_name, "SHA-384"))
-+        digest = EVP_sha384();
-+    else
-+        goto done;
-+
-+    ctx = EVP_KDF_CTX_new_id(EVP_KDF_KB);
-+    if (!ctx)
-+        goto done;
-+
-+    if (EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_MD, digest) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KB_MAC_TYPE,
-+                     EVP_KDF_KB_MAC_TYPE_HMAC) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KEY, inkey->keyblock.contents,
-+                     inkey->keyblock.length) != 1 ||
-+        (context->length > 0 &&
-+         EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KB_INFO, context->data,
-+                      context->length) != 1) ||
-+        (label->length > 0 &&
-+         EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_SALT, label->data,
-+                      label->length) != 1) ||
-+        EVP_KDF_derive(ctx, (unsigned char *)outrnd->data,
-+                       outrnd->length) != 1)
-+        goto done;
-+
-+    ret = 0;
-+done:
-+    if (ret)
-+        zap(outrnd->data, outrnd->length);
-+    EVP_KDF_CTX_free(ctx);
-+    return ret;
-+}
-+
-+static krb5_error_code
-+openssl_kbkdf_feedback_cmac(const struct krb5_enc_provider *enc,
-+                            krb5_key inkey, krb5_data *outrnd,
-+                            const krb5_data *in_constant)
-+{
-+    krb5_error_code ret = KRB5_CRYPTO_INTERNAL;
-+    EVP_KDF_CTX *ctx = NULL;
-+    const EVP_CIPHER *cipher;
-+    static unsigned char zeroes[16];
-+
-+    memset(zeroes, 0, sizeof(zeroes));
-+
-+    if (enc->keylength == 16)
-+        cipher = EVP_camellia_128_cbc();
-+    else if (enc->keylength == 32)
-+        cipher = EVP_camellia_256_cbc();
-+    else
-+        goto done;
-+
-+    ctx = EVP_KDF_CTX_new_id(EVP_KDF_KB);
-+    if (!ctx)
-+        goto done;
-+
-+    if (EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KB_MODE,
-+                     EVP_KDF_KB_MODE_FEEDBACK) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KB_MAC_TYPE,
-+                     EVP_KDF_KB_MAC_TYPE_CMAC) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_CIPHER, cipher) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KEY, inkey->keyblock.contents,
-+                     inkey->keyblock.length) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_SALT, in_constant->data,
-+                     in_constant->length) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KB_SEED, zeroes,
-+                     sizeof(zeroes)) != 1 ||
-+        EVP_KDF_derive(ctx, (unsigned char *)outrnd->data,
-+                       outrnd->length) != 1)
-+        goto done;
-+
-+    ret = 0;
-+done:
-+    if (ret)
-+        zap(outrnd->data, outrnd->length);
-+    EVP_KDF_CTX_free(ctx);
-+    return ret;
-+}
-+
-+static krb5_error_code
-+openssl_krb5kdf(const struct krb5_enc_provider *enc, krb5_key inkey,
-+                krb5_data *outrnd, const krb5_data *in_constant)
-+{
-+    krb5_error_code ret = KRB5_CRYPTO_INTERNAL;
-+    EVP_KDF_CTX *ctx = NULL;
-+    const EVP_CIPHER *cipher;
-+
-+    if (inkey->keyblock.length != enc->keylength ||
-+        outrnd->length != enc->keybytes) {
-+        return KRB5_CRYPTO_INTERNAL;
-+    }
-+
-+    if (enc->encrypt == krb5int_aes_encrypt && enc->keylength == 16)
-+        cipher = EVP_aes_128_cbc();
-+    else if (enc->encrypt == krb5int_aes_encrypt && enc->keylength == 32)
-+        cipher = EVP_aes_256_cbc();
-+    else if (enc->keylength == 24)
-+        cipher = EVP_des_ede3_cbc();
-+    else
-+        goto done;
-+
-+    ctx = EVP_KDF_CTX_new_id(EVP_KDF_KRB5KDF);
-+    if (ctx == NULL)
-+        goto done;
-+
-+    if (EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_CIPHER, cipher) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KEY, inkey->keyblock.contents,
-+                     inkey->keyblock.length) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KRB5KDF_CONSTANT,
-+                     in_constant->data, in_constant->length) != 1 ||
-+        EVP_KDF_derive(ctx, (unsigned char *)outrnd->data,
-+                       outrnd->length) != 1)
-+        goto done;
-+
-+    ret = 0;
-+done:
-+    if (ret)
-+        zap(outrnd->data, outrnd->length);
-+    EVP_KDF_CTX_free(ctx);
-+    return ret;
-+}
-+
-+#else /* OSSL_KDFS */
-+
-+/*
-+ * NIST SP800-108 KDF in counter mode (section 5.1).
-+ * Parameters:
-+ *   - HMAC (with hash as the hash provider) is the PRF.
-+ *   - A block counter of four bytes is used.
-+ *   - Four bytes are used to encode the output length in the PRF input.
-+ *
-+ * There are no uses requiring more than a single PRF invocation.
-+ */
-+static krb5_error_code
-+builtin_sp800_108_counter_hmac(const struct krb5_hash_provider *hash,
-+                               krb5_key inkey, krb5_data *outrnd,
-+                               const krb5_data *label,
-+                               const krb5_data *context)
-+{
-+    krb5_crypto_iov iov[5];
-     krb5_error_code ret;
--    krb5_data block = empty_data();
-+    krb5_data prf;
-+    unsigned char ibuf[4], lbuf[4];
- 
--    blocksize = enc->block_size;
--    keybytes = enc->keybytes;
--
--    if (blocksize == 1)
--        return KRB5_BAD_ENCTYPE;
--    if (inkey->keyblock.length != enc->keylength || outrnd->length != keybytes)
-+    if (hash == NULL || outrnd->length > hash->hashsize)
-         return KRB5_CRYPTO_INTERNAL;
- 
-     /* Allocate encryption data buffer. */
--    ret = alloc_data(&block, blocksize);
-+    ret = alloc_data(&prf, hash->hashsize);
-     if (ret)
-         return ret;
- 
--    /* Initialize the input block. */
--    if (in_constant->length == blocksize) {
--        memcpy(block.data, in_constant->data, blocksize);
--    } else {
--        krb5int_nfold(in_constant->length * 8,
--                      (unsigned char *) in_constant->data,
--                      blocksize * 8, (unsigned char *) block.data);
--    }
-+    /* [i]2: four-byte big-endian binary string giving the block counter (1) */
-+    iov[0].flags = KRB5_CRYPTO_TYPE_DATA;
-+    iov[0].data = make_data(ibuf, sizeof(ibuf));
-+    store_32_be(1, ibuf);
-+    /* Label */
-+    iov[1].flags = KRB5_CRYPTO_TYPE_DATA;
-+    iov[1].data = *label;
-+    /* 0x00: separator byte */
-+    iov[2].flags = KRB5_CRYPTO_TYPE_DATA;
-+    iov[2].data = make_data("", 1);
-+    /* Context */
-+    iov[3].flags = KRB5_CRYPTO_TYPE_DATA;
-+    iov[3].data = *context;
-+    /* [L]2: four-byte big-endian binary string giving the output length */
-+    iov[4].flags = KRB5_CRYPTO_TYPE_DATA;
-+    iov[4].data = make_data(lbuf, sizeof(lbuf));
-+    store_32_be(outrnd->length * 8, lbuf);
- 
--    /* Loop encrypting the blocks until enough key bytes are generated. */
--    n = 0;
--    while (n < keybytes) {
--        ret = encrypt_block(enc, inkey, &block);
--        if (ret)
--            goto cleanup;
--
--        if ((keybytes - n) <= blocksize) {
--            memcpy(outrnd->data + n, block.data, (keybytes - n));
--            break;
--        }
--
--        memcpy(outrnd->data + n, block.data, blocksize);
--        n += blocksize;
--    }
--
--cleanup:
--    zapfree(block.data, blocksize);
-+    ret = krb5int_hmac(hash, inkey, iov, 5, &prf);
-+    if (!ret)
-+        memcpy(outrnd->data, prf.data, outrnd->length);
-+    zapfree(prf.data, prf.length);
-     return ret;
- }
- 
-@@ -139,9 +284,9 @@ cleanup:
-  *   - Four bytes are used to encode the output length in the PRF input.
-  */
- static krb5_error_code
--derive_random_sp800_108_feedback_cmac(const struct krb5_enc_provider *enc,
--                                      krb5_key inkey, krb5_data *outrnd,
--                                      const krb5_data *in_constant)
-+builtin_sp800_108_feedback_cmac(const struct krb5_enc_provider *enc,
-+                                krb5_key inkey, krb5_data *outrnd,
-+                                const krb5_data *in_constant)
- {
-     size_t blocksize, keybytes, n;
-     krb5_crypto_iov iov[6];
-@@ -204,56 +349,94 @@ cleanup:
-     return ret;
- }
- 
--/*
-- * NIST SP800-108 KDF in counter mode (section 5.1).
-- * Parameters:
-- *   - HMAC (with hash as the hash provider) is the PRF.
-- *   - A block counter of four bytes is used.
-- *   - Four bytes are used to encode the output length in the PRF input.
-- *
-- * There are no uses requiring more than a single PRF invocation.
-- */
-+static krb5_error_code
-+builtin_derive_random_rfc3961(const struct krb5_enc_provider *enc,
-+                              krb5_key inkey, krb5_data *outrnd,
-+                              const krb5_data *in_constant)
-+{
-+    size_t blocksize, keybytes, n;
-+    krb5_error_code ret;
-+    krb5_data block = empty_data();
-+
-+    blocksize = enc->block_size;
-+    keybytes = enc->keybytes;
-+
-+    if (blocksize == 1)
-+        return KRB5_BAD_ENCTYPE;
-+    if (inkey->keyblock.length != enc->keylength || outrnd->length != keybytes)
-+        return KRB5_CRYPTO_INTERNAL;
-+
-+    /* Allocate encryption data buffer. */
-+    ret = alloc_data(&block, blocksize);
-+    if (ret)
-+        return ret;
-+
-+    /* Initialize the input block. */
-+    if (in_constant->length == blocksize) {
-+        memcpy(block.data, in_constant->data, blocksize);
-+    } else {
-+        krb5int_nfold(in_constant->length * 8,
-+                      (unsigned char *) in_constant->data,
-+                      blocksize * 8, (unsigned char *) block.data);
-+    }
-+
-+    /* Loop encrypting the blocks until enough key bytes are generated. */
-+    n = 0;
-+    while (n < keybytes) {
-+        ret = encrypt_block(enc, inkey, &block);
-+        if (ret)
-+            goto cleanup;
-+
-+        if ((keybytes - n) <= blocksize) {
-+            memcpy(outrnd->data + n, block.data, (keybytes - n));
-+            break;
-+        }
-+
-+        memcpy(outrnd->data + n, block.data, blocksize);
-+        n += blocksize;
-+    }
-+
-+cleanup:
-+    zapfree(block.data, blocksize);
-+    return ret;
-+}
-+#endif /* OSSL_KDFS */
-+
- krb5_error_code
- k5_sp800_108_counter_hmac(const struct krb5_hash_provider *hash,
-                           krb5_key inkey, krb5_data *outrnd,
-                           const krb5_data *label, const krb5_data *context)
- {
--    krb5_crypto_iov iov[5];
--    krb5_error_code ret;
--    krb5_data prf;
--    unsigned char ibuf[4], lbuf[4];
-+#ifdef OSSL_KDFS
-+    return openssl_kbdkf_counter_hmac(hash, inkey, outrnd, label, context);
-+#else
-+    return builtin_sp800_108_counter_hmac(hash, inkey, outrnd, label,
-+                                          context);
-+#endif
-+}
- 
--    if (hash == NULL || outrnd->length > hash->hashsize)
--        return KRB5_CRYPTO_INTERNAL;
-+static krb5_error_code
-+k5_sp800_108_feedback_cmac(const struct krb5_enc_provider *enc,
-+                           krb5_key inkey, krb5_data *outrnd,
-+                           const krb5_data *in_constant)
-+{
-+#ifdef OSSL_KDFS
-+    return openssl_kbkdf_feedback_cmac(enc, inkey, outrnd, in_constant);
-+#else
-+    return builtin_sp800_108_feedback_cmac(enc, inkey, outrnd, in_constant);
-+#endif
-+}
- 
--    /* Allocate encryption data buffer. */
--    ret = alloc_data(&prf, hash->hashsize);
--    if (ret)
--        return ret;
--
--    /* [i]2: four-byte big-endian binary string giving the block counter (1) */
--    iov[0].flags = KRB5_CRYPTO_TYPE_DATA;
--    iov[0].data = make_data(ibuf, sizeof(ibuf));
--    store_32_be(1, ibuf);
--    /* Label */
--    iov[1].flags = KRB5_CRYPTO_TYPE_DATA;
--    iov[1].data = *label;
--    /* 0x00: separator byte */
--    iov[2].flags = KRB5_CRYPTO_TYPE_DATA;
--    iov[2].data = make_data("", 1);
--    /* Context */
--    iov[3].flags = KRB5_CRYPTO_TYPE_DATA;
--    iov[3].data = *context;
--    /* [L]2: four-byte big-endian binary string giving the output length */
--    iov[4].flags = KRB5_CRYPTO_TYPE_DATA;
--    iov[4].data = make_data(lbuf, sizeof(lbuf));
--    store_32_be(outrnd->length * 8, lbuf);
--
--    ret = krb5int_hmac(hash, inkey, iov, 5, &prf);
--    if (!ret)
--        memcpy(outrnd->data, prf.data, outrnd->length);
--    zapfree(prf.data, prf.length);
--    return ret;
-+static krb5_error_code
-+k5_derive_random_rfc3961(const struct krb5_enc_provider *enc,
-+                         krb5_key inkey, krb5_data *outrnd,
-+                         const krb5_data *in_constant)
-+{
-+#ifdef OSSL_KDFS
-+    return openssl_krb5kdf(enc, inkey, outrnd, in_constant);
-+#else
-+    return builtin_derive_random_rfc3961(enc, inkey, outrnd, in_constant);
-+#endif
- }
- 
- krb5_error_code
-@@ -266,10 +449,9 @@ krb5int_derive_random(const struct krb5_enc_provider *enc,
- 
-     switch (alg) {
-     case DERIVE_RFC3961:
--        return derive_random_rfc3961(enc, inkey, outrnd, in_constant);
-+        return k5_derive_random_rfc3961(enc, inkey, outrnd, in_constant);
-     case DERIVE_SP800_108_CMAC:
--        return derive_random_sp800_108_feedback_cmac(enc, inkey, outrnd,
--                                                     in_constant);
-+        return k5_sp800_108_feedback_cmac(enc, inkey, outrnd, in_constant);
-     case DERIVE_SP800_108_HMAC:
-         return k5_sp800_108_counter_hmac(hash, inkey, outrnd, in_constant,
-                                          &empty);
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-index 52976895b..dd718c2be 100644
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -38,6 +38,13 @@
- #include <dirent.h>
- #include <arpa/inet.h>
- 
-+#ifdef OSSL_KDFS
-+#include <openssl/evp.h>
-+#include <openssl/kdf.h>
-+#else
-+#error "Refusing to build without OpenSSL KDFs!"
-+#endif
-+
- static krb5_error_code pkinit_init_pkinit_oids(pkinit_plg_crypto_context );
- static void pkinit_fini_pkinit_oids(pkinit_plg_crypto_context );
- 
-@@ -2331,11 +2338,51 @@ pkinit_alg_values(krb5_context context,
-     }
- } /* pkinit_alg_values() */
- 
-+#ifdef OSSL_KDFS
-+static krb5_error_code
-+openssl_sskdf(krb5_context context, size_t hash_bytes, krb5_data *key,
-+              krb5_data *info, char *out, size_t out_len)
-+{
-+    krb5_error_code ret = KRB5_CRYPTO_INTERNAL;
-+    EVP_KDF_CTX *ctx = NULL;
-+    const EVP_MD *digest;
- 
--/* pkinit_alg_agility_kdf() --
-- * This function generates a key using the KDF described in
-- * draft_ietf_krb_wg_pkinit_alg_agility-04.txt.  The algorithm is
-- * described as follows:
-+    /* RFC 8636 defines a SHA384 variant, but we don't use it. */
-+    if (hash_bytes == 20) {
-+        digest = EVP_sha1();
-+    } else if (hash_bytes == 32) {
-+        digest = EVP_sha256();
-+    } else if (hash_bytes == 64) {
-+        digest = EVP_sha512();
-+    } else {
-+        krb5_set_error_message(context, ret, "Bad hash type for SSKDF");
-+        goto done;
-+    }
-+
-+    ctx = EVP_KDF_CTX_new_id(EVP_KDF_SS);
-+    if (!ctx) {
-+        oerr(context, ret, _("Failed to instantiate SSKDF"));
-+        goto done;
-+    }
-+
-+    if (EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_MD, digest) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_KEY, key->data,
-+                     key->length) != 1 ||
-+        EVP_KDF_ctrl(ctx, EVP_KDF_CTRL_SET_SSKDF_INFO, info->data,
-+                     info->length) != 1 ||
-+        EVP_KDF_derive(ctx, (unsigned char *)out, out_len) != 1)
-+        goto done;
-+
-+    ret = 0;
-+done:
-+    EVP_KDF_CTX_free(ctx);
-+    return ret;
-+}
-+#else
-+/*
-+ * Generate a key using the KDF described in RFC 8636, also known as SSKDF
-+ * (single-step kdf).  Our caller precomputes `reps`, but otherwise the
-+ * algorithm is as follows:
-  *
-  *     1.  reps = keydatalen (K) / hash length (H)
-  *
-@@ -2349,95 +2396,16 @@ pkinit_alg_values(krb5_context context,
-  *
-  *     4.  Set key = Hash1 || Hash2 || ... so that length of key is K bytes.
-  */
--krb5_error_code
--pkinit_alg_agility_kdf(krb5_context context,
--                       krb5_data *secret,
--                       krb5_data *alg_oid,
--                       krb5_const_principal party_u_info,
--                       krb5_const_principal party_v_info,
--                       krb5_enctype enctype,
--                       krb5_data *as_req,
--                       krb5_data *pk_as_rep,
--                       krb5_keyblock *key_block)
-+static krb5_error_code
-+builtin_sskdf(krb5_context context, unsigned int reps, size_t hash_len,
-+              const EVP_MD *(*EVP_func)(void), krb5_data *secret,
-+              krb5_data *other_info, char *out, size_t out_len)
- {
-     krb5_error_code retval = 0;
- 
--    unsigned int reps = 0;
--    uint32_t counter = 1;       /* Does this type work on Windows? */
-+    uint32_t counter = 1;
-     size_t offset = 0;
--    size_t hash_len = 0;
--    size_t rand_len = 0;
--    size_t key_len = 0;
--    krb5_data random_data;
--    krb5_sp80056a_other_info other_info_fields;
--    krb5_pkinit_supp_pub_info supp_pub_info_fields;
--    krb5_data *other_info = NULL;
--    krb5_data *supp_pub_info = NULL;
--    krb5_algorithm_identifier alg_id;
-     EVP_MD_CTX *ctx = NULL;
--    const EVP_MD *(*EVP_func)(void);
--
--    /* initialize random_data here to make clean-up safe */
--    random_data.length = 0;
--    random_data.data = NULL;
--
--    /* allocate and initialize the key block */
--    key_block->magic = 0;
--    key_block->enctype = enctype;
--    if (0 != (retval = krb5_c_keylengths(context, enctype, &rand_len,
--                                         &key_len)))
--        goto cleanup;
--
--    random_data.length = rand_len;
--    key_block->length = key_len;
--
--    if (NULL == (key_block->contents = malloc(key_block->length))) {
--        retval = ENOMEM;
--        goto cleanup;
--    }
--
--    memset (key_block->contents, 0, key_block->length);
--
--    /* If this is anonymous pkinit, use the anonymous principle for party_u_info */
--    if (party_u_info && krb5_principal_compare_any_realm(context, party_u_info,
--                                                         krb5_anonymous_principal()))
--        party_u_info = (krb5_principal)krb5_anonymous_principal();
--
--    if (0 != (retval = pkinit_alg_values(context, alg_oid, &hash_len, &EVP_func)))
--        goto cleanup;
--
--    /* 1.  reps = keydatalen (K) / hash length (H) */
--    reps = key_block->length/hash_len;
--
--    /* ... and round up, if necessary */
--    if (key_block->length > (reps * hash_len))
--        reps++;
--
--    /* Allocate enough space in the random data buffer to hash directly into
--     * it, even if the last hash will make it bigger than the key length. */
--    if (NULL == (random_data.data = malloc(reps * hash_len))) {
--        retval = ENOMEM;
--        goto cleanup;
--    }
--
--    /* Encode the ASN.1 octet string for "SuppPubInfo" */
--    supp_pub_info_fields.enctype = enctype;
--    supp_pub_info_fields.as_req = *as_req;
--    supp_pub_info_fields.pk_as_rep = *pk_as_rep;
--    if (0 != ((retval = encode_krb5_pkinit_supp_pub_info(&supp_pub_info_fields,
--                                                         &supp_pub_info))))
--        goto cleanup;
--
--    /* Now encode the ASN.1 octet string for "OtherInfo" */
--    memset(&alg_id, 0, sizeof alg_id);
--    alg_id.algorithm = *alg_oid; /*alias*/
--
--    other_info_fields.algorithm_identifier = alg_id;
--    other_info_fields.party_u_info = (krb5_principal) party_u_info;
--    other_info_fields.party_v_info = (krb5_principal) party_v_info;
--    other_info_fields.supp_pub_info = *supp_pub_info;
--    if (0 != (retval = encode_krb5_sp80056a_other_info(&other_info_fields, &other_info)))
--        goto cleanup;
- 
-     /* 2.  Initialize a 32-bit, big-endian bit string counter as 1.
-      * 3.  For i = 1 to reps by 1, do the following:
-@@ -2471,8 +2439,9 @@ pkinit_alg_agility_kdf(krb5_context context,
-             goto cleanup;
-         }
- 
--        /* 4.  Set key = Hash1 || Hash2 || ... so that length of key is K bytes. */
--        if (!EVP_DigestFinal(ctx, (uint8_t *)random_data.data + offset, &s)) {
-+        /* 4.  Set key = Hash1 || Hash2 || ... so that length of key is K
-+         * bytes. */
-+        if (!EVP_DigestFinal(ctx, (unsigned char *)out + offset, &s)) {
-             krb5_set_error_message(context, KRB5_CRYPTO_INTERNAL,
-                                    "Call to OpenSSL EVP_DigestUpdate() returned an error.");
-             retval = KRB5_CRYPTO_INTERNAL;
-@@ -2484,26 +2453,110 @@ pkinit_alg_agility_kdf(krb5_context context,
-         EVP_MD_CTX_free(ctx);
-         ctx = NULL;
-     }
--
--    retval = krb5_c_random_to_key(context, enctype, &random_data,
--                                  key_block);
--
- cleanup:
-     EVP_MD_CTX_free(ctx);
-+    return retval;
-+} /* builtin_sskdf() */
-+#endif /* OSSL_KDFS */
- 
--    /* If this has been an error, free the allocated key_block, if any */
--    if (retval) {
--        krb5_free_keyblock_contents(context, key_block);
-+/* id-pkinit-kdf family, as specified by RFC 8636. */
-+krb5_error_code
-+pkinit_alg_agility_kdf(krb5_context context, krb5_data *secret,
-+                       krb5_data *alg_oid, krb5_const_principal party_u_info,
-+                       krb5_const_principal party_v_info,
-+                       krb5_enctype enctype, krb5_data *as_req,
-+                       krb5_data *pk_as_rep, krb5_keyblock *key_block)
-+{
-+    krb5_error_code retval;
-+    size_t hash_len = 0, rand_len = 0, key_len = 0;
-+    const EVP_MD *(*EVP_func)(void);
-+    krb5_sp80056a_other_info other_info_fields;
-+    krb5_pkinit_supp_pub_info supp_pub_info_fields;
-+    krb5_data *other_info = NULL, *supp_pub_info = NULL;
-+    krb5_data random_data = empty_data();
-+    krb5_algorithm_identifier alg_id;
-+    unsigned int reps;
-+
-+    /* Allocate and initialize the key block. */
-+    key_block->magic = 0;
-+    key_block->enctype = enctype;
-+
-+    /* Use separate variables to avoid alignment restriction problems. */
-+    retval = krb5_c_keylengths(context, enctype, &rand_len, &key_len);
-+    if (retval)
-+        goto cleanup;
-+    random_data.length = rand_len;
-+    key_block->length = key_len;
-+
-+    key_block->contents = k5calloc(key_block->length, 1, &retval);
-+    if (key_block->contents == NULL)
-+        goto cleanup;
-+
-+    /* If this is anonymous pkinit, use the anonymous principle for
-+     * party_u_info. */
-+    if (party_u_info &&
-+        krb5_principal_compare_any_realm(context, party_u_info,
-+                                         krb5_anonymous_principal())) {
-+        party_u_info = (krb5_principal)krb5_anonymous_principal();
-     }
- 
--    /* free other allocated resources, either way */
--    if (random_data.data)
--        free(random_data.data);
-+    retval = pkinit_alg_values(context, alg_oid, &hash_len, &EVP_func);
-+    if (retval)
-+        goto cleanup;
-+
-+    /* 1.  reps = keydatalen (K) / hash length (H) */
-+    reps = key_block->length / hash_len;
-+
-+    /* ... and round up, if necessary. */
-+    if (key_block->length > (reps * hash_len))
-+        reps++;
-+
-+    /* Allocate enough space in the random data buffer to hash directly into
-+     * it, even if the last hash will make it bigger than the key length. */
-+    random_data.data = k5alloc(reps * hash_len, &retval);
-+    if (random_data.data == NULL)
-+        goto cleanup;
-+
-+    /* Encode the ASN.1 octet string for "SuppPubInfo". */
-+    supp_pub_info_fields.enctype = enctype;
-+    supp_pub_info_fields.as_req = *as_req;
-+    supp_pub_info_fields.pk_as_rep = *pk_as_rep;
-+    retval = encode_krb5_pkinit_supp_pub_info(&supp_pub_info_fields,
-+                                              &supp_pub_info);
-+    if (retval)
-+        goto cleanup;
-+
-+    /* Now encode the ASN.1 octet string for "OtherInfo". */
-+    memset(&alg_id, 0, sizeof(alg_id));
-+    alg_id.algorithm = *alg_oid;
-+    other_info_fields.algorithm_identifier = alg_id;
-+    other_info_fields.party_u_info = (krb5_principal)party_u_info;
-+    other_info_fields.party_v_info = (krb5_principal)party_v_info;
-+    other_info_fields.supp_pub_info = *supp_pub_info;
-+    retval = encode_krb5_sp80056a_other_info(&other_info_fields, &other_info);
-+    if (retval)
-+        goto cleanup;
-+
-+#ifdef OSSL_KDFS
-+    retval = openssl_sskdf(context, hash_len, secret, other_info,
-+                           random_data.data, key_block->length);
-+#else
-+    retval = builtin_sskdf(context, reps, hash_len, EVP_func, secret,
-+                           other_info, random_data.data, key_block->length);
-+#endif
-+    if (retval)
-+        goto cleanup;
-+
-+    retval = krb5_c_random_to_key(context, enctype, &random_data, key_block);
-+cleanup:
-+    if (retval)
-+        krb5_free_keyblock_contents(context, key_block);
-+
-+    zapfree(random_data.data, random_data.length);
-     krb5_free_data(context, other_info);
-     krb5_free_data(context, supp_pub_info);
--
-     return retval;
--} /*pkinit_alg_agility_kdf() */
-+}
- 
- /* Call DH_compute_key() and ensure that we left-pad short results instead of
-  * leaving junk bytes at the end of the buffer. */
diff --git a/downstream-netlib-and-dns.patch b/downstream-netlib-and-dns.patch
deleted file mode 100644
index 05bddc4..0000000
--- a/downstream-netlib-and-dns.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4254bee1b97edeb0848efce635bcf1b56306f968 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 23 Aug 2016 16:46:21 -0400
-Subject: [PATCH] [downstream] netlib and dns
-
-We want to be able to use --with-netlib and --enable-dns at the same time.
-
-Last-updated: krb5-1.3.1
----
- src/aclocal.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/aclocal.m4 b/src/aclocal.m4
-index 6796fec53..c4358988a 100644
---- a/src/aclocal.m4
-+++ b/src/aclocal.m4
-@@ -724,6 +724,7 @@ AC_HELP_STRING([--with-netlib=LIBS], use user defined resolver library),
- 	LIBS="$LIBS $withval"
- 	AC_MSG_RESULT("netlib will use \'$withval\'")
-   fi
-+  KRB5_AC_ENABLE_DNS
- ],dnl
- [AC_LIBRARY_NET]
- )])dnl
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..af37a4c
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+- fedora-*
+decision_contexts:
+- bodhi_update_push_stable
+subject_type: koji_build
+rules:
+- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tests.functional}
diff --git a/kadmin.service b/kadmin.service
index f1677c6..daa08b1 100644
--- a/kadmin.service
+++ b/kadmin.service
@@ -6,9 +6,9 @@ AssertPathExists=!/var/kerberos/krb5kdc/kpropd.acl
 
 [Service]
 Type=forking
-PIDFile=/var/run/kadmind.pid
+PIDFile=/run/kadmind.pid
 EnvironmentFile=-/etc/sysconfig/kadmin
-ExecStart=/usr/sbin/kadmind -P /var/run/kadmind.pid $KADMIND_ARGS
+ExecStart=/usr/sbin/kadmind -P /run/kadmind.pid $KADMIND_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/kdc.conf b/kdc.conf
index 5d1571d..7b788e5 100644
--- a/kdc.conf
+++ b/kdc.conf
@@ -1,3 +1,7 @@
+[libdefaults]
+# Allow RC4 HMAC-MD5 for session keys (see CVE-2022-37966)
+#allow_rc4 = true
+
 [kdcdefaults]
     kdc_ports = 88
     kdc_tcp_ports = 88
@@ -5,10 +9,12 @@
 
 [realms]
 EXAMPLE.COM = {
-     #master_key_type = aes256-cts
+     master_key_type = aes256-cts-hmac-sha384-192
      acl_file = /var/kerberos/krb5kdc/kadm5.acl
      dict_file = /usr/share/dict/words
      default_principal_flags = +preauth
      admin_keytab = /var/kerberos/krb5kdc/kadm5.keytab
-     supported_enctypes = aes256-cts:normal aes128-cts:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal
+     supported_enctypes = aes256-cts-hmac-sha384-192:normal aes128-cts-hmac-sha256-128:normal aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal camellia256-cts-cmac:normal camellia128-cts-cmac:normal arcfour-hmac-md5:normal
+     # Supported encryption types for FIPS mode:
+     #supported_enctypes = aes256-cts-hmac-sha384-192:normal aes128-cts-hmac-sha256-128:normal
 }
diff --git a/krb5-krb5kdc.conf b/krb5-krb5kdc.conf
index eadeb51..5160b28 100644
--- a/krb5-krb5kdc.conf
+++ b/krb5-krb5kdc.conf
@@ -1 +1 @@
-d /var/run/krb5kdc 0755 root root
+d /run/krb5kdc 0755 root root
diff --git a/krb5-tests b/krb5-tests
new file mode 100644
index 0000000..6754f3f
--- /dev/null
+++ b/krb5-tests
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+export RPM_PACKAGE_NAME={{ name }}
+export RPM_PACKAGE_VERSION={{ version }}
+export RPM_PACKAGE_RELEASE={{ release }}
+export RPM_ARCH={{ arch }}
+export RPM_BUILD_NCPUS="$(getconf _NPROCESSORS_ONLN)"
+
+testdir="$(mktemp -d)"
+trap "rm -rf ${testdir}" EXIT
+
+build_flags="$(eval "echo $(rpm --eval '%{_smp_mflags}')")"
+
+mkdir "${testdir}/{{ name }}-tests"
+cp -rp /usr/share/{{ name }}-tests/{{ arch }} "${testdir}/{{ name }}-tests/"
+make -C "${testdir}/{{ name }}-tests/{{ arch }}/" $build_flags
+keyctl session - make -C "${testdir}/{{ name }}-tests/{{ arch }}/" check
diff --git a/krb5.spec b/krb5.spec
index dd4152d..4c5b542 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -1,5 +1,3 @@
-%global WITH_DIRSRV 1
-
 # Set this so that find-lang.sh will recognize the .po files.
 %global gettext_domain mit-krb5
 # Guess where the -libs subpackage's docs are going to go.
@@ -8,109 +6,135 @@
 %global configure_default_ccache_name 1
 %global configured_default_ccache_name KEYRING:persistent:%%{uid}
 
-# leave empty or set to e.g., -beta2
-%global prerelease %{nil}
+# Use baserelease to set the release number!
+#
+# baserelease is what we have standardized across Fedora and what
+# rpmdev-bumpspec knows how to handle.
+%global baserelease 11
+
+# This should be e.g. beta1 or %%nil
+%global pre_release %nil
+
+%global krb5_release %{baserelease}
+%if "x%{?pre_release}" != "x"
+%global krb5_release 0.%{baserelease}.%{pre_release}
+%global krb5_pre_release -%{pre_release}
+%endif
+
+%global krb5_version_major 1
+%global krb5_version_minor 21
+# For a release without a patch number set to %%nil
+%global krb5_version_patch 3
+
+%global krb5_version_major_minor %{krb5_version_major}.%{krb5_version_minor}
+%global krb5_version %{krb5_version_major_minor}
+%if "x%{?krb5_version_patch}" != "x"
+%global krb5_version %{krb5_version_major_minor}.%{krb5_version_patch}
+%endif
 
 # Should be in form 5.0, 6.1, etc.
-%global kdbversion 8.0
+%global kdbversion 9.0
 
 Summary: The Kerberos network authentication system
 Name: krb5
-Version: 1.18.2
-# for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
-Release: 29%{?dist}
+Version: %{krb5_version}
+Release: %{krb5_release}%{?dist}
 
 # rharwood has trust path to signing key and verifies on check-in
-Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}%{prerelease}.tar.gz
-Source1: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}%{prerelease}.tar.gz.asc
+Source0: https://web.mit.edu/kerberos/dist/krb5/%{krb5_version_major_minor}/krb5-%{krb5_version}%{?krb5_pre_release}.tar.gz
+Source1: https://web.mit.edu/kerberos/dist/krb5/%{krb5_version_major_minor}/krb5-%{krb5_version}%{?krb5_pre_release}.tar.gz.asc
 
-# Numbering is a relic of old init systems etc.  It's easiest to just leave.
 Source2: kprop.service
-Source4: kadmin.service
-Source5: krb5kdc.service
-Source6: krb5.conf
-Source10: kdc.conf
-Source11: kadm5.acl
-Source19: krb5kdc.sysconfig
-Source20: kadmin.sysconfig
-Source21: kprop.sysconfig
-Source29: ksu.pamd
-Source33: krb5kdc.logrotate
-Source34: kadmind.logrotate
-Source39: krb5-krb5kdc.conf
+Source3: kadmin.service
+Source4: krb5kdc.service
+Source5: krb5.conf
+Source6: kdc.conf
+Source7: kadm5.acl
+Source8: krb5kdc.sysconfig
+Source9: kadmin.sysconfig
+Source10: kprop.sysconfig
+Source11: ksu.pamd
+Source12: krb5kdc.logrotate
+Source13: kadmind.logrotate
+Source14: krb5-krb5kdc.conf
+Source15: %{name}-tests
 
-Patch0: downstream-ksu-pam-integration.patch
-Patch1: downstream-SELinux-integration.patch
-Patch2: downstream-Adjust-build-configuration.patch
-Patch3: downstream-netlib-and-dns.patch
-Patch4: downstream-fix-debuginfo-with-y.tab.c.patch
-Patch5: downstream-Remove-3des-support.patch
-Patch6: downstream-Use-backported-version-of-OpenSSL-3-KDF-i.patch
-Patch7: downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
-Patch9: Allow-certauth-modules-to-set-hw-authent-flag.patch
-Patch11: Refresh-manually-acquired-creds-from-client-keytab.patch
-Patch13: Add-finalization-safety-check-to-com_err.patch
-Patch14: Eliminate-redundant-PKINIT-responder-invocation.patch
-Patch15: Correctly-import-service-GSS-host-based-name.patch
-Patch16: Do-expiration-warnings-for-all-init_creds-APIs.patch
-Patch17: Pass-gss_localname-through-SPNEGO.patch
-Patch18: Omit-KDC-indicator-check-for-S4U2Self-requests.patch
-Patch19: Fix-typo-in-in-in-the-ksu-man-page.patch
-Patch21: Replace-gssrpc-tests-with-a-Python-script.patch
-Patch22: Default-dns_canonicalize_hostname-to-fallback.patch
-Patch23: Remove-resolver-test-utility.patch
-Patch24: Omit-PA_FOR_USER-if-we-can-t-compute-its-checksum.patch
-Patch25: Improve-negoex_parse_token-code-hygiene.patch
-Patch26: Refactor-krb5-GSS-checksum-handling.patch
-Patch27: Implement-GSS_C_CHANNEL_BOUND_FLAG.patch
-Patch28: Implement-KERB_AP_OPTIONS_CBT-server-side.patch
-Patch29: Add-client_aware_channel_bindings-option.patch
-Patch30: Pass-channel-bindings-through-SPNEGO.patch
-Patch31: Add-channel-bindings-tests.patch
-Patch32: Use-two-queues-for-concurrent-t_otp.py-daemons.patch
-Patch33: Allow-gss_unwrap_iov-of-unpadded-RC4-tokens.patch
-Patch34: Ignore-bad-enctypes-in-krb5_string_to_keysalts.patch
-Patch35: Fix-leak-in-KERB_AP_OPTIONS_CBT-server-support.patch
-Patch36: Fix-input-length-checking-in-SPNEGO-DER-decoding.patch
-Patch37: Add-three-kvno-options-from-Heimdal-kgetcred.patch
-Patch38: Unify-kvno-option-documentation.patch
-Patch39: Improve-KDC-alias-checking-for-S4U-requests.patch
-Patch40: Adjust-KDC-alias-helper-function-contract.patch
-Patch41: Allow-aliases-when-matching-U2U-second-ticket.patch
-Patch42: Refactor-KDC-authdata-list-management-helpers.patch
-Patch43: Avoid-passing-DB-entry-structures-in-KDC.patch
-Patch44: Minimize-usage-of-tgs_server-in-KDC.patch
-Patch45: Fix-minor-static-analysis-defects.patch
-Patch46: Add-recursion-limit-for-ASN.1-indefinite-lengths.patch
+Patch0001: 0001-downstream-Revert-Don-t-issue-session-keys-with-depr.patch
+Patch0002: 0002-downstream-ksu-pam-integration.patch
+Patch0003: 0003-downstream-SELinux-integration.patch
+Patch0004: 0004-downstream-fix-debuginfo-with-y.tab.c.patch
+Patch0005: 0005-downstream-Remove-3des-support.patch
+Patch0006: 0006-downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
+Patch0007: 0007-downstream-Allow-krad-UDP-TCP-localhost-connection-w.patch
+Patch0008: 0008-downstream-Make-tests-compatible-with-sssd_krb5_loca.patch
+Patch0009: 0009-downstream-Include-missing-OpenSSL-FIPS-header.patch
+Patch0010: 0010-downstream-Do-not-set-root-as-ksu-file-owner.patch
+Patch0011: 0011-downstream-Allow-KRB5KDF-MD5-and-MD4-in-FIPS-mode.patch
+Patch0012: 0012-downstream-Allow-to-set-PAC-ticket-signature-as-opti.patch
+Patch0013: 0013-downstream-Make-PKINIT-CMS-SHA-1-signature-verificat.patch
+Patch0014: 0014-Enable-PKINIT-if-at-least-one-group-is-available.patch
+Patch0015: 0015-Replace-ssl.wrap_socket-for-tests.patch
+Patch0016: 0016-Eliminate-old-style-function-declarations.patch
+Patch0017: 0017-Fix-two-unlikely-memory-leaks.patch
+Patch0018: 0018-Fix-unimportant-memory-leaks.patch
+Patch0019: 0019-Remove-klist-s-defname-global-variable.patch
+Patch0020: 0020-End-connection-on-KDC_ERR_SVC_UNAVAILABLE.patch
+Patch0021: 0021-Add-request_timeout-configuration-parameter.patch
+Patch0022: 0022-Wait-indefinitely-on-KDC-TCP-connections.patch
+Patch0023: 0023-Remove-PKINIT-RSA-support.patch
+Patch0024: 0024-Fix-various-issues-detected-by-static-analysis.patch
+Patch0025: 0025-Generate-and-verify-message-MACs-in-libkrad.patch
+Patch0026: 0026-PKINIT-ECDH-support.patch
+Patch0027: 0027-Add-ecdsa-with-sha512-256-to-supportedCMSTypes.patch
+Patch0028: 0028-Get-rid-of-pkinit_crypto_openssl.h.patch
+Patch0029: 0029-Use-SoftHSMv2-for-PKCS11-PKINIT-tests.patch
+Patch0030: 0030-Simplify-PKINIT-cert-representation.patch
+Patch0031: 0031-Support-PKCS11-EC-client-certs-in-PKINIT.patch
+Patch0032: 0032-Improve-PKCS11-error-reporting-in-PKINIT.patch
+Patch0033: 0033-Set-missing-mask-flags-for-kdb5_util-operations.patch
+Patch0034: 0034-Prevent-overflow-when-calculating-ulog-block-size.patch
+Patch0035: 0035-Don-t-issue-session-keys-with-deprecated-enctypes.patch
+Patch0036: 0036-downstream-Remove-3des-support-cumulative-1.patch
+Patch0037: 0037-Add-PKINIT-paChecksum2-from-MS-PKCA-v20230920.patch
+Patch0038: 0038-downstream-Do-not-block-HMAC-MD4-5-in-FIPS-mode.patch
+Patch0039: 0039-Fix-strchr-conformance-to-C23.patch
+Patch0040: 0040-automated-fast.patch
+Patch0041: 0041-bail-if-prompter-is-not-specified-but-required.patch
 
-License: MIT
+License: Brian-Gladman-2-Clause AND BSD-2-Clause AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-first-lines AND BSD-3-Clause AND BSD-4-Clause AND CMU-Mach-nodoc AND FSFULLRWD AND HPND AND HPND-export2-US AND HPND-export-US AND HPND-export-US-acknowledgement AND HPND-export-US-modify AND ISC AND MIT AND MIT-CMU AND OLDAP-2.8 AND OpenVision
 URL: https://web.mit.edu/kerberos/www/
-BuildRequires: autoconf, bison, cmake, flex, gawk, gettext, pkgconfig, sed
+BuildRequires: autoconf, bison, make, flex, gawk, gettext, pkgconfig, sed
 BuildRequires: gcc, gcc-c++
 BuildRequires: libcom_err-devel, libedit-devel, libss-devel
 BuildRequires: gzip, ncurses-devel
-BuildRequires: python3-sphinx
+BuildRequires: python3, python3-sphinx
 BuildRequires: keyutils, keyutils-libs-devel >= 1.5.8
 BuildRequires: libselinux-devel
 BuildRequires: pam-devel
 BuildRequires: systemd-units
+BuildRequires: tcl-devel
+BuildRequires: libverto-devel
+BuildRequires: openldap-devel
+BuildRequires: lmdb-devel
+BuildRequires: perl-interpreter
 
 # For autosetup
 BuildRequires: git
 
-# For the test framework.
-BuildRequires: perl-interpreter, dejagnu, tcl-devel, python3
-BuildRequires: net-tools, rpcbind
-BuildRequires: hostname
-BuildRequires: iproute
-BuildRequires: libverto-devel
-BuildRequires: openldap-devel
-BuildRequires: lmdb-devel
-BuildRequires: python3-pyrad
-
+%if 0%{?fedora} > 35 || 0%{?rhel} >= 9
+# Need KDFs.  This is the "real" version
+BuildRequires: openssl-devel >= 1:3.0.0
+%else
 # Need KDFs.  This is the backported version
 BuildRequires: openssl-devel >= 1:1.1.1d-4
 BuildRequires: openssl-devel < 1:3.0.0
+%endif
+
+# Enable compilation of optional tests
+BuildRequires: resolv_wrapper
+BuildRequires: libcmocka-devel
+BuildRequires: opensc
+BuildRequires: softhsm
 
 %description
 Kerberos V5 is a trusted-third-party network authentication system,
@@ -136,8 +160,13 @@ to install this package.
 
 %package libs
 Summary: The non-admin shared libraries used by Kerberos 5
+%if 0%{?fedora} > 35 || 0%{?rhel} >= 9
+Requires: openssl-libs >= 1:3.0.0
+%else
 Requires: openssl-libs >= 1:1.1.1d-4
-Requires: coreutils, gawk, grep, sed
+Requires: openssl-libs < 1:3.0.0
+%endif
+Requires: coreutils
 Requires: keyutils-libs >= 1.5.8
 Requires: /etc/crypto-policies/back-ends/krb5.config
 
@@ -149,13 +178,14 @@ Kerberos, you need to install this package.
 %package server
 Summary: The KDC and related programs for Kerberos 5
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-pkinit%{?_isa} = %{version}-%{release}
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 # we drop files in its directory, but we don't want to own that directory
 Requires: logrotate
-# we specify /usr/share/dict/words as the default dict_file in kdc.conf
-Requires: /usr/share/dict/words
+# we specify /usr/share/dict/words (provided by words) as the default dict_file in kdc.conf
+Requires: words
 # for run-time, and for parts of the test suite
 BuildRequires: libverto-module-base
 Requires: libverto-module-base
@@ -185,6 +215,7 @@ realm, you need to install this package.
 %package workstation
 Summary: Kerberos 5 programs for use on workstations
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-pkinit%{?_isa} = %{version}-%{release}
 Requires: libkadm5%{?_isa} = %{version}-%{release}
 
 %description workstation
@@ -214,8 +245,57 @@ Kerberos is a network authentication system. The libkadm5 package
 contains only the libkadm5clnt and libkadm5serv shared objects. This
 interface is not considered stable.
 
+%package tests
+Summary: Test sources for krb5 build
+
+# Build dependencies
+Requires: coreutils, gawk, sed
+Requires: gcc-c++
+Requires: gettext
+Requires: libcom_err-devel
+Requires: libselinux-devel
+Requires: libss-devel
+Requires: libverto-devel
+Requires: lmdb-devel
+Requires: openldap-devel
+Requires: pam-devel
+Requires: redhat-rpm-config
+%if 0%{?fedora} > 35 || 0%{?rhel} >= 9
+Requires: openssl-devel >= 1:3.0.0
+%else
+Requires: openssl-devel >= 1:1.1.1d-4
+Requires: openssl-devel < 1:3.0.0
+%endif
+
+# Test dependencies
+Requires: dejagnu
+Requires: hostname
+Requires: iproute
+Requires: keyutils, keyutils-libs-devel >= 1.5.8
+Requires: libcmocka-devel
+Requires: libverto-module-base
+Requires: logrotate
+Requires: net-tools, rpcbind
+Requires: perl-interpreter
+Requires: procps-ng
+Requires: python3-kdcproxy
+Requires: resolv_wrapper
+Requires: /etc/crypto-policies/back-ends/krb5.config
+Requires: words
+Requires: opensc
+Requires: softhsm
+Recommends: python3-pyrad
+
+# Restore once openldap upstream tests are fixed
+#Recommends: openldap-servers
+#Recommends: openldap-clients
+
+%description tests
+FOR TESTING PURPOSE ONLY
+Test sources for krb5 build, with pre-defined compilation parameters
+
 %prep
-%autosetup -S git -n %{name}-%{version}%{prerelease}
+%autosetup -S git_am -n %{name}-%{version}%{?dashpre}
 ln NOTICE LICENSE
 
 # Generate an FDS-compatible LDIF file.
@@ -234,10 +314,7 @@ popd
 
 # Mess with some of the default ports that we use for testing, so that multiple
 # builds going on the same host don't step on each other.
-cfg="src/kadmin/testing/proto/kdc.conf.proto \
-     src/kadmin/testing/proto/krb5.conf.proto \
-     src/lib/kadm5/unit-test/api.current/init-v2.exp \
-     src/util/k5test.py"
+cfg="src/util/k5test.py"
 LONG_BIT=`getconf LONG_BIT`
 PORT=`expr 61000 + $LONG_BIT - 48`
 sed -i -e s,61000,`expr "$PORT" + 0`,g $cfg
@@ -253,14 +330,21 @@ PORT=`expr 7777 + $LONG_BIT - 48`
 sed -i -e s,7777,`expr "$PORT" + 0`,g $cfg
 sed -i -e s,7778,`expr "$PORT" + 1`,g $cfg
 
+# Fix kadmind port hard-coded in tests
+PORT=`expr 61000 + $LONG_BIT - 48`
+sed -i -e \
+    "s,params.kadmind_port = 61001;,params.kadmind_port = $((PORT + 1));," \
+    src/lib/kadm5/t_kadm5.c
+
+
 %build
 # Go ahead and supply tcl info, because configure doesn't know how to find it.
 source %{_libdir}/tclConfig.sh
 pushd src
 
-# Set this so that configure will have a value even if the current version of
-# autoconf doesn't set one.
-export runstatedir=%{_localstatedir}/run
+# This should be safe to remove once we have autoconf >= 2.70
+export runstatedir=/run
+
 # Work out the CFLAGS and CPPFLAGS which we intend to use.
 INCLUDES=-I%{_includedir}/et
 CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC -fno-strict-aliasing -fstack-protector-all`"
@@ -270,19 +354,18 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
     CFLAGS="$CFLAGS" \
     CPPFLAGS="$CPPFLAGS" \
     SS_LIB="-lss" \
+    PKCS11_MODNAME="p11-kit-proxy.so" \
     --enable-shared \
+    --runstatedir=/run \
     --localstatedir=%{_var}/kerberos \
     --disable-rpath \
     --without-krb5-config \
     --with-system-et \
     --with-system-ss \
-    --with-netlib=-lresolv \
     --with-tcl \
     --enable-dns-for-realm \
     --with-ldap \
-%if %{WITH_DIRSRV}
     --with-dirsrv-account-locking \
-%endif
     --enable-pkinit \
     --with-crypto-impl=openssl \
     --with-tls-impl=openssl \
@@ -292,17 +375,27 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
     --with-prng-alg=os \
     --with-lmdb \
     || (cat config.log; exit 1)
-# Now build it.
-make
-popd
+
+# Check we have required features enabled
+for x in DNS_LOOKUP DNS_LOOKUP_REALM; do
+    grep -q "#define KRB5_${x} 1" include/autoconf.h
+done
 
 # Sanity check the KDC_RUN_DIR.
-configured_kdcrundir=`grep KDC_RUN_DIR src/include/osconf.h | awk '{print $NF}'`
-configured_kdcrundir=`eval echo $configured_kdcrundir`
-if test "$configured_kdcrundir" != %{_localstatedir}/run/krb5kdc ; then
+pushd include
+make osconf.h
+popd
+configured_dir=`grep KDC_RUN_DIR include/osconf.h | awk '{print $NF}'`
+configured_dir=`eval echo $configured_dir`
+if test "$configured_dir" != /run/krb5kdc ; then
+    echo Failed to configure KDC_RUN_DIR.
     exit 1
 fi
 
+# Build fast, but get better errors if we fail
+make %{?_smp_mflags} || make -j1
+popd
+
 # Build the docs.
 make -C src/doc paths.py version.py
 cp src/doc/paths.py doc/
@@ -311,39 +404,20 @@ sphinx-build -a -b man   -t pathsubs doc build-man
 sphinx-build -a -b html  -t pathsubs doc build-html
 rm -fr build-html/_sources
 
-%check
-
-# There are 0 test machines for this architecture, very few builders, and
-# they're not very well provisioned / maintained.  I can't support it.
-# Patches welcome, but there's nothing I can do - it fails more than half the
-# time for no discernable reason.
-%ifnarch s390x
-pushd src
-
-# ugh.  COPR doesn't expose the keyring, so try to cope.
-KEYCTL=keyctl
-keyctl list @u &>/dev/null || KEYCTL=:
-
-# The build system may give us a revoked session keyring, so run affected
-# tests with a new one.
-$KEYCTL session - make check OFFLINE=yes TMPDIR=%{_tmppath}
-popd
-%endif
-
 %install
 [ "$RPM_BUILD_ROOT" != '/' ] && rm -rf -- "$RPM_BUILD_ROOT"
 
 # Sample KDC config files (bundled kdc.conf and kadm5.acl).
 mkdir -p $RPM_BUILD_ROOT%{_var}/kerberos/krb5kdc
-install -pm 600 %{SOURCE10} $RPM_BUILD_ROOT%{_var}/kerberos/krb5kdc/
-install -pm 600 %{SOURCE11} $RPM_BUILD_ROOT%{_var}/kerberos/krb5kdc/
+install -pm 600 %{SOURCE6} $RPM_BUILD_ROOT%{_var}/kerberos/krb5kdc/
+install -pm 600 %{SOURCE7} $RPM_BUILD_ROOT%{_var}/kerberos/krb5kdc/
 
 # Where per-user keytabs live by default.
 mkdir -p $RPM_BUILD_ROOT%{_var}/kerberos/krb5/user
 
 # Default configuration file for everything.
 mkdir -p $RPM_BUILD_ROOT/etc
-install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf
+install -pm 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/krb5.conf
 
 # Default include on this directory
 mkdir -p $RPM_BUILD_ROOT/etc/krb5.conf.d
@@ -363,16 +437,16 @@ mkdir -m 755 -p $RPM_BUILD_ROOT/etc/gss/mech.d
 export DEFCCNAME="%{configured_default_ccache_name}"
 awk '{print}
      /^#    default_realm/{print "    default_ccache_name =", ENVIRON["DEFCCNAME"]}' \
-     %{SOURCE6} > $RPM_BUILD_ROOT/etc/krb5.conf
-touch -r %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf
+     %{SOURCE5} > $RPM_BUILD_ROOT/etc/krb5.conf
+touch -r %{SOURCE5} $RPM_BUILD_ROOT/etc/krb5.conf
 grep default_ccache_name $RPM_BUILD_ROOT/etc/krb5.conf
 %endif
 
 # Server init scripts (krb5kdc,kadmind,kpropd) and their sysconfig files.
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 for unit in \
-    %{SOURCE5}\
-     %{SOURCE4} \
+    %{SOURCE4}\
+     %{SOURCE3} \
      %{SOURCE2} ; do
     # In the past, the init script was supposed to be named after the service
     # that the started daemon provided.  Changing their names is an
@@ -380,11 +454,11 @@ for unit in \
     install -pm 644 ${unit} $RPM_BUILD_ROOT%{_unitdir}
 done
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
-install -pm 644 %{SOURCE39} $RPM_BUILD_ROOT/%{_tmpfilesdir}/
+install -pm 644 %{SOURCE14} $RPM_BUILD_ROOT/%{_tmpfilesdir}/
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/krb5kdc
 
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-for sysconfig in %{SOURCE19} %{SOURCE20} %{SOURCE21} ; do
+for sysconfig in %{SOURCE8} %{SOURCE9} %{SOURCE10} ; do
     install -pm 644 ${sysconfig} \
             $RPM_BUILD_ROOT/etc/sysconfig/`basename ${sysconfig} .sysconfig`
 done
@@ -392,15 +466,15 @@ done
 # logrotate configuration files
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/
 for logrotate in \
-    %{SOURCE33} \
-     %{SOURCE34} ; do
+    %{SOURCE12} \
+     %{SOURCE13} ; do
     install -pm 644 ${logrotate} \
             $RPM_BUILD_ROOT/etc/logrotate.d/`basename ${logrotate} .logrotate`
 done
 
 # PAM configuration files.
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d/
-for pam in %{SOURCE29} ; do
+for pam in %{SOURCE11} ; do
     install -pm 644 ${pam} \
             $RPM_BUILD_ROOT/etc/pam.d/`basename ${pam} .pamd`
 done
@@ -418,14 +492,10 @@ install -pdm 755 $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/authdata
 # list of link flags, and it helps prevent file conflicts on multilib systems.
 sed -r -i -e 's|^libdir=/usr/lib(64)?$|libdir=/usr/lib|g' $RPM_BUILD_ROOT%{_bindir}/krb5-config
 
-# Temporay workaround for krb5-config reading too much from LDFLAGS.
-# Upstream: http://krbdev.mit.edu/rt/Ticket/Display.html?id=8159
-sed -r -i -e "s/-specs=\/.+?\/redhat-hardened-ld//g" $RPM_BUILD_ROOT%{_bindir}/krb5-config
-
-if [[ "$(< $RPM_BUILD_ROOT%{_bindir}/krb5-config )" == *redhat-hardened-ld* ]] ; then
-    printf '# redhat-hardened-ld for krb5-config failed' 1>&2
-    exit 1
-fi
+# Workaround krb5-config reading too much from LDFLAGS.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1997021
+# https://bugzilla.redhat.com/show_bug.cgi?id=2048909
+sed -i -r -e 's/^(LDFLAGS=).*/\1/' $RPM_BUILD_ROOT%{_bindir}/krb5-config
 
 # Install processed man pages.
 for section in 1 5 8 ; do
@@ -450,16 +520,45 @@ rm -- "$RPM_BUILD_ROOT/%{_docdir}/krb5-libs/examples/services.append"
 # This is only needed for tests
 rm -- "$RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/preauth/test.so"
 
+# Generate tests launching script
+sed -e 's/{{ name }}/%{name}/g' \
+    -e 's/{{ version }}/%{krb5_version}/g' \
+    -e 's/{{ release }}/%{krb5_release}/g' \
+    -e 's/{{ arch }}/%{_arch}/g' \
+    -i %{SOURCE15}
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -pm 755 %{SOURCE15} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-tests-%{_arch}
+
+# Copy source files from build folder to system data folder
+install -pdm 755 $RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}
+pushd src
+cp -p --parents -t "$RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/" \
+    $(find . -type f -exec file -i "{}" + \
+          | sed -n \
+                -e 's|^\./\([^:]\+\): \+text/.\+$|\1|p' \
+                -e 's|^\./\([^:]\+\): \+application/x-pem-file.\+$|\1|p' \
+                -e 's|^\./\([^:]\+\): \+application/json.\+$|\1|p' \
+          | grep -Ev '~$')
+popd
+
+# Copy binary test files
+install -pm 644 src/tests/pkinit-certs/*.p12 \
+    "$RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/tests/pkinit-certs/"
+
+# Unset executable bit if no shebang in script
+for f in $(find "$RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/" -type f -executable)
+do
+    head -n1 "$f" | grep -Eq '^#!' || chmod a-x "$f"
+done
+
+# Remove broken shebang Perl scripts
+rm -- "$RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/config/wconfig.pl"
+rm -- "$RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/kadmin/kdbkeys/do-test.pl"
+
 %find_lang %{gettext_domain}
 
 %ldconfig_scriptlets libs
 
-%triggerun libs -- krb5-libs < 1.15.1-5
-if ! grep -q 'includedir /etc/krb5.conf.d' /etc/krb5.conf ; then
-    sed -i '1i # To opt out of the system crypto-policies configuration of krb5, remove the\n# symlink at /etc/krb5.conf.d/crypto-policies which will not be recreated.\nincludedir /etc/krb5.conf.d/\n' /etc/krb5.conf
-fi
-exit 0
-
 %ldconfig_scriptlets server-ldap
 
 %post server
@@ -641,7 +740,326 @@ exit 0
 %{_libdir}/libkadm5clnt_mit.so.*
 %{_libdir}/libkadm5srv_mit.so.*
 
+%files tests
+%{_libexecdir}/%{name}-tests-%{_arch}
+%{_datarootdir}/%{name}-tests/%{_arch}
+
 %changelog
+* Mon Jan 05 2026 Julien Rische <jrische@redhat.com> - 1.21.3-11
+- Fix strchr() conformance to C23
+
+* Mon Oct 20 2025 Alexander Bokovoy <abokovoy@redhat.com> - 1.21.3-10
+- Update the prompter patch to upstream version
+  Resolves: rhbz#2403513
+
+* Wed Oct 15 2025 Alexander Bokovoy <abokovoy@redhat.com> - 1.21.3-9
+- do not crash when prompter is not available in GSSAPI
+  Resolves: rhbz#2403513
+
+* Fri Sep 26 2025 Alexander Bokovoy <abokovoy@redhat.com> - 1.21.3-8
+- Add automated FAST channel for kinit
+- https://github.com/krb5/krb5/pull/1447 - work in progress
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Wed Jun 04 2025 Julien Rische <jrische@redhat.com> - 1.21.3-6
+- Do not block HMAC-MD4/5 in FIPS mode
+  Resolves: rhbz#2370259
+- PKINIT: implement paChecksum2 from MS-PKCA v20230920
+  Resolves: rhbz#2357215
+- Disallow RC4 HMAC-MD5 session keys by default (CVE-2025-3576)
+  Resolves: rhbz#2359705
+
+* Wed Jan 29 2025 Julien Rische <jrische@redhat.com> - 1.21.3-5
+- Prevent overflow when calculating ulog block size (CVE-2025-24528)
+  Resolves: rhbz#2342798
+- Support PKCS11 EC client certs in PKINIT
+  Resolves: rhbz#2341962
+- kdb5_util: fix DB entry flags on modification
+  Resolves: rhbz#2336555
+- Add ECDH support for PKINIT (RFC5349)
+  Resolves: rhbz#2214326
+- Remove dependency of krb5-libs on gawk and sed
+  Resolves: rhbz#2323859
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Oct 30 2024 Julien Rische <jrische@redhat.com> - 1.21.3-3
+- libkrad: implement support for Message-Authenticator (CVE-2024-3596)
+  Resolves: rhbz#2304071
+- Fix various issues detected by static analysis
+  Resolves: rhbz#2322704
+- Remove RSA protocol for PKINIT
+  Resolves: rhbz#2322706
+- Make TCP waiting time configurable
+  Resolves: rhbz#2322711
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jul 09 2024 Julien Rische <jrische@redhat.com> - 1.21.3-1
+- New upstream version (1.21.3)
+- CVE-2024-26458: Memory leak in src/lib/rpc/pmap_rmt.c
+  Resolves: rhbz#2266732
+- CVE-2024-26461: Memory leak in src/lib/gssapi/krb5/k5sealv3.c
+  Resolves: rhbz#2266741
+- CVE-2024-26462: Memory leak in src/kdc/ndr.c
+  Resolves: rhbz#2266743
+- Add missing SPDX license identifiers
+  Resolves: rhbz#2265333
+
+* Mon Jul 08 2024 Julien Rische <jrische@redhat.com> - 1.21.2-6
+- CVE-2024-37370 CVE-2024-37371: GSS message token handling
+  Resolves: rhbz#2294678 rhbz#2294680
+- Fix double free in klist's show_ccache()
+  Resolves: rhbz#2257301
+- Do not include files with "~" termination in krb5-tests
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan 17 2024 Julien Rische <jrische@redhat.com> - 1.21.2-3
+- Fix double free in klist's show_ccache()
+  Resolves: rhbz#2257301
+- Store krb5-tests files in architecture-specific directories
+  Resolves: rhbz#2244601
+
+* Tue Oct 10 2023 Julien Rische <jrische@redhat.com> - 1.21.2-2
+- Use SPDX expression for license tag
+- Fix unimportant memory leaks
+  Resolves: rhbz#2223274
+
+* Wed Aug 16 2023 Julien Rische <jrische@redhat.com> - 1.21.2-1
+- New upstream version (1.21.2)
+- Fix double-free in KDC TGS processing (CVE-2023-39975)
+  Resolves: rhbz#2229113
+- Make tests compatible with Python 3.12
+  Resolves: rhbz#2224013
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 29 2023 Marek Blaha <mblaha@redhat.com> - 1.21-2
+- Replace file dependency with package name
+  Resolves: rhbz#2216903
+
+* Mon Jun 12 2023 Julien Rische <jrische@redhat.com> - 1.21-1
+- New upstream version (1.21)
+- Do not disable PKINIT if some of the well-known DH groups are unavailable
+  Resolves: rhbz#2214297
+- Make PKINIT CMS SHA-1 signature verification available in FIPS mode
+  Resolves: rhbz#2214300
+- Allow to set PAC ticket signature as optional
+  Resolves: rhbz#2181311
+- Add support for MS-PAC extended KDC signature (CVE-2022-37967)
+  Resolves: rhbz#2166001
+- Fix syntax error in aclocal.m4
+  Resolves: rhbz#2143306
+
+* Tue Jan 31 2023 Julien Rische <jrische@redhat.com> - 1.20.1-9
+- Add support for MS-PAC extended KDC signature (CVE-2022-37967)
+  Resolves: rhbz#2166001
+
+* Mon Jan 30 2023 Julien Rische <jrische@redhat.com> - 1.20.1-8
+- Bypass FIPS restrictions to use KRB5KDF in case AES SHA-1 HMAC is enabled
+- Lazily load MD4/5 from OpenSSL if using RADIUS or RC4 enctype in FIPS mode
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 18 2023 Julien Rische <jrische@redhat.com> - 1.20.1-6
+- Set aes256-cts-hmac-sha384-192 as EXAMLE.COM master key in kdc.conf
+- Add AES SHA-2 HMAC family as EXAMPLE.COM supported etypes in kdc.conf
+  Resolves: rhbz#2114771
+
+* Mon Jan 09 2023 Julien Rische <jrische@redhat.com> - 1.20.1-5
+- Strip debugging data from ksu executable file
+
+* Thu Jan 05 2023 Julien Rische <jrische@redhat.com> - 1.20.1-4
+- Include missing OpenSSL FIPS header
+- Make tests compatible with sssd_krb5_locator_plugin.so
+
+* Tue Dec 06 2022 Julien Rische <jrische@redhat.com> - 1.20.1-3
+- Enable TMT integration with Fedora CI
+
+* Thu Dec  1 2022 Alexander Bokovoy <abokovoy@redhat.com> - 1.20.1-2
+- Bump KDB ABI version provide to 9.0
+
+* Wed Nov 23 2022 Julien Rische <jrische@redhat.com> - 1.20.1-1
+- New upstream version (1.20.1)
+  Resolves: rhbz#2124463
+- Restore "supportedCMSTypes" attribute in PKINIT preauth requests
+- Set SHA-512 or SHA-256 with RSA as preferred CMS signature algorithms
+  Resolves: rhbz#2114766
+- Update error checking for OpenSSL CMS_verify
+  Resolves: rhbz#2119704
+- Remove invalid password expiry warning
+  Resolves: rhbz#2129113
+
+* Wed Nov 09 2022 Julien Rische <jrische@redhat.com> - 1.19.2-13
+- Fix integer overflows in PAC parsing (CVE-2022-42898)
+  Resolves: rhbz#2143011
+
+* Tue Aug 02 2022 Andreas Schneider <asn@redhat.com> - 1.19.2-12
+- Use baserelease to set the release number
+- Do not define netlib, but use autoconf detection for res_* functions
+- Add missing BR for resolv_wrapper to run t_discover_uri.py
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-11.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 15 2022 Julien Rische <jrische@redhat.com> - 1.19.2-11
+- Allow libkrad UDP/TCP connection to localhost in FIPS mode
+  Resolves: rhbz#2082189
+- Read GSS configuration files with mtime 0
+
+* Mon May  2 2022 Julien Rische <jrische@redhat.com> - 1.19.2-10
+- Use p11-kit as default PKCS11 module
+  Resolves: rhbz#2073274
+- Try harder to avoid password change replay errors
+  Resolves: rhbz#2072059
+
+* Tue Apr 05 2022 Alexander Bokovoy <abokovoy@redhat.com> - 1.19.2-9
+- Fix libkrad client cleanup
+- Fixes rhbz#2072059
+
+* Tue Apr 05 2022 Alexander Bokovoy <abokovoy@redhat.com> - 1.19.2-8
+- Allow use of larger RADIUS attributes in krad library
+
+* Wed Mar 23 2022 Julien Rische <jrische@redhat.com> - 1.19.2-7
+- Use SHA-256 instead of SHA-1 for PKINIT CMS digest
+
+* Tue Feb  8 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.19.2-6
+- Drop old trigger scriplet
+- Reenable package notes and strip LDFLAGS from krb5-config (rhbz#2048909)
+
+* Wed Feb 02 2022 Alexander Bokovoy <abokovoy@redhat.com> - 1.19.2-5
+- Temporarily remove package note to unblock krb5-dependent packages
+  Resolves: rhbz#2048909
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-4.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Dec 3 2021 Antonio Torres <antorres@redhat.com> - 1.19.2-4
+- Add patches to support OpenSLL 3.0.0
+- Remove TCL-based libkadm5 API tests
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.19.2-3.1
+- Rebuilt with OpenSSL 3.0.0
+
+* Tue Aug 24 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.2-3
+- Remove -specs= from krb5-config output
+
+* Thu Aug 19 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.2-2
+- Fix KDC null deref on TGS inner body null server (CVE-2021-37750)
+
+* Mon Jul 26 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.2-1
+- New upstream version (1.19.2)
+
+* Wed Jul 21 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-15
+- Fix defcred leak in krb5 gss_inquire_cred()
+
+* Mon Jul 12 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-14
+- Fix KDC null deref on bad encrypted challenge (CVE-2021-36222)
+
+* Thu Jul 01 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-13
+- Fix use-after-free during krad remote_shutdown()
+
+* Mon Jun 28 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-12
+- MEMORY locking fix and static analysis pullup
+
+* Mon Jun 21 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-11
+- Add the backward-compatible parts of openssl3 support
+
+* Wed Jun 09 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-10
+- Fix three canonicalization cases for fallback
+
+* Wed Jun 02 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-9
+- Fix doc build for Sphinx 4.0
+
+* Thu May 20 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-8
+- Add all the sssd-kcm workarounds
+
+* Thu May 20 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-7
+- Fix context for previous backport
+
+* Thu May 20 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-6
+- Add KCM_OP_GET_CRED_LIST and KCM_OP_RETRIEVE support
+
+* Tue May 04 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-5
+- Suppress static analyzer warning in FIPS override
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.19.1-3.1
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Mon Mar 01 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-3
+- Further test dependency fixes; no code changes
+
+* Mon Mar 01 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-2
+- Make test dependencies contingent on skipcheck; no code changes
+
+* Thu Feb 18 2021 Robbie Harwood <rharwood@redhat.com> - 1.19.1-1
+- New upstream version (1.19.1)
+
+* Wed Feb 17 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-3
+- Restore krb5_set_default_tgs_ktypes()
+
+* Fri Feb 05 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-2
+- No code change; just coping with reverted autoconf
+
+* Tue Feb 02 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-1
+- New upstream version (1.19)
+
+* Thu Jan 28 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-0.beta2.5
+- Support host-based GSS initiator names
+
+* Thu Jan 28 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-0.beta2.4
+- Require krb5-pkinit from krb5-{server,workstation}
+
+* Thu Jan 28 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-0.beta2.3
+- Fix up weird mass rebuild versioning
+
+* Thu Jan 28 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-0.beta2.2.2
+- Add APIs for marshalling credentials
+
+* Wed Jan 27 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-0.beta2.1.2
+- Cope with new autotools behavior wrt runstatedir
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-0.beta2.1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 12 2021 Robbie Harwood <rharwood@redhat.com> - 1.19-1
+- New upstream version (1.19-beta2)
+
+* Wed Dec 16 2020 Robbie Harwood <rharwood@redhat.com> - 1.19-0.beta1.2
+- New upstream version (1.19-beta1)
+
+* Wed Dec 16 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.3-5
+- Fix runstatedir configuration
+- Why couldn't systemd just leave it alone?
+
+* Tue Nov 24 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.3-4
+- Document -k option in kvno(1) synopsis
+
+* Fri Nov 20 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.3-3
+- Upstream executable shared libraries patch
+
+* Wed Nov 18 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.3-2
+- Fix build failure in -1
+
+* Wed Nov 18 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.3-1
+- New upstream version (1.18.3)
+
+* Tue Nov 17 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-30
+- Migrate /var/run to /run, an exercise in pointlessness
+  Resolves: rhbz#1898410
+
 * Thu Nov 05 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-29
 - Add recursion limit for ASN.1 indefinite lengths (CVE-2020-28196)
 
@@ -652,7 +1070,7 @@ exit 0
 - Fix build of previous
 
 * Wed Oct 21 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-26
-- Cross-realm s4u fixes for samba (#1836630)
+- Cross-realm s4u fixes for samba (rhbz#1836630)
 
 * Thu Oct 15 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-25
 - Unify kvno option documentation
@@ -662,14 +1080,14 @@ exit 0
 
 * Thu Sep 10 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-23
 - Use `systemctl reload` to HUP the KDC during logrotate
-- Resolves: #1877692
+  Resolves: rhbz#1877692
 
 * Wed Sep 09 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-22
 - Fix input length checking in SPNEGO DER decoding
 
 * Fri Aug 28 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-21
 - Mark crypto-polices snippet as missingok
-- Resolves: #1868379
+  Resolves: rhbz#1868379
 
 * Thu Aug 13 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-20
 - Temporarily dns_canonicalize_hostname=fallback changes
@@ -686,7 +1104,7 @@ exit 0
 
 * Mon Aug 03 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-16
 - Disable tests on s390x
-- Resolves: #1863952
+  Resolves: rhbz#1863952
 
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-15
 - Second attempt - Rebuilt for
@@ -707,7 +1125,7 @@ exit 0
 
 * Wed Jul 08 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-10
 - Set qualify_shortname empty in default configuration
-- Resolves: #1852041
+  Resolves: rhbz#1852041
 
 * Mon Jun 15 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-9
 - Use two queues for concurrent t_otp.py daemons
@@ -881,7 +1299,7 @@ exit 0
 
 * Mon Jul 15 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-35
 - Don't error on invalid enctypes in keytab
-- Resolves: #1724380
+  Resolves: rhbz#1724380
 
 * Tue Jul 02 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-34
 - Remove now-unused checksum functions
@@ -966,7 +1384,7 @@ exit 0
 
 * Thu Apr 11 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-8
 - Implement krb5_cc_remove_cred for remaining types
-- Resolves: #1693836
+  Resolves: rhbz#1693836
 
 * Mon Apr 01 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-7
 - FIPS-aware SPAKE group negotiation
@@ -1001,7 +1419,7 @@ exit 0
 
 * Mon Dec 17 2018 Robbie Harwood <rharwood@redhat.com> - 1.17-1.beta2.2
 - Restore pdfs source file
-- Resolves: #1659716
+  Resolves: rhbz#1659716
 
 * Thu Dec 06 2018 Robbie Harwood <rharwood@redhat.com> - 1.17-1.beta2.1
 - New upstream release (1.17-beta2)
@@ -1015,26 +1433,26 @@ exit 0
 
 * Thu Nov 08 2018 Robbie Harwood <rharwood@redhat.com> - 1.17-1.beta1.1
 - Fix spurious errors from kcmio_unix_socket_write
-- Resolves: #1645912
+  Resolves: rhbz#1645912
 
 * Thu Nov 01 2018 Robbie Harwood <rharwood@redhat.com> - 1.17-0.beta1.1
 - New upstream beta release
 
 * Wed Oct 24 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-25
 - Update man pages to reference kerberos(7)
-- Resolves: #1143767
+  Resolves: rhbz#1143767
 
 * Wed Oct 17 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-24
 - Use port-sockets.h macros in cc_kcm, sendto_kdc
-- Resolves: #1631998
+  Resolves: rhbz#1631998
 
 * Wed Oct 17 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-23
 - Correct kpasswd_server description in krb5.conf(5)
-- Resolves: #1640272
+  Resolves: rhbz#1640272
 
 * Mon Oct 15 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-22
 - Prefer TCP to UDP for password changes
-- Resolves: #1637611
+  Resolves: rhbz#1637611
 
 * Tue Oct 09 2018 Adam Williamson <awilliam@redhat.com> - 1.16.1-21
 - Revert the patch from -20 for now as it seems to make FreeIPA worse
@@ -1083,18 +1501,18 @@ exit 0
 
 * Thu Jun 14 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-6
 - Switch to python3-sphinx for docs
-- Resolves: #1590928
+  Resolves: rhbz#1590928
 
 * Thu Jun 14 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-5
 - Make docs build python3-compatible
-- Resolves: #1590928
+  Resolves: rhbz#1590928
 
 * Thu Jun 07 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-4
 - Update includedir processing to match upstream
 
 * Fri Jun 01 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-3
 - Log when non-root ksu authorization fails
-- Resolves: #1575771
+  Resolves: rhbz#1575771
 
 * Fri May 04 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-2
 - Remove "-nodes" option from make-certs scripts
@@ -1116,7 +1534,7 @@ exit 0
 
 * Mon Apr 23 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-23
 - Explicitly use openssl rather than builtin crypto
-- Resolves: #1570910
+  Resolves: rhbz#1570910
 
 * Tue Apr 17 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-22
 - Merge duplicate subsections in profile library
@@ -1166,7 +1584,7 @@ exit 0
 
 * Wed Mar 07 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-8
 - Fix capaths "." values on client
-- Resolves: 1551099
+  Resolves: 1551099
 
 * Tue Feb 13 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-7
 - Fix flaws in LDAP DN checking
@@ -1175,7 +1593,7 @@ exit 0
 * Mon Feb 12 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-6
 - Fix a leak in the previous commit
 - Restore dist macro that was accidentally removed
-- Resolves: #1540939
+  Resolves: rhbz#1540939
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -1188,7 +1606,7 @@ exit 0
 
 * Tue Dec 12 2017 Robbie Harwood <rharwood@redhat.com> - 1.16-2
 - Fix network service dependencies
-- Resolves: #1525230
+  Resolves: rhbz#1525230
 
 * Wed Dec 06 2017 Robbie Harwood <rharwood@redhat.com> - 1.16-1
 - New upstream release (1.16)
@@ -1218,12 +1636,12 @@ exit 0
 
 * Wed Sep 06 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-28
 - Save other programs from worrying about CVE-2017-11462
-- Resolves: #1488873
-- Resolves: #1488874
+  Resolves: rhbz#1488873
+  Resolves: rhbz#1488874
 
 * Tue Sep 05 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-27
 - Add hostname-based ccselect module
-- Resolves: #1463665
+  Resolves: rhbz#1463665
 
 * Tue Sep 05 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-26
 - Backport upstream certauth EKU fixes
@@ -1266,15 +1684,15 @@ exit 0
 
 * Mon Jun 26 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-13
 - Fix arch name (ppc64le, not ppc64el)
-- Related-to: #1464381
+- Related-to: rhbz#1464381
 
 * Mon Jun 26 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-12
 - Skip test suite on ppc64el
-- Related-to: #1464381
+- Related-to: rhbz#1464381
 
 * Fri Jun 23 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-11
 - Include more test suite changes from upstream
-- Resolves: #1464381
+  Resolves: rhbz#1464381
 
 * Wed Jun 07 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-10
 - Fix custom build with -DDEBUG
@@ -1290,12 +1708,12 @@ exit 0
 
 * Thu Apr 13 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-6
 - Include fixes for previous commit
-- Resolves: #1433083
+  Resolves: rhbz#1433083
 
 * Thu Apr 13 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-5
 - Automatically add includedir where not present
 - Try removing sleep statement to see if it is still needed
-- Resolves: #1433083
+  Resolves: rhbz#1433083
 
 * Fri Apr 07 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-4
 - Fix use of enterprise principals with forwarding
@@ -1305,7 +1723,7 @@ exit 0
 
 * Tue Mar 07 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-2
 - Remove duplication between subpackages
-- Resolves: #1250228
+  Resolves: rhbz#1250228
 
 * Fri Mar 03 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-1
 - New upstream release - 1.15.1
@@ -1339,14 +1757,14 @@ exit 0
 * Thu Oct 20 2016 Robbie Harwood <rharwood@redhat.com> - 1.15-beta1-1
 - New upstream release
 - Update selinux with RHEL hygene
-- Resolves: #1314096
+  Resolves: rhbz#1314096
 
 * Tue Oct 11 2016 Tomáš Mráz <tmraz@redhat.com> - 1.14.4-6
 - rebuild with OpenSSL 1.1.0, added backported upstream patch
 
 * Fri Sep 30 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.4-5
 - Properly close krad sockets
-- Resolves: #1380836
+  Resolves: rhbz#1380836
 
 * Fri Sep 30 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.4-4
 - Fix backward check in kprop.service
@@ -1365,42 +1783,42 @@ exit 0
 
 * Mon Sep 19 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-9
 - Add krb5_db_register_keytab
-- Resolves: #1376812
+  Resolves: rhbz#1376812
 
 * Mon Aug 29 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-8
 - Use responder for non-preauth AS requests
-- Resolves: #1370622
+  Resolves: rhbz#1370622
 
 * Mon Aug 29 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-7
 - Guess Samba client mutual flag using ap_option
-- Resolves: #1370980
+  Resolves: rhbz#1370980
 
 * Thu Aug 25 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-6
 - Fix KDC return code and set prompt types for OTP client preauth
-- Resolves: #1370072
+  Resolves: rhbz#1370072
 
 * Mon Aug 15 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-5
 - Turn OFD locks back on with glibc workaround
-- Resolves: #1274922
+  Resolves: rhbz#1274922
 
 * Wed Aug 10 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-4
 - Fix use of KKDCPP with SNI
-- Resolves: #1365027
+  Resolves: rhbz#1365027
 
 * Fri Aug 05 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-3
 - Make krb5-devel depend on libkadm5
-- Resolves: #1364487
+  Resolves: rhbz#1364487
 
 * Wed Aug 03 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-2
 - Up-port a bunch of stuff from the el-7.3 cycle
-- Resolves: #1255450, #1314989
+  Resolves: rhbz#1255450, rhbz#1314989
 
 * Mon Aug 01 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.3-1
 - New upstream version 1.14.3
 
 * Thu Jul 28 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.1-9
 - Fix CVE-2016-3120
-- Resolves: #1361051
+  Resolves: rhbz#1361051
 
 * Wed Jun 22 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.1-8
 - Fix incorrect recv() size calculation in libkrad
@@ -1413,18 +1831,18 @@ exit 0
 
 * Tue Apr 05 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.1-5
 - Use the correct patches this time.
-- Resolves: #1321135
+  Resolves: rhbz#1321135
 
 * Mon Apr 04 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.1-4
 - Add send/receive sendto_kdc hooks and corresponding tests
-- Resolves: #1321135
+  Resolves: rhbz#1321135
 
 * Fri Mar 18 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.1-3
 - Fix CVE-2016-3119 (NULL deref in LDAP module)
 
 * Thu Mar 17 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.1-2
 - Backport OID mech fix
-- Resolves: #1317609
+  Resolves: rhbz#1317609
 
 * Mon Feb 29 2016 Robbie Harwood <rharwood@redhat.com> - 1.14.1-1
 - New rawhide, new upstream version
@@ -1434,7 +1852,7 @@ exit 0
 
 * Mon Feb 22 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-23
 - Fix log file permissions patch with our selinux
-- Resolves: #1309421
+  Resolves: rhbz#1309421
 
 * Fri Feb 19 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-22
 - Backport my interposer fixes from upstream
@@ -1443,7 +1861,7 @@ exit 0
 * Tue Feb 16 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-21
 - Adjust dependency on crypto-polices to be just the file we want
 - Patch courtesy of lslebodn
-- Resolves: #1308984
+  Resolves: rhbz#1308984
 
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
@@ -1451,21 +1869,21 @@ exit 0
 * Thu Jan 28 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-19
 - Replace _kadmin/_kprop with systemd macros
 - Remove traces of upstart from fedora package per policy
-- Resolves: #1290185
+  Resolves: rhbz#1290185
 
 * Wed Jan 27 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-18
 - Fix CVE-2015-8629, CVE-2015-8630, CVE-2015-8631
 
 * Thu Jan 21 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-17
 - Make krb5kdc.log not world-readable by default
-- Resolves: #1276484
+  Resolves: rhbz#1276484
 
 * Thu Jan 21 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-16
 - Allow verification of attributes on krb5.conf
 
 * Wed Jan 20 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-15
 - Use "new" systemd macros for service handling.  (Thanks vpavlin!)
-- Resolves: #850399
+  Resolves: rhbz#850399
 
 * Wed Jan 20 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-14
 - Remove WITH_NSS macro (always false)
@@ -1475,13 +1893,13 @@ exit 0
 
 * Fri Jan 08 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-13
 - Backport fix for chrome crash in spnego_gss_inquire_context
-- Resolves: #1295893
+  Resolves: rhbz#1295893
 
 * Wed Dec 16 2015 Robbie Harwood <rharwood@redhat.com> - 1.14-12
 - Backport patch to fix mechglue for gss_inqure_attrs_for_mech()
 
 * Thu Dec 03 2015 Robbie Harwood <rharwood@redhat.com> - 1.14-11
-- Backport interposer fix (#1284985)
+- Backport interposer fix (rhbz#1284985)
 - Drop workaround pwsize initialization patch (gcc has been fixed)
 
 * Tue Nov 24 2015 Robbie Harwood <rharwood@redhat.com> - 1.14-10
@@ -1516,7 +1934,7 @@ exit 0
 - New upstream beta version
 
 * Thu Oct 08 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-13
-- Work around KDC client prinicipal in referrals issue (#1259844)
+- Work around KDC client prinicipal in referrals issue (rhbz#1259844)
 
 * Thu Oct 01 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-12
 - Enable building with bad system /etc/krb5.conf
@@ -1529,7 +1947,7 @@ exit 0
 - Nix /usr/share/krb5.conf.d to reduce complexity
 
 * Wed Sep 23 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-9
-- Depend on crypto-policies which provides /etc/krb5.conf.d (#1225792)
+- Depend on crypto-policies which provides /etc/krb5.conf.d (rhbz#1225792)
 
 * Thu Sep 10 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-8
 - Remove dependency on systemd-sysv which is no longer needed for fedora > 20
@@ -1538,7 +1956,7 @@ exit 0
 
 * Thu Sep 10 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-7
 - Support config snippets in /etc/krb5.conf.d/ and /usr/share/krb5.conf.d/
-  (#1225792, #1146370, #1145808)
+  (rhbz#1225792, rhbz#1146370, rhbz#1145808)
 
 * Thu Jun 25 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-6
 - Use system nss_wrapper and socket_wrapper for testing.
@@ -1546,8 +1964,8 @@ exit 0
 
 * Thu Jun 25 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-5
 - Remove Zanata test glue and related workarounds
-  - Bug #1234292 ("IPA server cannot be run in container due to incorrect /usr/sbin/_kadmind")
-  - Bug #1234326 ("krb5-server introduces new rpm dependency on ksh")
+  - rhbz#1234292 ("IPA server cannot be run in container due to incorrect /usr/sbin/_kadmind")
+  - rhbz#1234326 ("krb5-server introduces new rpm dependency on ksh")
 
 * Thu Jun 18 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-4
 - Fix dependicy on binfmt.service
@@ -1556,12 +1974,12 @@ exit 0
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
 * Tue Jun 2 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-2
-- Add patch to fix Redhat Bug #1227542 ("[SELinux] AVC denials may appear
+- Add patch to fix Redhat rhbz#1227542 ("[SELinux] AVC denials may appear
   when kadmind starts"). The issue was caused by an unneeded |htons()|
   which triggered SELinux AVC denials due to the "random" port usage.
 
 * Thu May 21 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-1
-- Add fix for RedHat Bug #1164304 ("Upstream unit tests loads
+- Add fix for RedHat rhbz#1164304 ("Upstream unit tests loads
   the installed shared libraries instead the ones from the build")
 
 * Thu May 14 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-0
@@ -1572,7 +1990,7 @@ exit 0
 - Minor spec cleanup
 
 * Mon May 4 2015 Roland Mainz <rmainz@redhat.com> - 1.13.1-4
-- fix for CVE-2015-2694 (#1216133) "requires_preauth bypass
+- fix for CVE-2015-2694 (rhbz#1216133) "requires_preauth bypass
   in PKINIT-enabled KDC".
   In MIT krb5 1.12 and later, when the KDC is configured with
   PKINIT support, an unauthenticated remote attacker can
@@ -1582,13 +2000,13 @@ exit 0
   dictionary attack against the user's password.
 
 * Wed Mar 25 2015 Roland Mainz <rmainz@redhat.com> - 1.13.1-3
-- Add temporay workaround for RH bug #1204646 ("krb5-config
+- Add temporay workaround for RH rhbz#1204646 ("krb5-config
   returns wrong -specs path") which modifies krb5-config post
   build so that development of krb5 dependicies gets unstuck.
   This MUST be removed before rawhide becomes F23 ...
 
 * Thu Mar 19 2015 Roland Mainz <rmainz@redhat.com> - 1.13.1-2
-- fix for CVE-2014-5355 (#1193939) "krb5: unauthenticated
+- fix for CVE-2014-5355 (rhbz#1193939) "krb5: unauthenticated
   denial of service in recvauth_common() and others"  
 
 * Fri Feb 13 2015 Roland Mainz <rmainz@redhat.com> - 1.13.1-1
@@ -1599,13 +2017,13 @@ exit 0
 - Minor spec cleanup
 
 * Wed Feb 4 2015 Roland Mainz <rmainz@redhat.com> - 1.13-8
-- fix for CVE-2014-5352 (#1179856) "gss_process_context_token()
+- fix for CVE-2014-5352 (rhbz#1179856) "gss_process_context_token()
   incorrectly frees context (MITKRB5-SA-2015-001)"
-- fix for CVE-2014-9421 (#1179857) "kadmind doubly frees partial
+- fix for CVE-2014-9421 (rhbz#1179857) "kadmind doubly frees partial
   deserialization results (MITKRB5-SA-2015-001)"
-- fix for CVE-2014-9422 (#1179861) "kadmind incorrectly
+- fix for CVE-2014-9422 (rhbz#1179861) "kadmind incorrectly
   validates server principal name (MITKRB5-SA-2015-001)"
-- fix for CVE-2014-9423 (#1179863) "libgssrpc server applications
+- fix for CVE-2014-9423 (rhbz#1179863) "libgssrpc server applications
   leak uninitialized bytes (MITKRB5-SA-2015-001)"
 
 * Wed Feb 4 2015 Roland Mainz <rmainz@redhat.com> - 1.13-7
@@ -1617,17 +2035,17 @@ exit 0
 - Support KDC_ERR_MORE_PREAUTH_DATA_REQUIRED (RT#8063)
 
 * Mon Jan 26 2015 Roland Mainz <rmainz@redhat.com> - 1.13-5
-- fix for kinit -C loops (#1184629, MIT/krb5 issue 243, "Do not
+- fix for kinit -C loops (rhbz#1184629, MIT/krb5 issue 243, "Do not
   loop on principal unknown errors").
 - Added "python-sphinx-latex" to the build requirements
   to fix build failures on F22 machines.
 
 * Thu Dec 18 2014 Roland Mainz <rmainz@redhat.com> - 1.13-4
-- fix for CVE-2014-5354 (#1174546) "krb5: NULL pointer
+- fix for CVE-2014-5354 (rhbz#1174546) "krb5: NULL pointer
   dereference when using keyless entries"  
 
 * Wed Dec 17 2014 Roland Mainz <rmainz@redhat.com> - 1.13-3
-- fix for CVE-2014-5353 (#1174543) "Fix LDAP misused policy
+- fix for CVE-2014-5353 (rhbz#1174543) "Fix LDAP misused policy
   name crash"  
 
 * Wed Oct 29 2014 Roland Mainz <rmainz@redhat.com> - 1.13-2
@@ -1637,18 +2055,18 @@ exit 0
 
 * Wed Oct 29 2014 Roland Mainz <rmainz@redhat.com> - 1.13-1
 - Update from krb5-1.13-alpha1 to final krb5-1.13
-- Removed patch for CVE-2014-5351 (#1145425) "krb5: current
+- Removed patch for CVE-2014-5351 (rhbz#1145425) "krb5: current
   keys returned when randomizing the keys for a service principal" -
   now part of upstream sources
-- Use patch for glibc |eventfd()| prototype mismatch (#1147887) only
+- Use patch for glibc |eventfd()| prototype mismatch (rhbz#1147887) only
   for Fedora > 20
 
 * Tue Sep 30 2014 Roland Mainz <rmainz@redhat.com> - 1.13-0.alpha1.3
 - fix build failure caused by change of prototype for glibc
-  |eventfd()| (#1147887)
+  |eventfd()| (rhbz#1147887)
 
 * Mon Sep 29 2014 Roland Mainz <rmainz@redhat.com> - 1.13-0.alpha1.3
-- fix for CVE-2014-5351 (#1145425) "krb5: current keys returned when
+- fix for CVE-2014-5351 (rhbz#1145425) "krb5: current keys returned when
   randomizing the keys for a service principal"
 
 * Mon Sep  8 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.13-0.alpha1.3
@@ -1664,7 +2082,7 @@ exit 0
 
 * Wed Aug 20 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.2-3
 - pull in upstream fix for an incorrect check on the value returned by a
-  strdup() call (#1132062)
+  strdup() call (rhbz#1132062)
 
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -1672,7 +2090,7 @@ exit 0
 * Fri Aug 15 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.2-1
 - update to 1.12.2
   - drop patch for RT#7820, fixed in 1.12.2
-  - drop patch for #231147, fixed as RT#3277 in 1.12.2
+  - drop patch for rhbz#231147, fixed as RT#3277 in 1.12.2
   - drop patch for RT#7818, fixed in 1.12.2
   - drop patch for RT#7836, fixed in 1.12.2
   - drop patch for RT#7858, fixed in 1.12.2
@@ -1683,7 +2101,7 @@ exit 0
   - drop patch for CVE-2014-4344, included in 1.12.2
   - drop patch for CVE-2014-4345, included in 1.12.2
 - replace older proposed changes for ksu with backports of the changes
-  after review and merging upstream (#1015559, #1026099, #1118347)
+  after review and merging upstream (rhbz#1015559, rhbz#1026099, rhbz#1118347)
 
 * Thu Aug  7 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-14
 - incorporate fix for MITKRB5-SA-2014-001 (CVE-2014-4345)
@@ -1694,21 +2112,21 @@ exit 0
 
 * Wed Jul 16 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-12
 - gssapi: pull in proposed fix for a double free in initiators (David
-  Woodhouse, CVE-2014-4343, #1117963)
+  Woodhouse, CVE-2014-4343, rhbz#1117963)
 
 * Sat Jul 12 2014 Tom Callaway <spot@fedoraproject.org> - 1.12.1-11
 - fix license handling
 
 * Mon Jul  7 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-10
 - pull in fix for denial of service by injection of malformed GSSAPI tokens
-  (CVE-2014-4341, CVE-2014-4342, #1116181)
+  (CVE-2014-4341, CVE-2014-4342, rhbz#1116181)
 
 * Tue Jun 24 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-9
 - pull in changes from upstream which add processing of the contents of
-  /etc/gss/mech.d/*.conf when loading GSS modules (#1102839)
+  /etc/gss/mech.d/*.conf when loading GSS modules (rhbz#1102839)
 
 * Thu Jun 12 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-8
-- pull in fix for building against tcl 8.6 (#1107061)
+- pull in fix for building against tcl 8.6 (rhbz#1107061)
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -1720,14 +2138,14 @@ exit 0
 - spnego: pull in patch from master to restore preserving the OID of the
   mechanism the initiator requested when we have multiple OIDs for the same
   mechanism, so that we reply using the same mechanism OID and the initiator
-  doesn't get confused (#1066000, RT#7858)
+  doesn't get confused (rhbz#1066000, RT#7858)
 
 * Fri Feb  7 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-4
 - pull in patch from master to move the default directory which the KDC uses
   when computing the socket path for a local OTP daemon from the database
   directory (/var/kerberos/krb5kdc) to the newly-added run directory
   (/run/krb5kdc), in line with what we're expecting in 1.13 (RT#7859, more
-  of #1040056 as #1063905)
+  of rhbz#1040056 as rhbz#1063905)
 - add a tmpfiles.d configuration file to have /run/krb5kdc created at
   boot-time
 - own /var/run/krb5kdc
@@ -1737,12 +2155,12 @@ exit 0
 
 * Fri Jan 31 2014 Nalin Dahyabhai <nalin@redhat.com>
 - add currently-proposed changes to teach ksu about credential cache
-  collections and the default_ccache_name setting (#1015559,#1026099)
+  collections and the default_ccache_name setting (rhbz#1015559,rhbz#1026099)
 
 * Tue Jan 21 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-2
 - pull in multiple changes to allow replay caches to be added to a GSS
-  credential store as "rcache"-type credentials (RT#7818/#7819/#7836,
-  #1056078/#1056080)
+  credential store as "rcache"-type credentials (RT#7818/rhbz#7819/rhbz#7836,
+  rhbz#1056078/rhbz#1056080)
 
 * Fri Jan 17 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.1-1
 - update to 1.12.1
@@ -1755,11 +2173,11 @@ exit 0
   - drop patches for RT#7813 and RT#7815, included now
   - add patch to always retrieve the KDC time offsets from keyring caches,
     so that we don't mistakenly interpret creds as expired before their
-    time when our clock is ahead of the KDC's (RT#7820, #1030607)
+    time when our clock is ahead of the KDC's (RT#7820, rhbz#1030607)
 
 * Mon Jan 13 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12-11
 - update the PIC patch for iaesx86.s to not use ELF relocations to the version
-  that landed upstream (RT#7815, #1045699)
+  that landed upstream (RT#7815, rhbz#1045699)
 
 * Thu Jan  9 2014 Nalin Dahyabhai <nalin@redhat.com>
 - pass -Wl,--warn-shared-textrel to the compiler when we're creating shared
@@ -1774,16 +2192,16 @@ exit 0
   master
 - make a guess at making the 32-bit AES-NI implementation sufficiently
   position-independent to not require execmod permissions for libk5crypto
-  (more of #1045699)
+  (more of rhbz#1045699)
 
 * Thu Jan  2 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12-8
 - add patch from Dhiru Kholia for the AES-NI implementations to allow
   libk5crypto to be properly marked as not needing an executable stack
-  on arches where they're used (#1045699, and so many others)
+  on arches where they're used (rhbz#1045699, and so many others)
 
 * Thu Jan  2 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12-7
 - revert that last change for a bit while sorting out execstack when we
-  use AES-NI (#1045699)
+  use AES-NI (rhbz#1045699)
 
 * Thu Dec 19 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-6
 - add yasm as a build requirement for AES-NI support, on arches that have
@@ -1791,7 +2209,7 @@ exit 0
 
 * Thu Dec 19 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-5
 - pull in fix from master to make reporting of errors encountered by
-  the SPNEGO mechanism work better (RT#7045, part of #1043962)
+  the SPNEGO mechanism work better (RT#7045, part of rhbz#1043962)
 
 * Thu Dec 19 2013 Nalin Dahyabhai <nalin@redhat.com>
 - update a test wrapper to properly handle things that the new libkrad does,
@@ -1801,19 +2219,19 @@ exit 0
 - revise previous patch to initialize one more element
 
 * Wed Dec 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-3
-- backport fixes to krb5_copy_context (RT#7807, #1044735/#1044739)
+- backport fixes to krb5_copy_context (RT#7807, rhbz#1044735/rhbz#1044739)
 
 * Wed Dec 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-2
 - pull in fix from master to return a NULL pointer rather than allocating
   zero bytes of memory if we read a zero-length input token (RT#7794, part of
-  #1043962)
+  rhbz#1043962)
 - pull in fix from master to ignore an empty token from an acceptor if
-  we've already finished authenticating (RT#7797, part of #1043962)
+  we've already finished authenticating (RT#7797, part of rhbz#1043962)
 - pull in fix from master to avoid a memory leak when a mechanism's
-  init_sec_context function fails (RT#7803, part of #1043962)
+  init_sec_context function fails (RT#7803, part of rhbz#1043962)
 - pull in fix from master to avoid a memory leak in a couple of error
   cases which could occur while obtaining acceptor credentials (RT#7805, part
-  of #1043962)
+  of rhbz#1043962)
 
 * Wed Dec 11 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-1
 - update to 1.12 final
@@ -1830,9 +2248,9 @@ exit 0
 
 * Mon Nov 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.4-2
 - pull in fix to store KDC time offsets in keyring credential caches (RT#7768,
-  #1030607)
+  rhbz#1030607)
 - pull in fix to set expiration times on credentials stored in keyring
-  credential caches (RT#7769, #1031724)
+  credential caches (RT#7769, rhbz#1031724)
 
 * Tue Nov 12 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.4-1
 - update to 1.11.4
@@ -1841,21 +2259,21 @@ exit 0
   - drop patch for CVE-2013-1418/CVE-2013-6800, included in 1.11.4
 
 * Tue Nov 12 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-31
-- switch to the simplified version of the patch for #1029110 (RT#7764)
+- switch to the simplified version of the patch for rhbz#1029110 (RT#7764)
 
 * Mon Nov 11 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-30
 - check more thoroughly for errors when resolving KEYRING ccache names of type
   "persistent", which should only have a numeric UID as the next part of the
-  name (#1029110)
+  name (rhbz#1029110)
 
 * Tue Nov  5 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-29
 - incorporate upstream patch for remote crash of KDCs which serve multiple
   realms simultaneously (RT#7756, CVE-2013-1418/CVE-2013-6800,
-  #1026997/#1031501)
+  rhbz#1026997/rhbz#1031501)
 
 * Mon Nov  4 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-28
 - drop patch to add additional access() checks to ksu - they add to breakage
-  when non-FILE: caches are in use (#1026099), shouldn't be resulting in any
+  when non-FILE: caches are in use (rhbz#1026099), shouldn't be resulting in any
   benefit, and clash with proposed changes to fix its cache handling
 
 * Tue Oct 22 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-27
@@ -1884,22 +2302,22 @@ exit 0
 - BuildRequires: pkgconfig, since configure uses it
 
 * Wed Oct 16 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-26
-- create and own /etc/gss (#1019937)
+- create and own /etc/gss (rhbz#1019937)
 
 * Tue Oct 15 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-25
 - pull up fix for importing previously-exported credential caches in the
-  gssapi library (RT# 7706, #1019420)
+  gssapi library (RT# 7706, rhbz#1019420)
 
 * Mon Oct 14 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-24
 - backport the callback to use the libkrb5 prompter when we can't load PEM
-  files for PKINIT (RT#7590, includes part of #965721/#1016690)
-- extract the rest of the fix #965721/#1016690 from the changes for RT#7680
+  files for PKINIT (RT#7590, includes part of rhbz#965721/rhbz#1016690)
+- extract the rest of the fix rhbz#965721/rhbz#1016690 from the changes for RT#7680
 
 * Mon Oct 14 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-23
-- fix trigger scriptlet's invocation of sed (#1016945)
+- fix trigger scriptlet's invocation of sed (rhbz#1016945)
 
 * Fri Oct  4 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-22
-- rebuild with keyutils 1.5.8 (part of #1012043)
+- rebuild with keyutils 1.5.8 (part of rhbz#1012043)
 
 * Wed Oct  2 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-21
 - switch to the version of persistent-keyring that was just merged to
@@ -1909,7 +2327,7 @@ exit 0
 * Mon Sep 30 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-20
 - pull up fix for not calling a kdb plugin's check-transited-path
   method before calling the library's default version, which only knows
-  how to read what's in the configuration file (RT#7709, #1013664)
+  how to read what's in the configuration file (RT#7709, rhbz#1013664)
 
 * Thu Sep 26 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-19
 - configure --without-krb5-config so that we don't pull in the old default
@@ -1920,7 +2338,7 @@ exit 0
 - fix broken dependency on awk (should be gawk, rdieter)
 
 * Wed Sep 25 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-17
-- add missing dependency on newer keyutils-libs (#1012034)
+- add missing dependency on newer keyutils-libs (rhbz#1012034)
 
 * Tue Sep 24 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-16
 - back out setting default_ccache_name to the new default for now, resetting
@@ -1928,11 +2346,11 @@ exit 0
 
 * Mon Sep 23 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-15
 - add explicit build-time dependency on a version of keyutils that's new
-  enough to include keyctl_get_persistent() (more of #991148)
+  enough to include keyctl_get_persistent() (more of rhbz#991148)
 
 * Thu Sep 19 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-14
 - incorporate Simo's updated backport of his updated persistent-keyring changes
-  (more of #991148)
+  (more of rhbz#991148)
 
 * Fri Sep 13 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-13
 - don't break during %%check when the session keyring is revoked
@@ -1946,17 +2364,17 @@ exit 0
 
 * Mon Sep  9 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-11
 - don't let comments intended for one scriptlet become part of the "script"
-  that gets passed to ldconfig as part of another one (Mattias Ellert, #1005675)
+  that gets passed to ldconfig as part of another one (Mattias Ellert, rhbz#1005675)
 
 * Fri Sep  6 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-10
-- incorporate Simo's backport of his persistent-keyring changes (#991148)
+- incorporate Simo's backport of his persistent-keyring changes (rhbz#991148)
 - restore build-time default DEFCCNAME on Fedora 21 and later and EL, and
   instead set default_ccache_name in the default krb5.conf's [libdefaults]
-  section (#991148)
+  section (rhbz#991148)
 - on releases where we expect krb5.conf to be configured with a
   default_ccache_name, add it whenever we upgrade from an older version of
   the package that wouldn't have included it in its default configuration
-  file (#991148)
+  file (rhbz#991148)
 
 * Fri Aug 23 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-9
 - take another stab at accounting for UnversionedDocdirs for the -libs
@@ -1971,7 +2389,7 @@ exit 0
   of files which dictate particular exit codes before exec'ing the actual
   binaries, instead of trying to use ConditionPathExists in the unit files
   to accomplish that, so that we exit with failure properly when what we
-  expect isn't actually in effect on the system (#800343)
+  expect isn't actually in effect on the system (rhbz#800343)
 
 * Mon Jul 29 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-7
 - attempt to account for UnversionedDocdirs for the -libs subpackage
@@ -1983,11 +2401,11 @@ exit 0
 
 * Mon Jul 22 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-5
 - pull up changes to allow GSSAPI modules to provide more functions
-  (RT#7682, #986564/#986565)
+  (RT#7682, rhbz#986564/rhbz#986565)
 
 * Fri Jul 19 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-4
 - use (a bundled, for now, copy of) nss_wrapper to let us run some of the
-  self-tests at build-time in more places than we could previously (#978756)
+  self-tests at build-time in more places than we could previously (rhbz#978756)
 - cover inconsistencies in whether or not there's a local caching nameserver
   that's willing to answer when the build environment doesn't have a
   resolver configuration, so that nss_wrapper's faking of the local
@@ -1995,23 +2413,23 @@ exit 0
 
 * Mon Jul  1 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-3
 - specify dependencies on the same arch of krb5-libs by using the %%{?_isa}
-  suffix, to avoid dragging 32-bit libraries onto 64-bit systems (#980155)
+  suffix, to avoid dragging 32-bit libraries onto 64-bit systems (rhbz#980155)
 
 * Thu Jun 13 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-2
 - special-case /run/user/0, attempting to create it when resolving a
   directory cache below it fails due to ENOENT and we find that it doesn't
   already exist, either, before attempting to create the directory cache
-  (maybe helping, maybe just making things more confusing for #961235)
+  (maybe helping, maybe just making things more confusing for rhbz#961235)
 
 * Tue Jun  4 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-1
 - update to 1.11.3
   - drop patch for RT#7605, fixed in this release
   - drop patch for CVE-2002-2443, fixed in this release
   - drop patch for RT#7369, fixed in this release
-- pull upstream fix for breaking t_skew.py by adding the patch for #961221
+- pull upstream fix for breaking t_skew.py by adding the patch for rhbz#961221
 
 * Fri May 31 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-10
-- respin with updated version of patch for RT#7650 (#969331)
+- respin with updated version of patch for RT#7650 (rhbz#969331)
 
 * Thu May 30 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-9
 - don't forget to set the SELinux label when creating the directory for
@@ -2027,22 +2445,22 @@ exit 0
 
 * Tue May 28 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-7
 - backport fix for not being able to verify the list of transited realms
-  in GSS acceptors (RT#7639, #959685)
+  in GSS acceptors (RT#7639, rhbz#959685)
 - backport fix for not being able to pass an empty password to the
-  get-init-creds APIs and have them actually use it (RT#7642, #960001)
+  get-init-creds APIs and have them actually use it (RT#7642, rhbz#960001)
 - add backported proposed fix to use the unauthenticated server time
   as the basis for computing the requested credential expiration times,
   rather than the client's idea of the current time, which could be
-  significantly incorrect (#961221)
+  significantly incorrect (rhbz#961221)
 
 * Tue May 21 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-6
 - pull in upstream fix to start treating a KRB5CCNAME value that begins
   with DIR:: the same as it would a DIR: value with just one ccache file
-  in it (RT#7172, #965574)
+  in it (RT#7172, rhbz#965574)
 
 * Mon May 13 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-5
 - pull up fix for UDP ping-pong flaw in kpasswd service (CVE-2002-2443,
-  #962531,#962534)
+  rhbz#962531,rhbz#962534)
 
 * Mon Apr 29 2013 Nathaniel McCallum <npmccallum@redhat.com> 1.11.2-4
 - Update otp patches
@@ -2062,11 +2480,11 @@ exit 0
   - drop pulled in patch for RT#7586, included in this release
   - drop pulled in patch for RT#7592, included in this release
 - pull in fix for keeping track of the message type when parsing FAST requests
-  in the KDC (RT#7605, #951843) (also #951965)
+  in the KDC (RT#7605, rhbz#951843) (also rhbz#951965)
 
 * Fri Apr 12 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-9
 - move the compiled-in default ccache location from the previous default of
-  FILE:/tmp/krb5cc_%%{uid} to DIR:/run/user/%%{uid}/krb5cc (part of #949588)
+  FILE:/tmp/krb5cc_%%{uid} to DIR:/run/user/%%{uid}/krb5cc (part of rhbz#949588)
 
 * Tue Apr 09 2013 Nathaniel McCallum <npmccallum@redhat.com> - 1.11.1-8
 - Update otp backport patches (libk5radius => libkrad)
@@ -2087,8 +2505,8 @@ exit 0
 * Tue Mar 26 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-5
 - pull up Simo's patch to mark the correct mechanism on imported GSSAPI
   contexts (RT#7592)
-- go back to using reconf to run autoconf and autoheader (part of #925640)
-- add temporary patch to use newer config.guess/config.sub (more of #925640)
+- go back to using reconf to run autoconf and autoheader (part of rhbz#925640)
+- add temporary patch to use newer config.guess/config.sub (more of rhbz#925640)
 
 * Mon Mar 18 2013 Nalin Dahyabhai <nalin@redhat.com>
 - fix a version comparison to expect newer texlive build requirements when
@@ -2099,12 +2517,12 @@ exit 0
 - Add otp support
 
 * Thu Feb 28 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-3
-- fix a memory leak when acquiring credentials using a keytab (RT#7586, #911110)
+- fix a memory leak when acquiring credentials using a keytab (RT#7586, rhbz#911110)
 
 * Wed Feb 27 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-2
-- prebuild PDF docs to reduce multilib differences (internal tooling, #884065)
+- prebuild PDF docs to reduce multilib differences (internal tooling, rhbz#884065)
 - drop the kerberos-iv portreserve file, and drop the rest on systemd systems
-- escape uses of macros in comments (more of #884065)
+- escape uses of macros in comments (more of rhbz#884065)
 
 * Mon Feb 25 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-1
 - update to 1.11.1
@@ -2112,7 +2530,7 @@ exit 0
     wrapper in the client transmit functions
 
 * Fri Feb  8 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11-2
-- set "rdns = false" in the default krb5.conf (#908323,#908324)
+- set "rdns = false" in the default krb5.conf (rhbz#908323,rhbz#908324)
 
 * Tue Dec 18 2012 Nalin Dahyabhai <nalin@redhat.com> 1.11-1
 - update to 1.11 release
@@ -2122,7 +2540,7 @@ exit 0
 
 * Thu Dec 13 2012 Nalin Dahyabhai <nalin@redhat.com>
 - when building with our bundled copy of libverto, package it in with -libs
-  rather than with -server (#886049)
+  rather than with -server (rhbz#886049)
 
 * Wed Nov 21 2012 Nalin Dahyabhai <nalin@redhat.com> 1.11-0.beta1.0
 - update to 1.11 beta 1
@@ -2144,9 +2562,9 @@ exit 0
 
 * Thu Nov 15 2012 Nalin Dahyabhai <nalin@redhat.com>
 - update to 1.11 alpha 1
-  - drop backported patch for RT #7406
-  - drop backported patch for RT #7407
-  - drop backported patch for RT #7408
+  - drop backported patch for RT rhbz#7406
+  - drop backported patch for RT rhbz#7407
+  - drop backported patch for RT rhbz#7408
   - the new docs system generates PDFs, so stop including them as sources
   - drop backported patch to allow deltat.y to build with the usual
     warning flags and the current gcc
@@ -2170,27 +2588,27 @@ exit 0
   %%{?_rawbuild} builds (zmraz)
 
 * Tue Sep 25 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-6
-- actually pull up the patch for RT#7063, and not some other ticket (#773496)
+- actually pull up the patch for RT#7063, and not some other ticket (rhbz#773496)
 
 * Mon Sep 10 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-5
 - add patch based on one from Filip Krska to not call poll() with a negative
-  timeout when the caller's intent is for us to just stop calling it (#838548)
+  timeout when the caller's intent is for us to just stop calling it (rhbz#838548)
 
 * Fri Sep  7 2012 Nalin Dahyabhai <nalin@redhat.com>
 - on EL6, conflict with libsmbclient before 3.5.10-124, which is when it
-  stopped linking with a symbol which we no longer export (#771687)
+  stopped linking with a symbol which we no longer export (rhbz#771687)
 - pull up patch for RT#7063, in which not noticing a prompt for a long
   time throws the client library's idea of the time difference between it
-  and the KDC really far out of whack (#773496)
+  and the KDC really far out of whack (rhbz#773496)
 - add a backport of more patches to set the client's list of supported enctypes
   when using a keytab to be the list of types of keys in the keytab, plus the
   list of other types the client supports but for which it doesn't have keys,
   in that order, so that KDCs have a better chance of being able to issue
-  tickets with session keys of types that the client can use (#837855)
+  tickets with session keys of types that the client can use (rhbz#837855)
 
 * Thu Sep  6 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-4
 - cut down the number of times we load SELinux labeling configuration from
-  a minimum of two times to actually one (more of #845125)
+  a minimum of two times to actually one (more of rhbz#845125)
 
 * Thu Aug 30 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-3
 - backport patch to disable replay detection in krb5_verify_init_creds()
@@ -2208,7 +2626,7 @@ exit 0
 * Thu Aug  2 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.2-7
 - selinux: hang on to the list of selinux contexts, freeing and reloading
   it only when the file we read it from is modified, freeing it when the
-  shared library is being unloaded (#845125)
+  shared library is being unloaded (rhbz#845125)
 
 * Thu Aug  2 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.2-6
 - go back to not messing with library file paths on Fedora 17: it breaks
@@ -2218,7 +2636,7 @@ exit 0
 * Tue Jul 31 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.2-5
 - add upstream patch to fix freeing an uninitialized pointer and dereferencing
   another uninitialized pointer in the KDC (MITKRB5-SA-2012-001, CVE-2012-1014
-  and CVE-2012-1015, #844779 and #844777)
+  and CVE-2012-1015, rhbz#844779 and rhbz#844777)
 - fix a thinko in whether or not we mess around with devel .so symlinks on
   systems without a separate /usr (sbose)
 
@@ -2244,7 +2662,7 @@ exit 0
 - add a backport of Stef's patch to set the client's list of supported
   enctypes to match the types of keys that we have when we are using a
   keytab to try to get initial credentials, so that a KDC won't send us
-  an AS reply that we can't encrypt (RT#2131, #748528)
+  an AS reply that we can't encrypt (RT#2131, rhbz#748528)
 - don't shuffle around any shared libraries on releases with no-separate-/usr,
   since /usr/lib is the same place as /lib
 - add explicit buildrequires: on 'hostname', for the tests, on systems where
@@ -2253,15 +2671,15 @@ exit 0
 
 * Mon May  7 2012 Nalin Dahyabhai <nalin@redhat.com>
 - skip the setfscreatecon() if fopen() is passed "rb" as the open mode (part
-  of #819115)
+  of rhbz#819115)
 
 * Tue May  1 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.1-3
 - have -server require /usr/share/dict/words, which we set as the default
-  dict_file in kdc.conf (#817089)
+  dict_file in kdc.conf (rhbz#817089)
 
 * Tue Mar 20 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.1-2
-- change back dns_lookup_kdc to the default setting (Stef Walter, #805318)
-- comment out example.com examples in default krb5.conf (Stef Walter, #805320)
+- change back dns_lookup_kdc to the default setting (Stef Walter, rhbz#805318)
+- comment out example.com examples in default krb5.conf (Stef Walter, rhbz#805320)
 
 * Fri Mar  9 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.1-1
 - update to 1.10.1
@@ -2272,7 +2690,7 @@ exit 0
 * Wed Mar  7 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10-5
 - when removing -workstation, remove our files from the info index while
   the file is still there, in %%preun, rather than %%postun, and use the
-  compressed file's name (#801035)
+  compressed file's name (rhbz#801035)
 
 * Tue Feb 21 2012 Nathaniel McCallum <nathaniel@natemccallum.com> - 1.10-4
 - Fix string RPC ACLs (RT#7093); CVE-2012-1012
@@ -2282,7 +2700,7 @@ exit 0
 
 * Mon Jan 30 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10-2
 - add patch to accept keytab entries with vno==0 as matches when we're
-  searching for an entry with a specific name/kvno (#230382/#782211,RT#3349)
+  searching for an entry with a specific name/kvno (rhbz#230382/rhbz#782211,RT#3349)
 
 * Mon Jan 30 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10-1
 - update to 1.10 final
@@ -2307,21 +2725,21 @@ exit 0
 
 * Tue Dec 13 2011 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.alpha1.3
 - pull in patch for RT#7046: tag a ccache containing credentials obtained via
-  S4U2Proxy with the principal name of the proxying principal (part of #761317)
+  S4U2Proxy with the principal name of the proxying principal (part of rhbz#761317)
   so that the default principal name can be set to that of the client for which
   it is proxying, which results in the ccache looking more normal to consumers
   of the ccache that don't care that there's proxying going on
 - pull in patch for RT#7047: allow tickets obtained via S4U2Proxy to be cached
-  (more of #761317)
+  (more of rhbz#761317)
 - pull in patch for RT#7048: allow PAC verification to only bother trying to
-  verify the signature with keys that it's given (still more of #761317)
+  verify the signature with keys that it's given (still more of rhbz#761317)
 
 * Tue Dec  6 2011 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.alpha1.2
 - apply upstream patch to fix a null pointer dereference when processing
-  TGS requests (CVE-2011-1530, #753748)
+  TGS requests (CVE-2011-1530, rhbz#753748)
 
 * Wed Nov 30 2011 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.alpha1.1
-- correct a bug in the fix for #754001 so that the file creation context is
+- correct a bug in the fix for rhbz#754001 so that the file creation context is
   consistently reset
 
 * Tue Nov 15 2011 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.alpha1.0
@@ -2336,27 +2754,27 @@ exit 0
   should be able to run inside of the build system without issue
 
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-19
-- Rebuilt for glibc bug#747377
+- Rebuilt for glibc rhbz#747377
 
 * Tue Oct 18 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-18
 - apply upstream patch to fix a null pointer dereference with the LDAP kdb
-  backend (CVE-2011-1527, #744125), an assertion failure with multiple kdb
+  backend (CVE-2011-1527, rhbz#744125), an assertion failure with multiple kdb
   backends (CVE-2011-1528), and a null pointer dereference with multiple kdb
-  backends (CVE-2011-1529) (#737711)
+  backends (CVE-2011-1529) (rhbz#737711)
 
 * Thu Oct 13 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-17
 - pull in patch from trunk to rename krb5int_pac_sign() to krb5_pac_sign() and
-  make it public (#745533)
+  make it public (rhbz#745533)
 
 * Fri Oct  7 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-16
-- kadmin.service: fix #723723 again
+- kadmin.service: fix rhbz#723723 again
 - kadmin.service,krb5kdc.service: remove optional use of $KRB5REALM in command
   lines, because systemd parsing doesn't handle alternate value shell variable
   syntax
 - kprop.service: add missing Type=forking so that systemd doesn't assume simple
 - kprop.service: expect the ACL configuration to be there, not absent
 - handle a harder-to-trigger assertion failure that starts cropping up when we
-  exit the transmit loop on time (#739853)
+  exit the transmit loop on time (rhbz#739853)
 
 * Sun Oct  2 2011 Tom Callaway <spot@fedoraproject.org> 1.9.1-15
 - hardcode pid file as option in krb5kdc.service
@@ -2369,50 +2787,50 @@ exit 0
 
 * Tue Sep  6 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-12
 - pull in upstream patch for RT#6952, confusion following referrals for
-  cross-realm auth (#734341)
+  cross-realm auth (rhbz#734341)
 - pull in build-time deps for the tests
 
 * Thu Sep  1 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-11
-- switch to the upstream patch for #727829
+- switch to the upstream patch for rhbz#727829
 
 * Wed Aug 31 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-10
 - handle an assertion failure that starts cropping up when the patch for
-  using poll (#701446) meets servers that aren't running KDCs or against
-  which the connection fails for other reasons (#727829, #734172)
+  using poll (rhbz#701446) meets servers that aren't running KDCs or against
+  which the connection fails for other reasons (rhbz#727829, rhbz#734172)
 
 * Mon Aug  8 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-9
 - override the default build rules to not delete temporary y.tab.c files,
   so that they can be packaged, allowing debuginfo files which point to them
-  do so usefully (#729044)
+  do so usefully (rhbz#729044)
 
 * Fri Jul 22 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-8
-- build shared libraries with partial RELRO support (#723995)
+- build shared libraries with partial RELRO support (rhbz#723995)
 - filter out potentially multiple instances of -Wl,-z,relro from krb5-config
   output, now that it's in the buildroot's default LDFLAGS
 - pull in a patch to fix losing track of the replay cache FD, from SVN by
   way of Kevin Coffman
 
 * Wed Jul 20 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-7
-- kadmind.init: drop the attempt to detect no-database-present errors (#723723),
+- kadmind.init: drop the attempt to detect no-database-present errors (rhbz#723723),
   which is too fragile in cases where the database has been manually moved or
   is accessed through another kdb plugin
 
 * Tue Jul 19 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-6
 - backport fixes to teach libkrb5 to use descriptors higher than FD_SETSIZE
-  to talk to a KDC by using poll() if it's detected at compile-time (#701446,
+  to talk to a KDC by using poll() if it's detected at compile-time (rhbz#701446,
   RT#6905)
 
 * Thu Jun 23 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-5
 - pull a fix from SVN to try to avoid triggering a PTR lookup in getaddrinfo()
   during krb5_sname_to_principal(), and to let getaddrinfo() decide whether or
   not to ask for an IPv6 address based on the set of configured interfaces
-  (#717378, RT#6922)
+  (rhbz#717378, RT#6922)
 - pull a fix from SVN to use AI_ADDRCONFIG more often (RT#6923)
 
 * Mon Jun 20 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-4
 - apply upstream patch by way of Burt Holzman to fall back to a non-referral
   method in cases where we might be derailed by a KDC that rejects the
-  canonicalize option (for example, those from the RHEL 2.1 or 3 era) (#715074)
+  canonicalize option (for example, those from the RHEL 2.1 or 3 era) (rhbz#715074)
 
 * Tue Jun 14 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-3
 - pull a fix from SVN to get libgssrpc clients (e.g. kadmin) authenticating
@@ -2420,13 +2838,13 @@ exit 0
 
 * Tue Jun 14 2011 Nalin Dahyabhai <nalin@redhat.com>
 - incorporate a fix to teach the file labeling bits about when replay caches
-  are expunged (#576093)
+  are expunged (rhbz#576093)
 
 * Thu May 26 2011 Nalin Dahyabhai <nalin@redhat.com>
-- switch to the upstream patch for #707145
+- switch to the upstream patch for rhbz#707145
 
 * Wed May 25 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-2
-- klist: don't trip over referral entries when invoked with -s (#707145,
+- klist: don't trip over referral entries when invoked with -s (rhbz#707145,
   RT#6915)
 
 * Fri May  6 2011 Nalin Dahyabhai <nalin@redhat.com>
@@ -2439,26 +2857,26 @@ exit 0
     CVE-2011-0282, CVE-2011-0283, CVE-2011-0284, CVE-2011-0285
 
 * Wed Apr 13 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-9
-- kadmind: add upstream patch to fix free() on an invalid pointer (#696343,
+- kadmind: add upstream patch to fix free() on an invalid pointer (rhbz#696343,
   MITKRB5-SA-2011-004, CVE-2011-0285)
 
 * Mon Apr  4 2011 Nalin Dahyabhai <nalin@redhat.com>
 - don't discard the error code from an error message received in response
-  to a change-password request (#658871, RT#6893)
+  to a change-password request (rhbz#658871, RT#6893)
 
 * Fri Apr  1 2011 Nalin Dahyabhai <nalin@redhat.com>
 - override INSTALL_SETUID at build-time so that ksu is installed into
-  the buildroot with the right permissions (part of #225974)
+  the buildroot with the right permissions (part of rhbz#225974)
 
 * Fri Mar 18 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-8
 - backport change from SVN to fix a computed-value-not-used warning in
-  kpropd (#684065)
+  kpropd (rhbz#684065)
 
 * Tue Mar 15 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-7
 - turn off NSS as the backend for libk5crypto for now to work around its
-  DES string2key not working (#679012)
+  DES string2key not working (rhbz#679012)
 - add revised upstream patch to fix double-free in KDC while returning
-  typed-data with errors (MITKRB5-SA-2011-003, CVE-2011-0284, #674325)
+  typed-data with errors (MITKRB5-SA-2011-003, CVE-2011-0284, rhbz#674325)
 
 * Thu Feb 17 2011 Nalin Dahyabhai <nalin@redhat.com>
 - throw in a not-applied-by-default patch to try to make pkinit debugging
@@ -2471,14 +2889,14 @@ exit 0
 * Wed Feb  9 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-5
 - krb5kdc init script: prototype some changes to do a quick spot-check
   of the TGS and kadmind keys and warn if there aren't any non-weak keys
-  on file for them (to flush out parts of #651466)
+  on file for them (to flush out parts of rhbz#651466)
 
 * Tue Feb  8 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-4
 - add upstream patches to fix standalone kpropd exiting if the per-client
   child process exits with an error (MITKRB5-SA-2011-001), a hang or crash
   in the KDC when using the LDAP kdb backend, and an uninitialized pointer
-  use in the KDC (MITKRB5-SA-2011-002) (CVE-2010-4022, #664009,
-  CVE-2011-0281, #668719, CVE-2011-0282, #668726, CVE-2011-0283, #676126)
+  use in the KDC (MITKRB5-SA-2011-002) (CVE-2010-4022, rhbz#664009,
+  CVE-2011-0281, rhbz#668719, CVE-2011-0282, rhbz#668726, CVE-2011-0283, rhbz#676126)
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -2489,11 +2907,11 @@ exit 0
 
 * Tue Feb  1 2011 Nalin Dahyabhai <nalin@redhat.com>
 - properly advertise that the kpropd init script now supports force-reload
-  (Zbysek Mraz, #630587)
+  (Zbysek Mraz, rhbz#630587)
 
 * Wed Jan 26 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-2
 - pkinit: when verifying signed data, use the CMS APIs for better
-  interoperability (#636985, RT#6851)
+  interoperability (rhbz#636985, RT#6851)
 
 * Wed Dec 22 2010 Nalin Dahyabhai <nalin@redhat.com> 1.9-1
 - update to 1.9 final
@@ -2513,56 +2931,56 @@ exit 0
 * Fri Nov  5 2010 Nalin Dahyabhai <nalin@redhat.com> 1.9-0.beta1.0
 - start moving to 1.9 with beta 1
   - drop patches for RT#5755, RT#6762, RT#6774, RT#6775
-  - drop no-longer-needed backport patch for #539423
+  - drop no-longer-needed backport patch for rhbz#539423
   - drop no-longer-needed patch for CVE-2010-1322
 - if WITH_NSS is set, built with --with-crypto-impl=nss (requires NSS 3.12.9)
 
 * Tue Oct  5 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.3-8
 - incorporate upstream patch to fix uninitialized pointer crash in the KDC's
-  authorization data handling (CVE-2010-1322, #636335)
+  authorization data handling (CVE-2010-1322, rhbz#636335)
 
 * Mon Oct  4 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.3-7
 - rebuild
 
 * Mon Oct  4 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.3-6
 - pull down patches from trunk to implement k5login_authoritative and
-  k5login_directory settings for krb5.conf (#539423)
+  k5login_directory settings for krb5.conf (rhbz#539423)
 
 * Wed Sep 29 2010 jkeating - 1.8.3-5
-- Rebuilt for gcc bug 634757
+- Rebuilt for gcc rhbz#634757
 
 * Wed Sep 15 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.3-4
 - fix reading of keyUsage extensions when attempting to select pkinit client
-  certs (part of #629022, RT#6775)
+  certs (part of rhbz#629022, RT#6775)
 - fix selection of pkinit client certs when one or more don't include a
-  subjectAltName extension (part of #629022, RT#6774)
+  subjectAltName extension (part of rhbz#629022, RT#6774)
 
 * Fri Sep  3 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.3-3
 - build with -fstack-protector-all instead of the default -fstack-protector,
-  so that we add checking to more functions (i.e., all of them) (#629950)
-- also link binaries with -Wl,-z,relro,-z,now (part of #629950)
+  so that we add checking to more functions (i.e., all of them) (rhbz#629950)
+- also link binaries with -Wl,-z,relro,-z,now (part of rhbz#629950)
 
 * Tue Aug 24 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.3-2
-- fix a logic bug in computing key expiration times (RT#6762, #627022)
+- fix a logic bug in computing key expiration times (RT#6762, rhbz#627022)
 
 * Wed Aug  4 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.3-1
 - update to 1.8.3
   - drop backports of fixes for gss context expiration and error table
     registration/deregistration mismatch
-  - drop patch for upstream #6750
+  - drop patch for upstream rhbz#6750
 
 * Wed Jul  7 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.2-3
 - tell krb5kdc and kadmind to create pid files, since they can
-- add logrotate configuration files for krb5kdc and kadmind (#462658)
-- fix parsing of the pidfile option in the KDC (upstream #6750)
+- add logrotate configuration files for krb5kdc and kadmind (rhbz#462658)
+- fix parsing of the pidfile option in the KDC (upstream rhbz#6750)
 
 * Mon Jun 21 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.2-2
 - libgssapi: pull in patch from svn to stop returning context-expired errors
-  when the ticket which was used to set up the context expires (#605366,
-  upstream #6739)
+  when the ticket which was used to set up the context expires (rhbz#605366,
+  upstream rhbz#6739)
 
 * Mon Jun 21 2010 Nalin Dahyabhai <nalin@redhat.com>
-- pull up fix for upstream #6745, in which the gssapi library would add the
+- pull up fix for upstream rhbz#6745, in which the gssapi library would add the
   wrong error table but subsequently attempt to unload the right one
 
 * Thu Jun 10 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.2-1
@@ -2574,8 +2992,8 @@ exit 0
 
 * Thu May 27 2010 Nalin Dahyabhai <nalin@redhat.com>
 - ksu: move session management calls to before we drop privileges, like
-  su does (#596887), and don't skip the PAM account check for root or the
-  same user (more of #540769)
+  su does (rhbz#596887), and don't skip the PAM account check for root or the
+  same user (more of rhbz#540769)
 
 * Mon May 24 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.1-6
 - make krb5-server-ldap also depend on the same version-release of krb5-libs,
@@ -2588,20 +3006,20 @@ exit 0
 
 * Tue May 18 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.1-5
 - add patch to correct GSSAPI library null pointer dereference which could be
-  triggered by malformed client requests (CVE-2010-1321, #582466)
+  triggered by malformed client requests (CVE-2010-1321, rhbz#582466)
 
 * Tue May  4 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.1-4
-- fix output of kprop's init script's "status" and "reload" commands (#588222)
+- fix output of kprop's init script's "status" and "reload" commands (rhbz#588222)
 
 * Tue Apr 20 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.1-3
-- incorporate patch to fix double-free in the KDC (CVE-2010-1320, #581922)
+- incorporate patch to fix double-free in the KDC (CVE-2010-1320, rhbz#581922)
 
 * Wed Apr 14 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.1-2
 - fix a typo in kerberos.ldif
 
 * Fri Apr  9 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.1-1
 - update to 1.8.1
-  - no longer need patches for #555875, #561174, #563431, RT#6661, CVE-2010-0628
+  - no longer need patches for rhbz#555875, rhbz#561174, rhbz#563431, RT#6661, CVE-2010-0628
 - replace buildrequires on tetex-latex with one on texlive-latex, which is
   the package that provides it now
 
@@ -2611,21 +3029,21 @@ exit 0
 * Thu Apr  8 2010 Nalin Dahyabhai <nalin@redhat.com>
 - drop patch to suppress key expiration warnings sent from the KDC in
   the last-req field, as the KDC is expected to just be configured to either
-  send them or not as a particular key approaches expiration (#556495)
+  send them or not as a particular key approaches expiration (rhbz#556495)
 
 * Tue Mar 23 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.8-5
-- add upstream fix for denial-of-service in SPNEGO (CVE-2010-0628, #576325)
+- add upstream fix for denial-of-service in SPNEGO (CVE-2010-0628, rhbz#576325)
 - kdc.conf: no more need to suggest keeping keys with v4-compatible salting
 
 * Fri Mar 19 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.8-4
 - remove the krb5-appl bits (the -workstation-clients and -workstation-servers
   subpackages) now that krb5-appl is its own package
-- replace our patch for #563431 (kpasswd doesn't fall back to guessing your
+- replace our patch for rhbz#563431 (kpasswd doesn't fall back to guessing your
   principal name using your user name if you don't have a ccache) with the
   one upstream uses
 
 * Fri Mar 12 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.8-3
-- add documentation for the ticket_lifetime option (#561174)
+- add documentation for the ticket_lifetime option (rhbz#561174)
 
 * Mon Mar  8 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.8-2
 - pull up patch to get the client libraries to correctly perform password
@@ -2645,10 +3063,10 @@ exit 0
 - fix a null pointer dereference and crash introduced in our PAM patch that
   would happen if ftpd was given the name of a user who wasn't known to the
   local system, limited to being triggerable by gssapi-authenticated clients by
-  the default xinetd config (Olivier Fourdan, #569472)
+  the default xinetd config (Olivier Fourdan, rhbz#569472)
 
 * Tue Mar  2 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7.1-5
-- fix a regression (not labeling a kdb database lock file correctly, #569902)
+- fix a regression (not labeling a kdb database lock file correctly, rhbz#569902)
 
 * Thu Feb 25 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7.1-4
 - move the package changelog to the end to match the usual style (jdennis)
@@ -2658,15 +3076,15 @@ exit 0
 
 * Wed Feb 17 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7.1-3
 - pull up the change to make kpasswd's behavior better match the docs
-  when there's no ccache (#563431)
+  when there's no ccache (rhbz#563431)
 
 * Tue Feb 16 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7.1-2
 - apply patch from upstream to fix KDC denial of service (CVE-2010-0283,
-  #566002)
+  rhbz#566002)
 
 * Wed Feb  3 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7.1-1
 - update to 1.7.1
-  - don't trip AD lockout on wrong password (#542687, #554351)
+  - don't trip AD lockout on wrong password (rhbz#542687, rhbz#554351)
   - incorporates fixes for CVE-2009-4212 and CVE-2009-3295
   - fixes gss_krb5_copy_ccache() when SPNEGO is used
 - move sim_client/sim_server, gss-client/gss-server, uuclient/uuserver to
@@ -2676,7 +3094,7 @@ exit 0
   depends on -workstation which also includes them
 
 * Mon Jan 25 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-23
-- tighten up default permissions on kdc.conf and kadm5.acl (#558343)
+- tighten up default permissions on kdc.conf and kadm5.acl (rhbz#558343)
 
 * Fri Jan 22 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-22
 - use portreserve correctly -- portrelease takes the basename of the file
@@ -2685,47 +3103,47 @@ exit 0
 * Mon Jan 18 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-21
 - suppress warnings of impending password expiration if expiration is more than
   seven days away when the KDC reports it via the last-req field, just as we
-  already do when it reports expiration via the key-expiration field (#556495)
+  already do when it reports expiration via the key-expiration field (rhbz#556495)
 - link with libtinfo rather than libncurses, when we can, in future RHEL
 
 * Fri Jan 15 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-20
 - krb5_get_init_creds_password: check opte->flags instead of options->flags
-  when checking whether or not we get to use the prompter callback (#555875)
+  when checking whether or not we get to use the prompter callback (rhbz#555875)
 
 * Thu Jan 14 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-19
 - use portreserve to make sure the KDC can always bind to the kerberos-iv
   port, kpropd can always bind to the krb5_prop port, and that kadmind can
-  always bind to the kerberos-adm port (#555279)
+  always bind to the kerberos-adm port (rhbz#555279)
 - correct inadvertent use of macros in the changelog (rpmlint)
 
 * Tue Jan 12 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-18
 - add upstream patch for integer underflow during AES and RC4 decryption
-  (CVE-2009-4212), via Tom Yu (#545015)
+  (CVE-2009-4212), via Tom Yu (rhbz#545015)
 
 * Wed Jan  6 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-17
 - put the conditional back for the -devel subpackage
-- back down to the earlier version of the patch for #551764; the backported
+- back down to the earlier version of the patch for rhbz#551764; the backported
   alternate version was incomplete
 
 * Tue Jan  5 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-16
 - use %%global instead of %%define
 - pull up proposed patch for creating previously-not-there lock files for
-  kdb databases when 'kdb5_util' is called to 'load' (#551764)
+  kdb databases when 'kdb5_util' is called to 'load' (rhbz#551764)
 
 * Mon Jan  4 2010 Dennis Gregorovic <dgregor@redhat.com>
 - fix conditional for future RHEL
 
 * Mon Jan  4 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-15
 - add upstream patch for KDC crash during referral processing (CVE-2009-3295),
-  via Tom Yu (#545002)
+  via Tom Yu (rhbz#545002)
 
 * Mon Dec 21 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-14
-- refresh patch for #542868 from trunk
+- refresh patch for rhbz#542868 from trunk
 
 * Thu Dec 10 2009 Nalin Dahyabhai <nalin@redhat.com>
 - move man pages that live in the -libs subpackage into the regular
   %%{_mandir} tree where they'll still be found if that package is the
-  only one installed (#529319)
+  only one installed (rhbz#529319)
 
 * Wed Dec  9 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-13
 - and put it back in
@@ -2734,14 +3152,14 @@ exit 0
 - back that last change out
 
 * Tue Dec  8 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-12
-- try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)
+- try to make gss_krb5_copy_ccache() work correctly for spnego (rhbz#542868)
 
 * Fri Dec  4 2009 Nalin Dahyabhai <nalin@redhat.com>
-- make krb5-config suppress CFLAGS output when called with --libs (#544391)
+- make krb5-config suppress CFLAGS output when called with --libs (rhbz#544391)
 
 * Thu Dec  3 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-11
 - ksu: move account management checks to before we drop privileges, like
-  su does (#540769)
+  su does (rhbz#540769)
 - selinux: set the user part of file creation contexts to match the current
   context instead of what we looked up
 - configure with --enable-dns-for-realm instead of --enable-dns, which isn't
@@ -2749,7 +3167,7 @@ exit 0
 
 * Fri Nov 20 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-10
 - move /etc/pam.d/ksu from krb5-workstation-servers to krb5-workstation,
-  where it's actually needed (#538703)
+  where it's actually needed (rhbz#538703)
 
 * Fri Oct 23 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-9
 - add some conditional logic to simplify building on older Fedora releases
@@ -2760,11 +3178,11 @@ exit 0
 * Mon Sep 14 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-8
 - specify the location of the subsystem lock when using the status() function
   in the kadmind and kpropd init scripts, so that we get the right error when
-  we're dead but have a lock file - requires initscripts 8.99 (#521772)
+  we're dead but have a lock file - requires initscripts 8.99 (rhbz#521772)
 
 * Tue Sep  8 2009 Nalin Dahyabhai <nalin@redhat.com>
 - if the init script fails to start krb5kdc/kadmind/kpropd because it's already
-  running (according to status()), return 0 (part of #521772)
+  running (according to status()), return 0 (part of rhbz#521772)
 
 * Mon Aug 24 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-7
 - work around a compile problem with new openssl
@@ -2823,7 +3241,7 @@ exit 0
 - drop static build logic
 - drop pam_krb5-specific configuration from the default krb5.conf
 - drop only-use-v5 flags being passed to various things started by xinetd
-- put %%{krb5prefix}/sbin in everyone's path, too (#504525)
+- put %%{krb5prefix}/sbin in everyone's path, too (rhbz#504525)
 
 * Tue May 19 2009 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-106
 - add an auth stack to ksu's PAM configuration so that pam_setcred() calls
@@ -2847,7 +3265,7 @@ exit 0
 - add LSB-style init script info
 
 * Fri Apr 17 2009 Nalin Dahyabhai <nalin@redhat.com>
-- explicitly run the pdf generation script using sh (part of #225974)
+- explicitly run the pdf generation script using sh (part of rhbz#225974)
 
 * Tue Apr  7 2009 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-101
 - add patches for read overflow and null pointer dereference in the
@@ -2863,14 +3281,14 @@ exit 0
 - use triggeruns to properly shut down and disable krb524d when -server and
   -workstation-servers gets upgraded, because it's gone now
 - move the libraries to /%%{_lib}, but leave --libdir alone so that plugins
-  get installed and are searched for in the same locations (#473333)
+  get installed and are searched for in the same locations (rhbz#473333)
 - clean up buildprereq/prereqs, explicit mktemp requires, and add the
-  ldconfig for the -server-ldap subpackage (part of #225974)
-- escape possible macros in the changelog (part of #225974)
-- fixup summary texts (part of #225974)
-- take the execute bit off of the protocol docs (part of #225974)
-- unflag init scripts as configuration files (part of #225974)
-- make the kpropd init script treat 'reload' as 'restart' (part of #225974)
+  ldconfig for the -server-ldap subpackage (part of rhbz#225974)
+- escape possible macros in the changelog (part of rhbz#225974)
+- fixup summary texts (part of rhbz#225974)
+- take the execute bit off of the protocol docs (part of rhbz#225974)
+- unflag init scripts as configuration files (part of rhbz#225974)
+- make the kpropd init script treat 'reload' as 'restart' (part of rhbz#225974)
 
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when
@@ -2885,7 +3303,7 @@ exit 0
 * Thu Sep  4 2008 Nalin Dahyabhai <nalin@redhat.com>
 - if we successfully change the user's password during an attempt to get
   initial credentials, but then fail to get initial creds from a non-master
-  using the new password, retry against the master (#432334)
+  using the new password, retry against the master (rhbz#432334)
 
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.6.3-16
 - fix license tag
@@ -2908,7 +3326,7 @@ exit 0
 
 * Wed Apr 16 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-13
 - ftp: use the correct local filename during mget when the 'case' option is
-  enabled (#442713)
+  enabled (rhbz#442713)
 
 * Fri Apr  4 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-12
 - stop exporting kadmin keys to a keytab file when kadmind starts -- the
@@ -2922,17 +3340,17 @@ exit 0
 * Tue Mar 18 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-10
 - add fixes from MITKRB5-SA-2008-001 for use of null or dangling pointer
   when v4 compatibility is enabled on the KDC (CVE-2008-0062, CVE-2008-0063,
-  #432620, #432621)
+  rhbz#432620, rhbz#432621)
 - add fixes from MITKRB5-SA-2008-002 for array out-of-bounds accesses when
-  high-numbered descriptors are used (CVE-2008-0947, #433596)
+  high-numbered descriptors are used (CVE-2008-0947, rhbz#433596)
 - add backport bug fix for an attempt to free non-heap memory in
-  libgssapi_krb5 (CVE-2007-5901, #415321)
+  libgssapi_krb5 (CVE-2007-5901, rhbz#415321)
 - add backport bug fix for a double-free in out-of-memory situations in
-  libgssapi_krb5 (CVE-2007-5971, #415351)
+  libgssapi_krb5 (CVE-2007-5971, rhbz#415351)
 
 * Tue Mar 18 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-9
 - rework file labeling patch to not depend on fragile preprocessor trickery,
-  in another attempt at fixing #428355 and friends
+  in another attempt at fixing rhbz#428355 and friends
 
 * Tue Feb 26 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-8
 - ftp: add patch to fix "runique on" case when globbing fixes applied
@@ -2940,12 +3358,12 @@ exit 0
 
 * Mon Feb 25 2008 Nalin Dahyabhai <nalin@redhat.com>
 - add patch to suppress double-processing of /etc/krb5.conf when we build
-  with --sysconfdir=/etc, thereby suppressing double-logging (#231147)
+  with --sysconfdir=/etc, thereby suppressing double-logging (rhbz#231147)
 
 * Mon Feb 25 2008 Nalin Dahyabhai <nalin@redhat.com>
 - remove a patch, to fix problems with interfaces which are "up" but which
   have no address assigned, which conflicted with a different fix for the same
-  problem in 1.5 (#200979)
+  problem in 1.5 (rhbz#200979)
 
 * Mon Feb 25 2008 Nalin Dahyabhai <nalin@redhat.com>
 - ftp: don't lose track of a descriptor on passive get when the server fails to
@@ -2969,22 +3387,22 @@ exit 0
 
 * Tue Feb 12 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-5
 - enable patch for key-expiration reporting
-- enable patch to make kpasswd fall back to TCP if UDP fails (#251206)
+- enable patch to make kpasswd fall back to TCP if UDP fails (rhbz#251206)
 - enable patch to make kpasswd use the right sequence number on retransmit
 - enable patch to allow mech-specific creds delegated under spnego to be found
   when searching for creds
 
 * Wed Jan  2 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-4
 - some init script cleanups
-  - drop unquoted check and silent exit for "$NETWORKING" (#426852, #242502)
+  - drop unquoted check and silent exit for "$NETWORKING" (rhbz#426852, rhbz#242502)
   - krb524: don't barf on missing database if it looks like we're using kldap,
     same as for kadmin
   - return non-zero status for missing files which cause startup to
-    fail (#242502)
+    fail (rhbz#242502)
 
 * Tue Dec 18 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-3
 - allocate space for the nul-terminator in the local pathname when looking up
-  a file context, and properly free a previous context (Jose Plans, #426085)
+  a file context, and properly free a previous context (Jose Plans, rhbz#426085)
 
 * Wed Dec  5 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.3-2
 - rebuild
@@ -3000,7 +3418,7 @@ exit 0
 
 * Fri Oct 12 2007 Nalin Dahyabhai <nalin@redhat.com>
 - make krb5.conf %%verify(not md5 size mtime) in addition to
-  %%config(noreplace), like /etc/nsswitch.conf (#329811)
+  %%config(noreplace), like /etc/nsswitch.conf (rhbz#329811)
 
 * Mon Oct  1 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.2-9
 - apply the fix for CVE-2007-4000 instead of the experimental patch for
@@ -3017,7 +3435,7 @@ exit 0
 
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.2-6
 - incorporate updated fix for CVE-2007-3999 (CVE-2007-4743)
-- fix incorrect call to "test" in the kadmin init script (#252322,#287291)
+- fix incorrect call to "test" in the kadmin init script (rhbz#252322,rhbz#287291)
 
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.2-5
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
@@ -3030,7 +3448,7 @@ exit 0
 - rebuild
 
 * Thu Jul 26 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.2-2
-- kdc.conf: default to listening for TCP clients, too (#248415)
+- kdc.conf: default to listening for TCP clients, too (rhbz#248415)
 
 * Thu Jul 19 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.2-1
 - update to 1.6.2
@@ -3056,13 +3474,13 @@ exit 0
 - rebuild
 
 * Sun Jun 24 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.1-3
-- label all files at creation-time according to the SELinux policy (#228157)
+- label all files at creation-time according to the SELinux policy (rhbz#228157)
 
 * Fri Jun 22 2007 Nalin Dahyabhai <nalin@redhat.com>
-- perform PAM account / session management in krshd (#182195,#195922)
+- perform PAM account / session management in krshd (rhbz#182195,rhbz#195922)
 - perform PAM authentication and account / session management in ftpd
 - perform PAM authentication, account / session management, and password-
-  changing in login.krb5 (#182195,#195922)
+  changing in login.krb5 (rhbz#182195,rhbz#195922)
 
 * Fri Jun 22 2007 Nalin Dahyabhai <nalin@redhat.com>
 - preprocess kerberos.ldif into a format FDS will like better, and include
@@ -3072,7 +3490,7 @@ exit 0
 - switch man pages to being generated with the right paths in them
 - drop old, incomplete SELinux patch
 - add patch from Greg Hudson to make srvtab routines report missing-file errors
-  at same point that keytab routines do (#241805)
+  at same point that keytab routines do (rhbz#241805)
 
 * Thu May 24 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.1-2
 - pull patch from svn to undo unintentional chattiness in ftp
@@ -3093,7 +3511,7 @@ exit 0
 * Wed May 16 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6-6
 - omit dependent libraries from the krb5-config --libs output, as using
   shared libraries (no more static libraries) makes them unnecessary and
-  they're not part of the libkrb5 interface (patch by Rex Dieter, #240220)
+  they're not part of the libkrb5 interface (patch by Rex Dieter, rhbz#240220)
   (strips out libkeyutils, libresolv, libdl)
 
 * Fri May  4 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6-5
@@ -3108,17 +3526,17 @@ exit 0
 * Fri Apr 13 2007 Nalin Dahyabhai <nalin@redhat.com>
 - move the default acl_file, dict_file, and admin_keytab settings to
   the part of the default/example kdc.conf where they'll actually have
-  an effect (#236417)
+  an effect (rhbz#236417)
 
 * Thu Apr  5 2007 Nalin Dahyabhai <nalin@redhat.com> 1.5-24
 - merge security fixes from RHSA-2007:0095
 
 * Tue Apr  3 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6-3
 - add patch to correct unauthorized access via krb5-aware telnet
-  daemon (#229782, CVE-2007-0956)
+  daemon (rhbz#229782, CVE-2007-0956)
 - add patch to fix buffer overflow in krb5kdc and kadmind
-  (#231528, CVE-2007-0957)
-- add patch to fix double-free in kadmind (#231537, CVE-2007-1216)
+  (rhbz#231528, CVE-2007-0957)
+- add patch to fix double-free in kadmind (rhbz#231537, CVE-2007-1216)
 
 * Thu Mar 22 2007 Nalin Dahyabhai <nalin@redhat.com>
 - back out buildrequires: keyutils-libs-devel for now
@@ -3134,19 +3552,19 @@ exit 0
 
 * Thu Mar 15 2007 Nalin Dahyabhai <nalin@redhat.com> 1.5-21
 - add preliminary patch to fix buffer overflow in krb5kdc and kadmind
-  (#231528, CVE-2007-0957)
-- add preliminary patch to fix double-free in kadmind (#231537, CVE-2007-1216)
+  (rhbz#231528, CVE-2007-0957)
+- add preliminary patch to fix double-free in kadmind (rhbz#231537, CVE-2007-1216)
 
 * Wed Feb 28 2007 Nalin Dahyabhai <nalin@redhat.com>
 - add patch to build semi-useful static libraries, but don't apply it unless
   we need them
 
 * Tue Feb 27 2007 Nalin Dahyabhai <nalin@redhat.com> - 1.5-20
-- temporarily back out %%post changes, fix for #143289 for security update
+- temporarily back out %%post changes, fix for rhbz#143289 for security update
 - add preliminary patch to correct unauthorized access via krb5-aware telnet
 
 * Mon Feb 19 2007 Nalin Dahyabhai <nalin@redhat.com>
-- make profile.d scriptlets mode 644 instead of 755 (part of #225974)
+- make profile.d scriptlets mode 644 instead of 755 (part of rhbz#225974)
 
 * Tue Jan 30 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6-1
 - clean up quoting of command-line arguments passed to the krsh/krlogin
@@ -3154,22 +3572,22 @@ exit 0
 
 * Mon Jan 22 2007 Nalin Dahyabhai <nalin@redhat.com>
 - initial update to 1.6, pre-package-reorg
-- move workstation daemons to a new subpackage (#81836, #216356, #217301), and
-  make the new subpackage require xinetd (#211885)
+- move workstation daemons to a new subpackage (rhbz#81836, rhbz#216356, rhbz#217301), and
+  make the new subpackage require xinetd (rhbz#211885)
 
 * Mon Jan 22 2007 Nalin Dahyabhai <nalin@redhat.com> - 1.5-18
-- make use of install-info more failsafe (Ville Skyttä, #223704)
+- make use of install-info more failsafe (Ville Skyttä, rhbz#223704)
 - preserve timestamps on shell scriptlets at %%install-time
 
 * Tue Jan 16 2007 Nalin Dahyabhai <nalin@redhat.com> - 1.5-17
-- move to using pregenerated PDF docs to cure multilib conflicts (#222721)
+- move to using pregenerated PDF docs to cure multilib conflicts (rhbz#222721)
 
 * Fri Jan 12 2007 Nalin Dahyabhai <nalin@redhat.com> - 1.5-16
-- update backport of the preauth module interface (part of #194654)
+- update backport of the preauth module interface (part of rhbz#194654)
 
 * Tue Jan  9 2007 Nalin Dahyabhai <nalin@redhat.com> - 1.5-14
-- apply fixes from Tom Yu for MITKRB5-SA-2006-002 (CVE-2006-6143) (#218456)
-- apply fixes from Tom Yu for MITKRB5-SA-2006-003 (CVE-2006-6144) (#218456)
+- apply fixes from Tom Yu for MITKRB5-SA-2006-002 (CVE-2006-6143) (rhbz#218456)
+- apply fixes from Tom Yu for MITKRB5-SA-2006-003 (CVE-2006-6144) (rhbz#218456)
 
 * Wed Dec 20 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-12
 - update backport of the preauth module interface
@@ -3187,21 +3605,21 @@ exit 0
   been applicable for a while
 
 * Wed Oct 18 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-10
-- rename krb5.sh and krb5.csh so that they don't overlap (#210623)
-- way-late application of added error info in kadmind.init (#65853)
+- rename krb5.sh and krb5.csh so that they don't overlap (rhbz#210623)
+- way-late application of added error info in kadmind.init (rhbz#65853)
 
 * Wed Oct 18 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-9.pal_18695
-- add backport of in-development preauth module interface (#208643)
+- add backport of in-development preauth module interface (rhbz#208643)
 
 * Mon Oct  9 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-9
-- provide docs in PDF format instead of as tex source (Enrico Scholz, #209943)
+- provide docs in PDF format instead of as tex source (Enrico Scholz, rhbz#209943)
 
 * Wed Oct  4 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-8
-- add missing shebang headers to krsh and krlogin wrapper scripts (#209238)
+- add missing shebang headers to krsh and krlogin wrapper scripts (rhbz#209238)
 
 * Wed Sep  6 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-7
 - set SS_LIB at configure-time so that libss-using apps get working readline
-  support (#197044)
+  support (rhbz#197044)
 
 * Fri Aug 18 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-6
 - switch to the updated patch for MITKRB-SA-2006-001
@@ -3212,7 +3630,7 @@ exit 0
 * Mon Aug  7 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-4
 - ensure that the gssapi library's been initialized before walking the
   internal mechanism list in gss_release_oid(), needed if called from
-  gss_release_name() right after a gss_import_name() (#198092)
+  gss_release_name() right after a gss_import_name() (rhbz#198092)
 
 * Tue Jul 25 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-3
 - rebuild
@@ -3233,7 +3651,7 @@ exit 0
 - update to 1.5
 
 * Fri Jun 23 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-9
-- mark profile.d config files noreplace (Laurent Rineau, #196447)
+- mark profile.d config files noreplace (Laurent Rineau, rhbz#196447)
 
 * Thu Jun  8 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-8
 - add buildprereq for autoconf
@@ -3241,11 +3659,11 @@ exit 0
 * Mon May 22 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-7
 - further munge krb5-config so that 'libdir=/usr/lib' is given even on 64-bit
   architectures, to avoid multilib conflicts; other changes will conspire to
-  strip out the -L flag which uses this, so it should be harmless (#192692)
+  strip out the -L flag which uses this, so it should be harmless (rhbz#192692)
 
 * Fri Apr 28 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-6
 - adjust the patch which removes the use of rpath to also produce a
-  krb5-config which is okay in multilib environments (#190118)
+  krb5-config which is okay in multilib environments (rhbz#190118)
 - make the name-of-the-tempfile comment which compile_et adds to error code
   headers always list the same file to avoid conflicts on multilib installations
 - strip SIZEOF_LONG out of krb5.h so that it doesn't conflict on multilib boxes
@@ -3260,7 +3678,7 @@ exit 0
 
 * Mon Feb  6 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-4
 - give a little bit more information to the user when kinit gets the catch-all
-  I/O error (#180175)
+  I/O error (rhbz#180175)
 
 * Thu Jan 19 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-3
 - rebuild properly when pthread_mutexattr_setrobust_np() is defined but not
@@ -3274,23 +3692,23 @@ exit 0
 
 * Thu Dec  1 2005 Nalin Dahyabhai <nalin@redhat.com>
 - login: don't truncate passwords before passing them into crypt(), in
-  case they're significant (#149476)
+  case they're significant (rhbz#149476)
 
 * Thu Nov 17 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-1
 - update to 1.4.3
-- make ksu setuid again (#137934, others)
+- make ksu setuid again (rhbz#137934, others)
 
 * Tue Sep 13 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.2-4
 - mark %%{krb5prefix}/man so that files which are packaged within it are
-  flagged as %%doc (#168163)
+  flagged as %%doc (rhbz#168163)
 
 * Tue Sep  6 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.2-3
 - add an xinetd configuration file for encryption-only telnetd, parallelling
-  the kshell/ekshell pair (#167535)
+  the kshell/ekshell pair (rhbz#167535)
 
 * Wed Aug 31 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.2-2
 - change the default configured encryption type for KDC databases to the
-  compiled-in default of des3-hmac-sha1 (#57847)
+  compiled-in default of des3-hmac-sha1 (rhbz#57847)
 
 * Thu Aug 11 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.2-1
 - update to 1.4.2, incorporating the fixes for MIT-KRB5-SA-2005-002 and
@@ -3301,23 +3719,23 @@ exit 0
 
 * Wed Jun 29 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.1-5
 - fix telnet client environment variable disclosure the same way NetKit's
-  telnet client did (CAN-2005-0488) (#159305)
+  telnet client did (CAN-2005-0488) (rhbz#159305)
 - keep apps which call krb5_principal_compare() or krb5_realm_compare() with
   malformed or NULL principal structures from crashing outright (Thomas Biege)
-  (#161475)
+  (rhbz#161475)
 
 * Tue Jun 28 2005 Nalin Dahyabhai <nalin@redhat.com>
 - apply fixes from draft of MIT-KRB5-SA-2005-002 (CAN-2005-1174,CAN-2005-1175)
-  (#157104)
-- apply fixes from draft of MIT-KRB5-SA-2005-003 (CAN-2005-1689) (#159755)
+  (rhbz#157104)
+- apply fixes from draft of MIT-KRB5-SA-2005-003 (CAN-2005-1689) (rhbz#159755)
 
 * Fri Jun 24 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.1-4
 - fix double-close in keytab handling
-- add port of fixes for CAN-2004-0175 to krb5-aware rcp (#151612)
+- add port of fixes for CAN-2004-0175 to krb5-aware rcp (rhbz#151612)
 
 * Fri May 13 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.1-3
 - prevent spurious EBADF in krshd when stdin is closed by the client while
-  the command is running (#151111)
+  the command is running (rhbz#151111)
 
 * Fri May 13 2005 Martin Stransky <stransky@redhat.com> 1.4.1-2
 - add deadlock patch, removed old patch
@@ -3376,18 +3794,18 @@ exit 0
 - rebuild
 
 * Mon Nov 22 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.5-3
-- fix predictable-tempfile-name bug in krb5-send-pr (CAN-2004-0971, #140036)
+- fix predictable-tempfile-name bug in krb5-send-pr (CAN-2004-0971, rhbz#140036)
 
 * Tue Nov 16 2004 Nalin Dahyabhai <nalin@redhat.com>
 - silence compiler warning in kprop by using an in-memory ccache with a fixed
   name instead of an on-disk ccache with a name generated by tmpnam()
 
 * Tue Nov 16 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.5-2
-- fix globbing patch port mode (#139075)
+- fix globbing patch port mode (rhbz#139075)
 
 * Mon Nov  1 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.5-1
 - fix segfault in telnet due to incorrect checking of gethostbyname_r result
-  codes (#129059)
+  codes (rhbz#129059)
 
 * Fri Oct 15 2004 Nalin Dahyabhai <nalin@redhat.com>
 - remove rc4-hmac:norealm and rc4-hmac:onlyrealm from the default list of
@@ -3412,11 +3830,11 @@ exit 0
 
 * Mon Aug 23 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.4-3
 - incorporate fixes from Tom Yu for CAN-2004-0642, CAN-2004-0772
-  (MITKRB5-SA-2004-002, #130732)
-- incorporate fixes from Tom Yu for CAN-2004-0644 (MITKRB5-SA-2004-003, #130732)
+  (MITKRB5-SA-2004-002, rhbz#130732)
+- incorporate fixes from Tom Yu for CAN-2004-0644 (MITKRB5-SA-2004-003, rhbz#130732)
 
 * Tue Jul 27 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.4-2
-- fix indexing error in server sorting patch (#127336)
+- fix indexing error in server sorting patch (rhbz#127336)
 
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
@@ -3441,7 +3859,7 @@ exit 0
 - rebuild
 
 * Tue Jun  1 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.3-4
-- apply patch from MITKRB5-SA-2004-001 (#125001)
+- apply patch from MITKRB5-SA-2004-001 (rhbz#125001)
 
 * Wed May 12 2004 Thomas Woerner <twoerner@redhat.com> 1.3.3-3
 - removed rpath
@@ -3471,17 +3889,17 @@ exit 0
 
 * Mon Feb  2 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.1-9
 - remove patch to set TERM in klogind which, combined with the upstream fix in
-  1.3.1, actually produces the bug now (#114762)
+  1.3.1, actually produces the bug now (rhbz#114762)
 
 * Mon Jan 19 2004 Nalin Dahyabhai <nalin@redhat.com> 1.3.1-8
 - when iterating over lists of interfaces which are "up" from getifaddrs(),
-  skip over those which have no address (#113347)
+  skip over those which have no address (rhbz#113347)
 
 * Mon Jan 12 2004 Nalin Dahyabhai <nalin@redhat.com>
 - prefer the kdc which last replied to a request when sending requests to kdcs
 
 * Mon Nov 24 2003 Nalin Dahyabhai <nalin@redhat.com> 1.3.1-7
-- fix combination of --with-netlib and --enable-dns (#82176)
+- fix combination of --with-netlib and --enable-dns (rhbz#82176)
 
 * Tue Nov 18 2003 Nalin Dahyabhai <nalin@redhat.com>
 - remove libdefault ticket_lifetime option from the default krb5.conf, it is
@@ -3690,12 +4108,12 @@ exit 0
 * Wed Jun 27 2001 Nalin Dahyabhai <nalin@redhat.com>
 - add patch to support "ANY" keytab type (i.e.,
   "default_keytab_name = ANY:FILE:/etc/krb5.keytab,SRVTAB:/etc/srvtab"
-  patch from Gerald Britton, #42551)
-- build with -D_FILE_OFFSET_BITS=64 to get large file I/O in ftpd (#30697)
+  patch from Gerald Britton, rhbz#42551)
+- build with -D_FILE_OFFSET_BITS=64 to get large file I/O in ftpd (rhbz#30697)
 - patch ftpd to use long long and %%lld format specifiers to support the SIZE
-  command on large files (also #30697)
-- don't use LOG_AUTH as an option value when calling openlog() in ksu (#45965)
-- implement reload in krb5kdc and kadmind init scripts (#41911)
+  command on large files (also rhbz#30697)
+- don't use LOG_AUTH as an option value when calling openlog() in ksu (rhbz#45965)
+- implement reload in krb5kdc and kadmind init scripts (rhbz#41911)
 - lose the krb5server init script (not using it any more)
 
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
@@ -3708,7 +4126,7 @@ exit 0
 - rebuild in new environment
 
 * Thu Apr 26 2001 Nalin Dahyabhai <nalin@redhat.com>
-- add patch from Tom Yu to fix ftpd overflows (#37731)
+- add patch from Tom Yu to fix ftpd overflows (rhbz#37731)
 
 * Wed Apr 18 2001 Than Ngo <than@redhat.com>
 - disable optimizations on the alpha again
@@ -3732,7 +4150,7 @@ exit 0
 - own %%{_var}/kerberos
 
 * Tue Feb  6 2001 Nalin Dahyabhai <nalin@redhat.com>
-- own the directories which are created for each package (#26342)
+- own the directories which are created for each package (rhbz#26342)
 
 * Tue Jan 23 2001 Nalin Dahyabhai <nalin@redhat.com>
 - gettextize init scripts
@@ -3742,7 +4160,7 @@ exit 0
 - re-enable optimization on alphas
 
 * Mon Jan 15 2001 Nalin Dahyabhai <nalin@redhat.com>
-- fix krb5-send-pr (#18932) and move it from -server to -workstation
+- fix krb5-send-pr (rhbz#18932) and move it from -server to -workstation
 - buildprereq libtermcap-devel
 - temporariliy disable optimization on alphas
 - gettextize init scripts
@@ -3754,29 +4172,29 @@ exit 0
 - rebuild in new environment
 
 * Tue Oct 31 2000 Nalin Dahyabhai <nalin@redhat.com>
-- add bison as a BuildPrereq (#20091)
+- add bison as a BuildPrereq (rhbz#20091)
 
 * Mon Oct 30 2000 Nalin Dahyabhai <nalin@redhat.com>
-- change /usr/dict/words to /usr/share/dict/words in default kdc.conf (#20000)
+- change /usr/dict/words to /usr/share/dict/words in default kdc.conf (rhbz#20000)
 
 * Thu Oct  5 2000 Nalin Dahyabhai <nalin@redhat.com>
 - apply kpasswd bug fixes from David Wragg
 
 * Wed Oct  4 2000 Nalin Dahyabhai <nalin@redhat.com>
-- make krb5-libs obsolete the old krb5-configs package (#18351)
+- make krb5-libs obsolete the old krb5-configs package (rhbz#18351)
 - don't quit from the kpropd init script if there's no principal database so
   that you can propagate the first time without running kpropd manually
 - don't complain if /etc/ld.so.conf doesn't exist in the -libs %%post
 
 * Tue Sep 12 2000 Nalin Dahyabhai <nalin@redhat.com>
 - fix credential forwarding problem in klogind (goof in KRB5CCNAME handling)
-  (#11588)
-- fix heap corruption bug in FTP client (#14301)
+  (rhbz#11588)
+- fix heap corruption bug in FTP client (rhbz#14301)
 
 * Wed Aug 16 2000 Nalin Dahyabhai <nalin@redhat.com>
 - fix summaries and descriptions
 - switched the default transfer protocol from PORT to PASV as proposed on
-  bugzilla (#16134), and to match the regular ftp package's behavior
+  bugzilla (rhbz#16134), and to match the regular ftp package's behavior
 
 * Wed Jul 19 2000 Jeff Johnson <jbj@redhat.com>
 - rebuild to compress man pages.
@@ -3852,7 +4270,7 @@ exit 0
 * Sat Jun  3 2000 Nalin Dahyabhai <nalin@redhat.com>
 - use %%{_infodir} to better comply with FHS
 - move .so files to -devel subpackage
-- tweak xinetd config files (bugs #11833, #11835, #11836, #11840)
+- tweak xinetd config files (bugs rhbz#11833, rhbz#11835, rhbz#11836, rhbz#11840)
 - fix package descriptions again
 
 * Wed May 24 2000 Nalin Dahyabhai <nalin@redhat.com>
@@ -3889,7 +4307,7 @@ exit 0
 - fix configure stuff for ia64
 
 * Mon Apr 10 2000 Nalin Dahyabhai <nalin@redhat.com>
-- add LDCOMBINE=-lc to configure invocation to use libc versioning (bug #10653)
+- add LDCOMBINE=-lc to configure invocation to use libc versioning (rhbz#10653)
 - change Requires: for/in subpackages to include %%{version}
 
 * Wed Apr 05 2000 Nalin Dahyabhai <nalin@redhat.com>
diff --git a/krb5kdc.service b/krb5kdc.service
index 806b062..40e23d6 100644
--- a/krb5kdc.service
+++ b/krb5kdc.service
@@ -5,9 +5,9 @@ After=syslog.target network.target network-online.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/krb5kdc.pid
+PIDFile=/run/krb5kdc.pid
 EnvironmentFile=-/etc/sysconfig/krb5kdc
-ExecStart=/usr/sbin/krb5kdc -P /var/run/krb5kdc.pid $KRB5KDC_ARGS
+ExecStart=/usr/sbin/krb5kdc -P /run/krb5kdc.pid $KRB5KDC_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/plans/tests.fmf b/plans/tests.fmf
new file mode 100644
index 0000000..970ae2e
--- /dev/null
+++ b/plans/tests.fmf
@@ -0,0 +1,5 @@
+summary: Tests
+discover:
+  how: fmf
+execute:
+  how: tmt
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..a31a5e3
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,17 @@
+---
+inspections:
+  # https://bugzilla.redhat.com/show_bug.cgi?id=1956479
+  badfuncs: off
+
+  # Not a Java package
+  javabytecode: off
+
+  # I need to be able to *add* functions, and also we export internal
+  # functions that are not considered part of our ABI.
+  abidiff: off
+  
+  # These just flag when things change "too much"
+  changedfiles: off
+  filesize: off
+  patches: off
+  upstream: off
diff --git a/sources b/sources
index c61d805..e8b99ef 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (krb5-1.18.2.tar.gz) = 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
-SHA512 (krb5-1.18.2.tar.gz.asc) = 70775a06104b4d792d278da2efa92e94ddacb4ea319bfe2b253f5afcfec27f3bc5ddd12560294a265e3cf3d4fc74bcbfc3f5eeff8634d66c00d67e18dc93a74a
+SHA512 (krb5-1.21.3.tar.gz) = 87bc06607f4d95ff604169cea22180703a42d667af05f66f1569b8bd592670c42820b335e5c279e8b4f066d1e7da20f1948a1e4def7c5d295c170cbfc7f49c71
+SHA512 (krb5-1.21.3.tar.gz.asc) = 8992a5f5247315b9846aa73be4ee1ea223c0231a52d5c6c28718b1f3e3b45d62e2dad4aa5543a83163d1369bb79886b6c1c22766f22d8aa2f6b2575c54d0075c
diff --git a/tests/got-audit/got-audit.gdb b/tests/got-audit/got-audit.gdb
new file mode 100644
index 0000000..6661297
--- /dev/null
+++ b/tests/got-audit/got-audit.gdb
@@ -0,0 +1,2 @@
+gef config gef.disable_color True
+got-audit --all
diff --git a/tests/got-audit/kdc.conf b/tests/got-audit/kdc.conf
new file mode 100644
index 0000000..ed7299f
--- /dev/null
+++ b/tests/got-audit/kdc.conf
@@ -0,0 +1,12 @@
+[kdcdefaults]
+    kdc_ports = 88
+    kdc_tcp_ports = 88
+
+[realms]
+    ${krb5REALM1} = {
+        #master_key_type = aes256-cts
+        acl_file = /var/kerberos/krb5kdc/kadm5.acl
+        dict_file = /usr/share/dict/words
+        admin_keytab = /var/kerberos/krb5kdc/kadm5.keytab
+        supported_enctypes = aes256-cts:normal aes128-cts:normal des3-hmac-sha1:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal des-hmac-sha1:normal des-cbc-md5:normal des-cbc-crc:normal
+    }
diff --git a/tests/got-audit/krb5.conf b/tests/got-audit/krb5.conf
new file mode 100644
index 0000000..6979cb7
--- /dev/null
+++ b/tests/got-audit/krb5.conf
@@ -0,0 +1,29 @@
+# To opt out of the system crypto-policies configuration of krb5, remove the
+# symlink at /etc/krb5.conf.d/crypto-policies which will not be recreated.
+includedir /etc/krb5.conf.d/
+
+[logging]
+    default = FILE:/var/log/krb5libs.log
+    kdc = FILE:/var/log/krb5kdc.log
+    admin_server = FILE:/var/log/kadmind.log
+
+[libdefaults]
+    default_realm = ${krb5REALM1}
+    dns_lookup_realm = false
+    ticket_lifetime = 24h
+    renew_lifetime = 7d
+    forwardable = true
+    rdns = false
+    default_ccache_name = KEYRING:persistent:%{uid}
+
+[realms]
+    ${krb5REALM1} = {
+        kdc = localhost.localdomain
+        admin_server = localhost.localdomain
+    }
+
+[domain_realm]
+    ${krb5HostName} = ${krb5REALM1}
+
+[capaths]
+    ${krb5REALM1} = .
diff --git a/tests/got-audit/main.fmf b/tests/got-audit/main.fmf
new file mode 100644
index 0000000..f2c1f97
--- /dev/null
+++ b/tests/got-audit/main.fmf
@@ -0,0 +1,12 @@
+summary: Audit the GOT for signs of tampering
+description: |
+  Pointers in the server process GOT will be checked to ensure that
+  each function pointer's value is within a shared object file
+  that exports a symbol of that name, and that no shared object
+  files export conflicting symbols.
+contact: Gordon Messmer <gordon.messmer@gmail.com>
+require+:
+  - gdb-gef           # needed to test got-audit
+  - krb5-server
+test: ./runtest.sh
+framework: beakerlib
diff --git a/tests/got-audit/runtest.sh b/tests/got-audit/runtest.sh
new file mode 100755
index 0000000..925a04e
--- /dev/null
+++ b/tests/got-audit/runtest.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/openssh/Sanity/got-audit
+#   Description: Check pointers in the server process GOT for signs of tampering
+#   Author: Gordon Messmer <gordon.messmer@gmail.com>
+#
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+krb5REALM1='TEST1.REDHAT.COM'
+krb5HostName=`hostname`
+krb5DomainName=`hostname -d`
+krb5User='alice'
+krb5UserPass='alice'
+krb5UserKrbPass='aaa'
+krb5User2='bob'
+krb5User3='carl'
+krb5KDCPass='qwe'
+krb5RootPass='rrr'
+
+krb5conf="/etc/krb5.conf"
+krb5confdir="/etc/krb5.conf.d"
+krb5kdcconf="/var/kerberos/krb5kdc/kdc.conf"
+krb5kadmacl="/var/kerberos/krb5kdc/kadm5.acl"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlServiceStart sshd
+        rlRun "TestDir=\$(pwd)"
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+        rlRun "auditfile=\$(mktemp --tmpdir=${TmpDir})"
+    rlPhaseEnd
+
+    rlPhaseStartSetup "KDC and kadmind setup"
+        # Stop and backup
+        rlRun "rlServiceStop kadmin krb5kdc"
+        rlRun "rm -f /var/kerberos/krb5kdc/principal* /var/kerberos/krb5kdc/.k5*"
+        rlFileBackup $krb5conf /var/kerberos/krb5kdc /etc/sysconfig/{kadmin,krb5kdc} /etc/hosts
+        rlFileBackup --clean /root/.k5login
+        [ -e /etc/krb5.keytab ] && rlFileBackup /etc/krb5.keytab
+        [ -e $krb5confdir ] && rlFileBackup $krb5confdir
+        # Basic setup of KDC and krb5.conf
+        rlRun "sed -i \"s/\[libdefaults\]/[libdefaults]\n default_realm = $krb5REALM1/\" $krb5conf"
+        rlRun "sed -i \"s/\[realms\]/[realms]\n $krb5REALM1 = {\n  kdc = $krb5HostName\n  admin_server = $krb5HostName\n }/\" $krb5conf"
+        if [ "$krb5DomainName" ]; then
+            rlRun "sed -i \"s/\[domain_realm\]/[domain_realm]\n .$krb5DomainName = $krb5REALM1\n $krb5DomainName = $krb5REALM1/\" $krb5conf"
+        else
+            rlRun "sed -i \"s/\[domain_realm\]/[domain_realm]\n $krb5HostName = $krb5REALM1/\" $krb5conf"
+        fi
+        rlRun "sed -i s/EXAMPLE.COM/$krb5REALM1/ $krb5kdcconf"
+        # Configure the kadmin ACL
+        rlRun "echo \"*/master@$krb5REALM1  *\" > $krb5kadmacl"
+        if rlIsFedora '>=31';then
+            rlLog "Modify supported_enctypes for Fedora >=31. Remove *DES ciphers."
+            rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+        elif rlIsRHEL '8' && [ `rpm -q --qf '%{VERSION}' krb5-server | cut -d"." -f2` -lt 18 ];then
+            rlLog "Modify supported_enctypes for RHEL-8."
+            rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal des3-hmac-sha1:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+        else
+            #RHEL-8 Bug 1802334 - [Rebase] krb5: rebase to 1.18:
+            #- Removal of *DES encryption types
+            #https://bugzilla.redhat.com/show_bug.cgi?id=1802334
+            rlLog "Modify supported_enctypes for RHEL-8 with krb-1.18. Remove *DES ciphers."
+            rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+        fi
+        # Create the realm databases
+        rlRun "rngd -r /dev/urandom"
+        rlRun "kdb5_util create -s -r $krb5REALM1 -P $krb5KDCPass"
+        rlRun "rlServiceStart kadmin krb5kdc"
+        rlRun "kadmin.local -r $krb5REALM1 -q \"addprinc -pw $krb5RootPass root/master\""
+        rlRun "kadmin.local -r $krb5REALM1 -q \"addprinc -pw $krb5UserKrbPass $krb5User\""
+        rlRun "kadmin.local -r $krb5REALM1 -q \"addprinc -randkey host/$krb5HostName\""
+        rlRun "kadmin.local -r $krb5REALM1 -q \"ktadd host/$krb5HostName\""
+        # Create test system user 
+        [ $krb5User != "root" ] && rlRun "useradd $krb5User"
+        rlRun "echo $krb5UserPass | passwd --stdin $krb5User"
+    rlPhaseEnd
+
+    rlPhaseStartTest "Run GEF got-audit"
+        rlRun "systemctl restart krb5kdc.service"
+        rlRun "systemctl restart kadmin.service"
+        rlRun "systemctl --no-pager status krb5kdc.service"
+        rlRun "systemctl --no-pager status kadmin.service"
+
+        rlRun "SERVICE_PID=\$( systemctl show --property=MainPID krb5kdc.service | cut -f2 -d= )"
+        rlRun "echo SERVICE_PID is '$SERVICE_PID'"
+        [ -n "$SERVICE_PID" ] || rlFail "No service pid was found"
+        rlRun "gdb-gef --pid '$SERVICE_PID' --command='$TestDir'/got-audit.gdb --batch > '$auditfile'"
+        # Basic test: ensure that at least one symbol is found in libc.so,
+        #  to verify that the report looks plausible.
+        rlAssertGrep " : /.*/libc.so" "$auditfile"
+        # Ensure the got-audit did not report any errors
+        rlAssertNotGrep " :: ERROR" "$auditfile"
+        rlRun "cp '$auditfile' '$TMT_TEST_DATA'/krb5kdc-got-audit.txt"
+
+        rlRun "SERVICE_PID=\$( systemctl show --property=MainPID kadmin.service | cut -f2 -d= )"
+        rlRun "echo SERVICE_PID is '$SERVICE_PID'"
+        [ -n "$SERVICE_PID" ] || rlFail "No service pid was found"
+        rlRun "gdb-gef --pid '$SERVICE_PID' --command='$TestDir'/got-audit.gdb --batch > '$auditfile'"
+        # Basic test: ensure that at least one symbol is found in libc.so,
+        #  to verify that the report looks plausible.
+        rlAssertGrep " : /.*/libc.so" "$auditfile"
+        # Ensure the got-audit did not report any errors
+        rlAssertNotGrep " :: ERROR" "$auditfile"
+        rlRun "cp '$auditfile' '$TMT_TEST_DATA'/kadmin-got-audit.txt"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "rm -rf /var/kerberos/krb5kdc/* /var/kerberos/krb5kdc/.k5* /etc/krb5* /etc/sysconfig/{kadmin,krb5kdc}"
+        rlFileRestore
+        rlServiceRestore krb5kdc kadmin
+        [ $krb5User != "root" ] && rlRun "userdel -r -f $krb5User"
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/inplace-upgrade-sanity-test/Makefile b/tests/inplace-upgrade-sanity/Makefile
similarity index 97%
rename from tests/inplace-upgrade-sanity-test/Makefile
rename to tests/inplace-upgrade-sanity/Makefile
index ccd8818..cfff69d 100644
--- a/tests/inplace-upgrade-sanity-test/Makefile
+++ b/tests/inplace-upgrade-sanity/Makefile
@@ -55,6 +55,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        20m" >> $(METADATA)
 	@echo "RunFor:          krb5" >> $(METADATA)
 	@echo "Requires:        expect krb5-server krb5-workstation openssh-clients openssh-server rng-tools" >> $(METADATA)
+    @echo "Requires:        setools-console" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
diff --git a/tests/inplace-upgrade-sanity-test/PURPOSE b/tests/inplace-upgrade-sanity/PURPOSE
similarity index 100%
rename from tests/inplace-upgrade-sanity-test/PURPOSE
rename to tests/inplace-upgrade-sanity/PURPOSE
diff --git a/tests/inplace-upgrade-sanity/TC#0378369.fmf b/tests/inplace-upgrade-sanity/TC#0378369.fmf
new file mode 100644
index 0000000..8d54d68
--- /dev/null
+++ b/tests/inplace-upgrade-sanity/TC#0378369.fmf
@@ -0,0 +1,21 @@
+tag:
+  - CI-Tier-1
+  - CI-Tier-1-krb5
+  - Fedora 31
+  - Fedora 32
+  - FedoraReady
+  - IDM-CI-gating
+  - NoRHEL4
+  - NoRHEL5
+  - TIPpass
+  - TIPpass_Security
+  - Tier1
+  - Tier1security
+  - rhel_upgrade
+tier: '1'
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0378369
+extra-summary: /CoreOS/krb5/Sanity/inplace-upgrade-sanity-test
diff --git a/tests/inplace-upgrade-sanity/TC#0552039.fmf b/tests/inplace-upgrade-sanity/TC#0552039.fmf
new file mode 100644
index 0000000..7f2731d
--- /dev/null
+++ b/tests/inplace-upgrade-sanity/TC#0552039.fmf
@@ -0,0 +1,17 @@
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1394908
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPpass
+  - TIPpass_Security
+  - Tier2
+tier: '2'
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+environment:
+    TEST_ENTROPY_SOURCE: yes
+extra-nitrate: TC#0552039
+extra-summary: 'BZ#1394908: Enable faster getrandom-based entropy system'
diff --git a/tests/inplace-upgrade-sanity/TC#0608992.fmf b/tests/inplace-upgrade-sanity/TC#0608992.fmf
new file mode 100644
index 0000000..440308f
--- /dev/null
+++ b/tests/inplace-upgrade-sanity/TC#0608992.fmf
@@ -0,0 +1,14 @@
+tag:
+  - Fedora 31
+  - Fedora 32
+  - FedoraReady
+  - NoRHEL4
+  - NoRHEL5
+  - rhel_upgrade
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+manual: true
+extra-nitrate: TC#0608992
+extra-summary: /CoreOS/krb5/Sanity/inplace-upgrade-sanity-test-manual
diff --git a/tests/inplace-upgrade-sanity-test/kdc.conf b/tests/inplace-upgrade-sanity/kdc.conf
similarity index 100%
rename from tests/inplace-upgrade-sanity-test/kdc.conf
rename to tests/inplace-upgrade-sanity/kdc.conf
diff --git a/tests/inplace-upgrade-sanity-test/krb5.conf b/tests/inplace-upgrade-sanity/krb5.conf
similarity index 100%
rename from tests/inplace-upgrade-sanity-test/krb5.conf
rename to tests/inplace-upgrade-sanity/krb5.conf
diff --git a/tests/inplace-upgrade-sanity/main.fmf b/tests/inplace-upgrade-sanity/main.fmf
new file mode 100644
index 0000000..40e0a0e
--- /dev/null
+++ b/tests/inplace-upgrade-sanity/main.fmf
@@ -0,0 +1,19 @@
+summary: Verifies basic scenarios which should work after inplace upgrade.
+enabled: true
+contact: Filip Dvorak <fdvorak@redhat.com>
+component:
+- krb5
+test: ./runtest.sh
+path: /tests/inplace-upgrade-sanity
+framework: beakerlib
+require:
+- expect
+- krb5-server
+- krb5-workstation
+- openssh-clients
+- openssh-server
+- rng-tools
+- setools-console
+duration: 20m
+extra-summary: /CoreOS/krb5/Sanity/inplace-upgrade-sanity-test
+extra-task: /CoreOS/krb5/Sanity/inplace-upgrade-sanity-test
diff --git a/tests/inplace-upgrade-sanity-test/runtest.sh b/tests/inplace-upgrade-sanity/runtest.sh
similarity index 67%
rename from tests/inplace-upgrade-sanity-test/runtest.sh
rename to tests/inplace-upgrade-sanity/runtest.sh
index cdd4744..c6e3d45 100755
--- a/tests/inplace-upgrade-sanity-test/runtest.sh
+++ b/tests/inplace-upgrade-sanity/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="krb5"
@@ -36,15 +35,10 @@ PACKAGES="krb5-libs krb5-server krb5-workstation openssh"
 TEST_ENTROPY_SOURCE=${TEST_ENTROPY_SOURCE:-no}
 echo TEST_ENTROPY_SOURCE=$TEST_ENTROPY_SOURCE
 
-hostnamectl set-hostname test.fedora.com
-
-host_ip=`hostname -I | awk '{print$1}'`
-echo "$host_ip test.fedora.com" >> /etc/hosts
-
-krb5REALM1='ZMRAZ.COM'
-krb5REALM2='PKIS.NET'
+krb5REALM1='TEST1.REDHAT.COM'
+krb5REALM2='TEST2.REDHAT.COM'
 krb5HostName=`hostname`
-krb5DomainName='fedora.com'
+krb5DomainName=`hostname -d`
 krb5User='alice'
 krb5UserPass='alice'
 krb5UserKrbPass='aaa'
@@ -58,6 +52,8 @@ krb5confdir="/etc/krb5.conf.d"
 krb5kdcconf="/var/kerberos/krb5kdc/kdc.conf"
 krb5kadmacl="/var/kerberos/krb5kdc/kadm5.acl"
 
+
+
 rlJournalStart
     rlPhaseStartSetup
         for pkg in $PACKAGES; do
@@ -65,6 +61,8 @@ rlJournalStart
         done
         rlRun "TmpDir=\$(mktemp -d)"
         rlRun "pushd $TmpDir"
+        echo "-----/etc/krb5.conf----"; cat /etc/krb5.conf
+        echo "-----/var/kerberos/krb5kdc/kdc.conf-----"; cat /var/kerberos/krb5kdc/kdc.conf
     rlPhaseEnd
 
     # Run this part on OLD and in "normal" mode
@@ -73,18 +71,34 @@ rlJournalStart
         # Stop and backup
         rlRun "rlServiceStop kadmin krb5kdc"
         rlRun "rm -f /var/kerberos/krb5kdc/principal* /var/kerberos/krb5kdc/.k5*"
-        rlFileBackup $krb5conf /var/kerberos/krb5kdc /etc/sysconfig/{kadmin,krb5kdc}
+        rlFileBackup $krb5conf /var/kerberos/krb5kdc /etc/sysconfig/{kadmin,krb5kdc} /etc/hosts
+        rlFileBackup --clean /root/.k5login
         [ -e /etc/krb5.keytab ] && rlFileBackup /etc/krb5.keytab
         [ -e $krb5confdir ] && rlFileBackup $krb5confdir
+        # Make sure IPv4 is used for ssh connection
+        if ! grep `hostname` /etc/hosts; then
+            DEF_DEV=`ip route |grep default |awk '{print $5}'`
+            echo DEF_DEV=$DEF_DEV
+            DEF_IP=`ip -o -4 addr show dev $DEF_DEV |awk '{print $4}' |grep -v '/32' |sed 's|/.*||'`
+            echo DEF_IP=$DEF_IP
+            rlRun "echo '$DEF_IP `hostname`' >>/etc/hosts"
+            grep `hostname` /etc/hosts
+        fi
         # Basic setup of KDC and krb5.conf
         if rlIsRHEL 6; then
             rlRun "sed -i \"s/EXAMPLE.COM/$krb5REALM1/\" $krb5conf"
             rlRun "sed -i \"s/kerberos.example.com/$krb5HostName/\" $krb5conf"
-            rlRun "sed -i \"s/example.com/$krb5DomainName/\" $krb5conf"
+            if [ "$krb5DomainName" ]; then
+                rlRun "sed -i \"s/example.com/$krb5DomainName/\" $krb5conf"
+            fi
         else
             rlRun "sed -i \"s/\[libdefaults\]/[libdefaults]\n default_realm = $krb5REALM1/\" $krb5conf"
             rlRun "sed -i \"s/\[realms\]/[realms]\n $krb5REALM1 = {\n  kdc = $krb5HostName\n  admin_server = $krb5HostName\n }/\" $krb5conf"
-            rlRun "sed -i \"s/\[domain_realm\]/[domain_realm]\n .$krb5DomainName = $krb5REALM1\n $krb5DomainName = $krb5REALM1/\" $krb5conf"
+            if [ "$krb5DomainName" ]; then
+                rlRun "sed -i \"s/\[domain_realm\]/[domain_realm]\n .$krb5DomainName = $krb5REALM1\n $krb5DomainName = $krb5REALM1/\" $krb5conf"
+            else
+                rlRun "sed -i \"s/\[domain_realm\]/[domain_realm]\n $krb5HostName = $krb5REALM1/\" $krb5conf"
+            fi
         fi
         rlRun "sed -i s/EXAMPLE.COM/$krb5REALM1/ $krb5kdcconf"
         # Configure the kadmin ACL
@@ -99,28 +113,59 @@ rlJournalStart
   dict_file = /usr/share/dict/words
   admin_keytab = /var/kerberos/krb5kdc/kadm5.keytab
   supported_enctypes = aes256-cts:normal aes128-cts:normal des3-hmac-sha1:normal arcfour-hmac:normal des-hmac-sha1:normal des-cbc-md5:normal des-cbc-crc:normal
- }
+}
 _EOF
-        rlIsRHEL 6 || rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal des3-hmac-sha1:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal des-hmac-sha1:normal des-cbc-md5:normal des-cbc-crc:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+        
+
+if rlIsRHEL '7'; then
+    rlLog "Modify supported_enctypes for RHEL-7."
+    rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal des3-hmac-sha1:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal des-hmac-sha1:normal des-cbc-md5:normal des-cbc-crc:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+    # Remove 3DES and DES cipher suite from kdc.conf - Fedora 31
+    # Fedora 31 - krb5 will be removing support for DES, 3DES, and crc-32 entirely
+    # they will not be allowed in session keys or long-term keys. (BZ#1670398)
+    # https://fedoraproject.org/wiki/Changes/krb5_crypto_modernization
+elif rlIsFedora '>=31';then
+    rlLog "Modify supported_enctypes for Fedora >=31. Remove *DES ciphers."
+    rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+elif rlIsRHEL '8' && [ `rpm -q --qf '%{VERSION}' krb5-server | cut -d"." -f2` -lt 18 ];then
+    rlLog "Modify supported_enctypes for RHEL-8."
+    rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal des3-hmac-sha1:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+else
+    #RHEL-8 Bug 1802334 - [Rebase] krb5: rebase to 1.18:
+    #- Removal of *DES encryption types
+    #https://bugzilla.redhat.com/show_bug.cgi?id=1802334
+    rlLog "Modify supported_enctypes for RHEL-8 with krb-1.18. Remove *DES ciphers."
+    rlRun "sed -i \"s/supported_enctypes.*/supported_enctypes = aes256-cts:normal aes128-cts:normal arcfour-hmac:normal camellia256-cts:normal camellia128-cts:normal/\" /var/kerberos/krb5kdc/kdc.conf"
+fi
         rlRun "sed -i \"s/\[realms\]/[realms]\n $krb5REALM2 = {\n  kdc = $krb5HostName\n  admin_server = $krb5HostName\n }/\" $krb5conf"
-        cat >> $krb5conf << _EOF
+    cat >> $krb5conf << _EOF
 
 [capaths]
  $krb5REALM1 = {
   $krb5REALM2 = .
  }
 _EOF
-        # Test the entropy source (not relevant for RHEL6)
+        # BZ#1394908: Test the entropy source (not relevant for RHEL6)
         if ! rlIsRHEL 6 && [[ $TEST_ENTROPY_SOURCE == 'yes' ]]; then
-            rlLog "The source of entropy will be tested as well"
+            rlLog "BZ#1394908: The source of entropy will be tested as well"
+            # Check number of audit rules
+            number_rules=$(auditctl -l | grep -v "No rules" | wc -l)
+            if [[ ${number_rules} -ne 0 ]];then
+                truncate -s0 /var/log/audit/audit.log
+                rlRun "auditctl -D" 0 "Delete previous audit rules"
+            fi
             START_DATE=`date +%H:%M:%S`
             echo START_DATE=$START_DATE
             sleep 1
             rlRun "auditctl -w /dev/random -p rwxa -k RAND"
             auditctl -l
-            sleep 1
+            sleep 5
             rlRun "ausearch -i -k RAND -ts $START_DATE"
         fi
+        
+        echo "-----/etc/krb5.conf----"; cat /etc/krb5.conf
+        echo "-----/var/kerberos/krb5kdc/kdc.conf-----"; cat /var/kerberos/krb5kdc/kdc.conf
+
         # Create the realm databases
         rlRun "rngd -r /dev/urandom"
         rlRun "kdb5_util create -s -r $krb5REALM1 -P $krb5KDCPass"
@@ -145,12 +190,12 @@ _EOF
         rlRun "kadmin.local -r $krb5REALM2 -q \"addprinc -randkey host/$krb5HostName\""
         rlRun "kadmin.local -r $krb5REALM2 -q \"addprinc -pw $krb5KDCPass krbtgt/$krb5REALM1@$krb5REALM2\""
         rlRun "kadmin.local -r $krb5REALM2 -q \"addprinc -pw $krb5KDCPass krbtgt/$krb5REALM2@$krb5REALM1\""
-        # Create test system user
+        # Create test system user 
         [ $krb5User != "root" ] && rlRun "useradd $krb5User"
         rlRun "echo $krb5UserPass | passwd --stdin $krb5User"
     rlPhaseEnd
     fi
-
+    
     rlPhaseStartTest "Daemon start and log file test"
         # Make sure there is enough entropy and start recording of the logs
         rlRun "rngd -r /dev/urandom"
@@ -190,6 +235,10 @@ _EOF
             echo "/var/log/kadmind.log:"
             tail -n 100 /var/log/kadmind.log
         fi
+
+        #add 'list' privilege for root/master 
+        sed -i -e '$a*/master@EXAMPLE.COM    *' /var/kerberos/krb5kdc/kadm5.acl
+
         # Restart daemon auto start
         if rlIsRHEL 6; then
             rlRun "service krb5kdc restart"
@@ -204,11 +253,21 @@ _EOF
         fi
         rlRun "echo $krb5UserKrbPass |kinit $krb5User && klist"
         rlRun "kdestroy"
-        rlRun "kadmin -p root/master -w rrr -q ''"
+        rlRun "kadmin -p root/master -w rrr -q 'getprincs'"
         rlAssertGrep "AS_REQ.*$krb5User@$krb5REALM1.*krbtgt/$krb5REALM1@$krb5REALM1" krb5kdc.log.record
-        cat krb5kdc.log.record
-        rlAssertGrep "Request: kadm5_init.*root/master@$krb5REALM1.*service=kadmin/`hostname`@$krb5REALM1" kadmind.log.record
-        cat kadmind.log.record
+
+#The principal related to kadmin are not created with hostname (kadmin/hostname@REALM) during creating krb5 DB
+#RHEL9 constains only kadmin/admin@REALM - this change was intentional - Don't create hostbased principals in new KDBs
+#https://krbdev.mit.edu/rt/Ticket/Display.html?id=8935
+        if rlIsRHEL 9 || rlIsFedora '>=33';then
+           kadmin_princ="Request: kadm5_init.*root/master@$krb5REALM1.*service=kadmin/admin@$krb5REALM1"
+        else
+           kadmin_princ="Request: kadm5_init.*root/master@$krb5REALM1.*service=kadmin/.*`hostname`@$krb5REALM1"
+        fi
+        rlAssertGrep "${kadmin_princ}" kadmind.log.record
+        #rlAssertGrep "Request: kadm5_init.*root\/master@$krb5REALM1.*service=kadmin\/(admin|.*`hostname`)@$krb5REALM1" kadmind.log.record -E
+        echo "***krb5kdc.log.record***" && cat krb5kdc.log.record
+        echo "***kadmind.log.record***" && cat kadmind.log.record
         # Stop log recording
         kill $KADMIND_LOG_PID
         kill $KRB5KDC_LOG_PID
@@ -238,6 +297,13 @@ _EOF
         cat klist.log
         rlAssertGrep "host/`hostname`@$krb5REALM1" klist.log
         rlRun "kdestroy"
+        #BZ1841488-sshd cannot write into reply cache (/var/tmp/krb5_0.rcache2) due to security context
+        #The problem is that this file had security context: system_u:object_r:kadmind_tmp_t:s0. 
+        #This is a problem when the ssh via krb5-GSSAPI is used because sshd service cannot write into this file.
+        if rlIsRHEL '>=8.3' || rlIsFedora '>=32'; then
+            rlLog "BZ1841488-sshd cannot write into reply cache (/var/tmp/krb5_0.rcache2) due to security context"
+            rlRun "sesearch -s sshd_t -t kadmind_tmp_t -c file -p write --allow | grep ^allow"
+        fi
     rlPhaseEnd
 
     rlPhaseStartTest "Basic kadmin and kpasswd test"
@@ -279,13 +345,14 @@ _EOF
         rlRun "kdestroy"
     rlPhaseEnd
 
-    # Test the entropy source (not relevant for RHEL6)
+    # BZ#1394908: Test the entropy source (not relevant for RHEL6)
     if ! rlIsRHEL 6 && [[ $TEST_ENTROPY_SOURCE == 'yes' ]]; then
-        rlPhaseStartTest "Enable faster getrandom-based entropy system"
+        rlPhaseStartTest "BZ#1394908: Enable faster getrandom-based entropy system"
             echo START_DATE=$START_DATE
             auditctl -l
+            sleep 5 
             rlRun "ausearch -i -k RAND -ts $START_DATE"
-            rlRun "ausearch -i -k RAND -ts $START_DATE |grep comm= |grep -v 'comm=rngd'" 1
+            rlRun "ausearch -i -k RAND -ts $START_DATE |grep comm= | grep -v comm=auditctl |grep -v 'comm=rngd'" 1
             rlRun "auditctl -D"
         rlPhaseEnd
     fi
@@ -299,8 +366,9 @@ _EOF
         [ $krb5User != "root" ] && rlRun "userdel -r -f $krb5User"
     rlPhaseEnd
     fi
-
+    
     rlPhaseStartCleanup
+        rlRun "kdestroy -A"
         rlRun "popd"
         rlRun "rm -r $TmpDir"
     rlPhaseEnd
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 6ebc417..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    tests:
-    - inplace-upgrade-sanity-test
-    required_packages:
-    - expect            # Required for inplace-upgrade-sanity-test
-    - krb5-server       # Required for inplace-upgrade-sanity-test
-    - krb5-workstation  # Required for inplace-upgrade-sanity-test
-    - openssh-clients   # Required for inplace-upgrade-sanity-test
-    - openssh-server    # Required for inplace-upgrade-sanity-test
-    - rng-tools         # Required for inplace-upgrade-sanity-test
diff --git a/tests/upstream/main.fmf b/tests/upstream/main.fmf
new file mode 100644
index 0000000..66718fa
--- /dev/null
+++ b/tests/upstream/main.fmf
@@ -0,0 +1,7 @@
+summary: Run upstream tests
+test: ./test.sh
+enabled: true
+path: /tests/upstream
+require:
+- krb5-tests
+duration: 20m
diff --git a/tests/upstream/test.sh b/tests/upstream/test.sh
new file mode 100755
index 0000000..fd4aeeb
--- /dev/null
+++ b/tests/upstream/test.sh
@@ -0,0 +1,7 @@
+#!/bin/sh -eux
+rc=0
+for test_exec in /usr/libexec/krb5-tests-*
+do
+    "$test_exec" || rc=1
+done
+exit $rc