From nobody Wed Nov 18 01:34:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jTkg374Gqz71449 for ; Wed, 18 Nov 2026 01:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTkg36J7Fz3Gpl for ; Wed, 18 Nov 2026 01:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794965695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Fis+R0IWYPvr+kgtfw3aUQnVY7jmbWqSnRMkd87uws=; b=tFa4uQzNox+JbAKnYR4lGhyE4pwqFSjEaRLwEv+/PrnHG6GhN36+vlu3FdP8Yl6YSUHRYm oMvXsY7VZrWuJQUDdaQeSsg5R0jY4FwFHWv/icT3Lq5RDD75SoudpkelLl2dAreKm/nzV8 hanRz2TFZDQgQR3zKOpLJMYvXzUa6HGBq65yOb3CtoZW5O/fjgNUBH2gs+tHacos69TMah uRTVPGqGGUIc/pFOgJ+zZ6dtXiht0XEyE+aYrDCRft/c6tOL4vLZUj53q7dQJ3TWRxFlaI 9giBQSIwS3NhDXa07ecjKmHBr95MU7R/qL0PWiKsNh61XxQnHcqIkNsXLDsOxA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794965695; b=hoyT/KS5RFsbBXFt0YBZjCauc5nG1DtsRI1pvVI1QYpRd5G1FaC3qaaCvHyfVbkh9CfgiO 2CCBTctOKCf+6d0fFbbpeHrcq+2YETlkHak0ClFxBFOlYRoSoD6sybX7mjQEMaJ2fLzVto EZGklw62Yg4yY3SdV0S2+yHkCyOeEFy3SAHacs2BCRg7Db8p/gW2ZPOE3VvvUE7gDparll PmQPsKPPw+f5tsBpmrw0M953TTvBk0U86LWbHtMtI3zpPuVUzBQziH8slsNby/zDsqhJGH 9i6sy9Hlus9WbT/HrN5TOGcI1PH5NPr4ZJPvRIMqnRrY7n8JKBPJxDP4cZMjTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794965695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Fis+R0IWYPvr+kgtfw3aUQnVY7jmbWqSnRMkd87uws=; b=HeH01VRBp0SBof52BS10DFoG0mOTCVA6ruNqVVX7oi3l6B6rC8QHI+ZfHxpQh0C1vMOTs5 zRG0p7WmIAW8097d9w6s8cQ7V0BszBuvQjBCgvaWXjv16YQsctukm2luBSNCS0q32fD3EA /FIlm38s+8NKUFeC1TZvpRND+Cb9D9ZrhH/r6bzY43fE/c3WNMb6f4mQbN8UoaSfAV916X +I8BvB9Qn0QxDKcbgivMm9aYJxqr3F7wQ3DqGxvA7oU1Hrw9gUcb9IcIfZ4Fw/rEZgaUGK MHnvG4gCGXgxhrzgZkhXxxkFV9106RQcUWComdokBFa2sn8oCb0cJ8qkwokgHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTkg35bfVz17Ct for ; Wed, 18 Nov 2026 01:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d43b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Nov 2026 01:34:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 4a5198610524 - releng/15.2 - krb5: Import MIT 1.22.3 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 4a51986105243712d8fe241ba4ddc6c1b0b910d1 Auto-Submitted: auto-generated Date: Wed, 18 Nov 2026 01:34:55 +0000 Message-Id: <6afd00bf.d43b.5b490a8d@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4a51986105243712d8fe241ba4ddc6c1b0b910d1 commit 4a51986105243712d8fe241ba4ddc6c1b0b910d1 Author: Cy Schubert AuthorDate: 2026-11-10 05:13:11 +0000 Commit: Colin Percival CommitDate: 2026-11-18 01:34:39 +0000 krb5: Import MIT 1.22.3 Major changes in 1.22.3 (2026-11-09) ==================================== This is a bug fix release, with a focus on security issues discovered with the aid of large language models. See https://web.mit.edu/kerberos/advisories/MITKRB5-SA-2026-001.txt for information on the risks of continuing to use unpatched releases. * Fix a logic error when checking PAC server checksums [CVE-2026-111423]. * Check for unkeyed checksums when validating CAMMAC verifiers [CVE-2026-71199]. * Fix a loophole in the KDC's client authdata filtering which could allow clients to include fake PAC and CAMMAC authdata values when requesting service tickets. These fake values would be rejected by application servers, were it not for the two bugs noted above. * Check for the lockdown_keys attribute when processing password change protocol requests in kadmind [CVE-2026-107884]. * In libgssrpc, when processing RPC messages using the RPCSEC_GSS flavor, use the verified service type included in the RPC request to determine how to unwrap arguments and wrap return values, instead of the unverified service type included during authentication [CVE-2026-118380]. * In libgssrpc, disable the AUTH_GSSAPI server auth flavor unless the "GSSRPC_ALLOW_AUTH_GSSAPI" environment variable is set. AUTH_GSSAPI is only needed for very old (pre-1.4) clients [CVE-2026-112322] [CVE-2026-112323]. * Fix numerous null pointer deferences, read overruns, unbounded memory allocations, and memory leaks that could be used as denial of service attacks against the KDC, kadmind, application servers, or client programs [CVE-2026-40355] [CVE-2026-40356] [CVE-2026-71200] [CVE-2026-107364] [CVE-2026-107708] [CVE-2026-107778] [CVE-2026-112314] [CVE-2026-112315] [CVE-2026-112316] [CVE-2026-112317] [CVE-2026-112318] [CVE-2026-112319] [CVE-2026-112320] [CVE-2026-112321] [CVE-2026-112323] [CVE-2026-119079]. * Fix a client crash when a KKDCP proxy daemon closes the TLS session without supplying any response data. * Shut down kpropd gracefully when a termination signal is received, when operating in incremental propagation mode. * Detect when an incremental propagation update is applied to a nonexistent principal; when this happens, force a full resync instead of crashing. * Fix a KDC crash when the LDAP KDB module loses its connection to the LDAP server. * Avoid a crash on macOS when the native API ccache type is used before and after forking a process. * When an application accepts a GSS context without asking for delegated credentials, discard any credentials sent by the initiator without parsing them first. Approved by: re (cperciva) Security: https://web.mit.edu/kerberos/advisories/MITKRB5-SA-2026-001.txt Merge commit '5f11ec7e8ab9647977a56fca934c40951e051779' into krb5-1.22.3 (cherry picked from commit 7e4c0a34ea3aff51405d2a3ac2908db1a98d6c5f) (cherry picked from commit e104c74ef25d8f760f90b45c41bdc9c65d22b75c) --- crypto/krb5/.github/workflows/build.yml | 18 +- crypto/krb5/NOTICE | 30 ++ crypto/krb5/README | 182 +++++++++ crypto/krb5/src/ccapi/lib/win/Makefile.in | 8 +- crypto/krb5/src/ccapi/server/win/Makefile.in | 8 +- crypto/krb5/src/config/pre.in | 3 + crypto/krb5/src/config/win-pre.in | 7 + crypto/krb5/src/configure | 20 +- crypto/krb5/src/include/gssrpc/xdr.h | 14 + crypto/krb5/src/include/k5-int.h | 3 + crypto/krb5/src/kadmin/ktutil/ktutil_funcs.c | 24 +- crypto/krb5/src/kadmin/server/misc.c | 28 +- crypto/krb5/src/kadmin/server/schpw.c | 5 + crypto/krb5/src/kadmin/server/server_stubs.c | 30 +- crypto/krb5/src/kdc/cammac.c | 2 +- crypto/krb5/src/kdc/dispatch.c | 4 + crypto/krb5/src/kdc/kdc_authdata.c | 14 +- crypto/krb5/src/kdc/kdc_util.c | 37 +- crypto/krb5/src/kprop/kpropd.c | 13 +- .../krb5/src/lib/gssapi/krb5/accept_sec_context.c | 79 ++-- crypto/krb5/src/lib/gssapi/krb5/iakerb.c | 3 + crypto/krb5/src/lib/gssapi/krb5/import_name.c | 2 +- crypto/krb5/src/lib/gssapi/krb5/ser_sctx.c | 6 + .../krb5/src/lib/gssapi/mechglue/g_acquire_cred.c | 8 +- .../krb5/src/lib/gssapi/mechglue/g_dsp_name_ext.c | 2 +- crypto/krb5/src/lib/gssapi/mechglue/g_dup_name.c | 6 +- crypto/krb5/src/lib/gssapi/mechglue/g_glue.c | 9 +- crypto/krb5/src/lib/gssapi/mechglue/g_imp_name.c | 3 +- crypto/krb5/src/lib/gssapi/spnego/gssapiP_negoex.h | 3 +- crypto/krb5/src/lib/gssapi/spnego/negoex_ctx.c | 15 +- crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c | 19 +- crypto/krb5/src/lib/kadm5/kadm_rpc_xdr.c | 93 +++-- crypto/krb5/src/lib/kadm5/srv/adb_xdr.c | 9 +- crypto/krb5/src/lib/kdb/kdb_convert.c | 18 +- crypto/krb5/src/lib/kdb/keytab.c | 15 +- crypto/krb5/src/lib/krb5/asn.1/asn1_encode.c | 38 +- crypto/krb5/src/lib/krb5/ccache/cc_api_macos.c | 62 ++- crypto/krb5/src/lib/krb5/ccache/cc_keyring.c | 7 +- crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c | 53 +-- crypto/krb5/src/lib/krb5/ccache/ccbase.c | 4 +- crypto/krb5/src/lib/krb5/keytab/kt_file.c | 2 + crypto/krb5/src/lib/krb5/krb/Makefile.in | 10 +- crypto/krb5/src/lib/krb5/krb/authdata.c | 5 +- crypto/krb5/src/lib/krb5/krb/cammac_util.c | 2 + crypto/krb5/src/lib/krb5/krb/deps | 18 +- crypto/krb5/src/lib/krb5/krb/get_in_tkt.c | 3 + crypto/krb5/src/lib/krb5/krb/pac.c | 27 +- crypto/krb5/src/lib/krb5/krb/preauth_otp.c | 12 +- crypto/krb5/src/lib/krb5/krb/rd_cred.c | 6 + crypto/krb5/src/lib/krb5/krb/ser_actx.c | 5 +- crypto/krb5/src/lib/krb5/krb/ser_adata.c | 13 +- crypto/krb5/src/lib/krb5/krb/ser_addr.c | 12 +- crypto/krb5/src/lib/krb5/krb/ser_auth.c | 15 +- crypto/krb5/src/lib/krb5/krb/ser_cksum.c | 14 +- crypto/krb5/src/lib/krb5/krb/ser_ctx.c | 18 +- crypto/krb5/src/lib/krb5/krb/ser_key.c | 11 +- crypto/krb5/src/lib/krb5/krb/ser_princ.c | 11 +- crypto/krb5/src/lib/krb5/krb/serialize.c | 18 + crypto/krb5/src/lib/krb5/krb/t_init_creds_step.c | 97 +++++ crypto/krb5/src/lib/krb5/krb/t_pac.c | 84 +++++ crypto/krb5/src/lib/krb5/libkrb5.exports | 1 + crypto/krb5/src/lib/krb5/os/dnsglue.c | 18 +- crypto/krb5/src/lib/krb5/os/expand_path.c | 3 +- crypto/krb5/src/lib/krb5/os/init_os_ctx.c | 21 +- crypto/krb5/src/lib/krb5/os/locate_kdc.c | 15 +- crypto/krb5/src/lib/krb5/os/sendto_kdc.c | 1 + crypto/krb5/src/lib/rpc/auth_gssapi_misc.c | 40 +- crypto/krb5/src/lib/rpc/authgss_prot.c | 31 +- crypto/krb5/src/lib/rpc/clnt_tcp.c | 7 +- crypto/krb5/src/lib/rpc/deps | 7 +- crypto/krb5/src/lib/rpc/svc_auth.c | 12 + crypto/krb5/src/lib/rpc/svc_auth_gss.c | 98 +++-- crypto/krb5/src/lib/rpc/svc_auth_gssapi.c | 22 +- crypto/krb5/src/lib/rpc/svc_auth_unix.c | 18 +- crypto/krb5/src/lib/rpc/unit-test/client.c | 88 ++++- crypto/krb5/src/lib/rpc/unit-test/t_rpc.py | 4 + crypto/krb5/src/lib/rpc/xdr.c | 2 +- crypto/krb5/src/man/k5identity.man | 2 +- crypto/krb5/src/man/k5login.man | 2 +- crypto/krb5/src/man/k5srvutil.man | 2 +- crypto/krb5/src/man/kadm5.acl.man | 2 +- crypto/krb5/src/man/kadmin.man | 2 +- crypto/krb5/src/man/kadmind.man | 2 +- crypto/krb5/src/man/kdb5_ldap_util.man | 2 +- crypto/krb5/src/man/kdb5_util.man | 2 +- crypto/krb5/src/man/kdc.conf.man | 2 +- crypto/krb5/src/man/kdestroy.man | 2 +- crypto/krb5/src/man/kerberos.man | 2 +- crypto/krb5/src/man/kinit.man | 2 +- crypto/krb5/src/man/klist.man | 2 +- crypto/krb5/src/man/kpasswd.man | 2 +- crypto/krb5/src/man/kprop.man | 2 +- crypto/krb5/src/man/kpropd.man | 2 +- crypto/krb5/src/man/kproplog.man | 2 +- crypto/krb5/src/man/krb5-config.man | 2 +- crypto/krb5/src/man/krb5.conf.man | 2 +- crypto/krb5/src/man/krb5kdc.man | 2 +- crypto/krb5/src/man/ksu.man | 2 +- crypto/krb5/src/man/kswitch.man | 2 +- crypto/krb5/src/man/ktutil.man | 2 +- crypto/krb5/src/man/kvno.man | 2 +- crypto/krb5/src/man/sclient.man | 2 +- crypto/krb5/src/man/sserver.man | 2 +- crypto/krb5/src/patchlevel.h | 6 +- crypto/krb5/src/plugins/audit/simple/Makefile.in | 2 +- .../krb5/src/plugins/authdata/greet_client/greet.c | 2 + crypto/krb5/src/plugins/kdb/db2/kdb_xdr.c | 5 + .../src/plugins/kdb/db2/libdb2/btree/bt_conv.c | 10 +- .../src/plugins/kdb/db2/libdb2/btree/bt_search.c | 2 + .../krb5/src/plugins/kdb/db2/libdb2/btree/bt_seq.c | 8 + .../krb5/src/plugins/kdb/db2/libdb2/btree/btree.h | 8 +- crypto/krb5/src/plugins/kdb/db2/libdb2/hash/hash.c | 8 +- .../src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c | 23 +- .../src/plugins/kdb/db2/libdb2/hash/hash_page.c | 13 + .../krb5/src/plugins/kdb/db2/libdb2/mpool/mpool.c | 13 +- .../plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c | 81 ++-- crypto/krb5/src/plugins/kdb/lmdb/marshal.c | 2 +- .../src/plugins/preauth/pkinit/pkinit_crypto.h | 2 +- .../plugins/preauth/pkinit/pkinit_crypto_openssl.c | 109 ++++-- .../src/plugins/preauth/pkinit/pkinit_identity.c | 2 +- .../src/plugins/preauth/pkinit/pkinit_matching.c | 2 +- crypto/krb5/src/plugins/tls/k5tls/openssl.c | 34 +- crypto/krb5/src/po/mit-krb5.pot | 418 ++++++++++----------- crypto/krb5/src/util/profile/prof_init.c | 4 + crypto/krb5/src/util/support/json.c | 2 + crypto/krb5/src/windows/README | 13 +- crypto/krb5/src/windows/installer/wix/config.wxi | 2 + crypto/krb5/src/windows/installer/wix/files.wxi | 13 +- .../krb5/src/windows/installer/wix/site-local.wxi | 6 +- crypto/krb5/src/windows/kerberos.ver | 5 +- crypto/krb5/src/windows/kfwlogon/kfwcommon.c | 12 +- crypto/krb5/src/windows/kfwlogon/kfwlogon.c | 6 +- crypto/krb5/src/windows/kfwlogon/kfwlogon.h | 2 +- crypto/krb5/src/windows/leashdll/krb5routines.c | 53 ++- crypto/krb5/src/windows/leashdll/lsh_pwd.c | 2 +- crypto/krb5/src/windows/leashdll/lshfunc.c | 82 +--- krb5/Makefile.inc | 2 +- krb5/include/autoconf.h | 4 +- krb5/util/build-tools/krb5-config.sh | 2 +- 139 files changed, 1793 insertions(+), 894 deletions(-) diff --git a/crypto/krb5/.github/workflows/build.yml b/crypto/krb5/.github/workflows/build.yml index c16e77c43eaf..97f1082c59a8 100644 --- a/crypto/krb5/.github/workflows/build.yml +++ b/crypto/krb5/.github/workflows/build.yml @@ -16,17 +16,17 @@ jobs: - name: linux-clang os: ubuntu-latest compiler: clang - makevars: CPPFLAGS=-Werror + flags: -Werror configureopts: --enable-asan - name: linux-clang-openssl os: ubuntu-latest compiler: clang - makevars: CPPFLAGS=-Werror + flags: -Werror -DOPENSSL_NO_DEPRECATED configureopts: --with-crypto-impl=openssl - name: linux-gcc os: ubuntu-latest compiler: gcc - makevars: CPPFLAGS=-D_FORTIFY_SOURCE=3 + flags: -D_FORTIFY_SOURCE=3 steps: - name: Checkout repository uses: actions/checkout@v1 @@ -39,7 +39,7 @@ jobs: - name: Build env: CC: ${{ matrix.compiler }} - MAKEVARS: ${{ matrix.makevars }} + FLAGS: ${{ matrix.flags }} CONFIGURE_OPTS: ${{ matrix.configureopts }} run: | # For the ksu tests, allow homedir access from other users. @@ -49,7 +49,7 @@ jobs: cd src autoreconf ./configure --enable-maintainer-mode --with-ldap $CONFIGURE_OPTS --prefix=$HOME/inst - make $MAKEVARS + make CPPFLAGS="$FLAGS" make check make install (cd clients/ksu && make check-ksu) @@ -67,18 +67,18 @@ jobs: fi windows: - runs-on: windows-latest + runs-on: windows-2025 env: KRB_INSTALL_DIR: C:\kfw OPENSSL_DIR: C:\Program Files\OpenSSL - OPENSSL_VERSION: 1_1 + OPENSSL_VERSION: 3 steps: - name: Checkout repository uses: actions/checkout@v1 - name: Setup - shell: cmd run: | - mkdir %KRB_INSTALL_DIR% + mkdir "$env:KRB_INSTALL_DIR" + copy "$env:OPENSSL_DIR\lib\VC\x64\MD\libcrypto.lib" "$env:OPENSSL_DIR\lib" - uses: ilammy/msvc-dev-cmd@v1 with: arch: x64 diff --git a/crypto/krb5/NOTICE b/crypto/krb5/NOTICE index 20d8ef24e604..6eda5a2f00c1 100644 --- a/crypto/krb5/NOTICE +++ b/crypto/krb5/NOTICE @@ -1358,3 +1358,33 @@ 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. + +====================================================================== + +The following notice applies to +"src/lib/krb5/krb/t_init_creds_step.c": + +Copyright (C) 2026 by Alejandro Pacheco. 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. diff --git a/crypto/krb5/README b/crypto/krb5/README index 73eafa585dc9..6d2c8bf37471 100644 --- a/crypto/krb5/README +++ b/crypto/krb5/README @@ -97,6 +97,159 @@ removed. Beginning with the krb5-1.18 release, all support for single-DES encryption types has been removed. +Major changes in 1.22.3 (2026-11-09) +------------------------------------ + +This is a bug fix release, with a focus on security issues discovered +with the aid of large language models. See +https://web.mit.edu/kerberos/advisories/MITKRB5-SA-2026-001.txt for +information on the risks of continuing to use unpatched releases. + +* Fix a logic error when checking PAC server checksums + [CVE-2026-111423]. + +* Check for unkeyed checksums when validating CAMMAC verifiers + [CVE-2026-71199]. + +* Fix a loophole in the KDC's client authdata filtering which could + allow clients to include fake PAC and CAMMAC authdata values when + requesting service tickets. These fake values would be rejected by + application servers, were it not for the two bugs noted above. + +* Check for the lockdown_keys attribute when processing password + change protocol requests in kadmind [CVE-2026-107884]. + +* In libgssrpc, when processing RPC messages using the RPCSEC_GSS + flavor, use the verified service type included in the RPC request to + determine how to unwrap arguments and wrap return values, instead of + the unverified service type included during authentication + [CVE-2026-118380]. + +* In libgssrpc, disable the AUTH_GSSAPI server auth flavor unless the + "GSSRPC_ALLOW_AUTH_GSSAPI" environment variable is set. AUTH_GSSAPI + is only needed for very old (pre-1.4) clients [CVE-2026-112322] + [CVE-2026-112323]. + +* Fix numerous null pointer deferences, read overruns, unbounded + memory allocations, and memory leaks that could be used as denial of + service attacks against the KDC, kadmind, application servers, or + client programs [CVE-2026-40355] [CVE-2026-40356] [CVE-2026-71200] + [CVE-2026-107364] [CVE-2026-107708] [CVE-2026-107778] + [CVE-2026-112314] [CVE-2026-112315] [CVE-2026-112316] + [CVE-2026-112317] [CVE-2026-112318] [CVE-2026-112319] + [CVE-2026-112320] [CVE-2026-112321] [CVE-2026-112323] + [CVE-2026-119079]. + +* Fix a client crash when a KKDCP proxy daemon closes the TLS session + without supplying any response data. + +* Shut down kpropd gracefully when a termination signal is received, + when operating in incremental propagation mode. + +* Detect when an incremental propagation update is applied to a + nonexistent principal; when this happens, force a full resync + instead of crashing. + +* Fix a KDC crash when the LDAP KDB module loses its connection to the + LDAP server. + +* Avoid a crash on macOS when the native API ccache type is used + before and after forking a process. + +* When an application accepts a GSS context without asking for + delegated credentials, discard any credentials sent by the initiator + without parsing them first. + +* On Windows, prevent buffer overflows when the KDC sends an + unexpectedly long prompt string via OTP preauthentication. + +* On Windows, move the default per-machine krb5.ini location from + C:\ProgramData\MIT\Kerberos to C:\Program Files\MIT\Kerberos5, as + the former location could be pre-created by an unutrusted user + before KfW installation. + +* On Windows, add error checking to kfwlogon to ensure that it does + not set ACLs on a cache file it did not create. + +* On Windows, prevent several buffer overflows that could occur if an + application passes a large principal name to leashdll APIs. + +* On Windows, prevent buffer overflows when the LSA cache contains + credentials with long principal name components. + +krb5-1.22.3 changes by ticket ID +-------------------------------- + +9191 Fix strchr() conformance to C23 +9201 Prevent read overrun in svc_auth_gssapi +9205 Fix two NegoEx parsing vulnerabilities +9206 Prevent read overrun in libkdb_ldap +9209 Validate lengths when deserializing +9210 Avoid asymmetric WSACleanup() in libkrb5 +9211 Avoid null dereference in krb5_rd_cred() +9212 Fix error handling in KDC PAC processing +9213 Fix null dereference in SPNEGO token processing +9214 Fix gss_add_cred() extension fallback path +9216 Always copy mech name_type for GSS union names +9217 Fix triggerable assertion failure in gss_import_name() +9218 Better validate key_data_ver in iprop decoding +9219 Avoid another null dereference in krb5_rd_cred() +9220 Check for empty forwarded creds in krb5 GSS mech +9221 Propagate -laudit to simple audit module build +9224 Prevent integer overrun in keytab parsing +9227 Prevent null dereference in PKINIT CMS processing +9228 Check for keyed checksums in CAMMAC verifiers +9229 Exclude nested AD-IF-RELEVANT authdata in KDC +9232 Prevent dangling result in tl_data2berval() +9233 Prevent buffer overrun in old leashdll functions +9234 Prevent read overruns in GSSRPC svcauth_unix +9235 Free small client memory leak on OTP failure +9236 Check for cache copy error in kfwlogon +9238 Prevent null deref in KDC dispatch corner case +9239 Check type of otherName value in PKINIT SAN code +9240 Add space checks in Leash_krb5_kinit() prompter +9241 Remove unsafe principal parsing from Leashdll +9242 Check TXT lookup results on Windows +9243 Fix gssalloc mismatches +9244 Use safe string copies in MSLSA ccache type +9245 Move krb5.ini from ProgramData to Program Files +9246 Free call_arg on all AUTH_GSSAPI exit paths +9247 Fix RPC leak when client switches from RPCSEC_GSS +9248 Validate lengths when deserializing profiles +9249 Improve libdb2 data validation +9250 Fix two KDB data validation issues +9251 Prevent KDC read overrun in ASN.1 decoder +9252 Enforce lockdown bit in password change server +9253 Correctly abort parse on invalid JSON array +9254 Skip expired keys when iterating a KEYRING ccache +9255 Free partial tl-data on XDR decode failure +9256 Fix leaks when decoding GSS buffers in libgssrpc +9257 Enforce XDR decode size limits +9258 Fix leak in RPC client on mismatched ID +9259 Check PAC server checksum verification result +9260 Disable GSSRPC AUTH_GSSAPI flavor by default +9261 Fix leak on error in xdr_krb5_keyblock() +9262 Fix leak on error in xdr_krb5_principal() +9263 Fix leak on error in process_chpw_request() +9264 Fix memory leak in auth_gssapi_wrap_data() +9265 Prevent null dereferences in kadmind server stubs +9266 Avoid repeated reallocation when decoding ASN.1 +9267 Fix leaks in lifecycle of RPCSEC_GSS context +9268 Fix leak on error in krb5_ktkdb_get_entry() +9269 Fix leak on krb5 gss_accept_sec_context() failure +9270 Pass through null deleg_cred from SPNEGO to mech +9271 Fix leaks on error in PKINIT signed-data creation +9272 Properly verify RPCSEC_GSS call arguments +9273 Fix memory leak in mpool_get() error paths +9274 Check reply length before V4 reply check +9276 macOS API ccache crashes a child forked after the parent used it +9277 Fix hex key input handling in ktutil addent +9278 Prevent unsigned integer overflow in IAKERB +9279 Fix use-after-free of LDAP handle after rebind +9280 Detect iprop update of nonexistent principal +9281 Shut down kpropd gracefully when in iprop mode +9725 Terminate HTTPS read buffer when allocating it + Major changes in 1.22.2 (2026-01-29) ------------------------------------ @@ -370,6 +523,7 @@ reports, suggestions, and valuable resources: Jeff Blaine Toby Blake Radoslav Bodo + Bogdan Boguslavskij Alexander Bokovoy Zoltan Borbely Sumit Bose @@ -380,9 +534,11 @@ reports, suggestions, and valuable resources: Philip Brown Samuel Cabrero Michael Calmer + Luigino Camastra Andrea Campi Julien Chaffraix Jacob Champion + Arthur Chan Puran Chand Ravi Channavajhala Srinivas Cheruku @@ -417,6 +573,7 @@ reports, suggestions, and valuable resources: Francis Dupont Viktor Dukhovni Jason Edgecombe + Douglas Eichelberger Mark Eichin Shawn M. Emery Douglas E. Engert @@ -431,12 +588,14 @@ reports, suggestions, and valuable resources: Remi Ferrand Paul Fertser Fabiano Fidêncio + Osvaldo Janeri Filho Frank Filz William Fiveash Jacques Florent Oliver Freyermuth Ákos Frohner Sebastian Galiano + Vidal Segura García Ilya Gladyshev Marcus Granado Dylan Gray @@ -455,12 +614,14 @@ reports, suggestions, and valuable resources: Jochen Hein Paul B. Henson Kihong Heo + Jeremy Hitt Jeff Hodges Christopher Hogan Love Hörnquist Åstrand Ken Hornstein Henry B. Hotz Luke Howard + Rahul Hoysala Jakub Hrozek Shumon Huque Jeffrey Hutzelman @@ -471,10 +632,12 @@ reports, suggestions, and valuable resources: Diogenes S. Jesus Mike Jetzer Pavel Jindra + Alexandru-Ionut Jipa Brian Johannesmeyer Joel Johnson Lutz Justen Ganesh Kamath + Cem Onat Karagun Alexander Karaivanov Anders Kaseorg Bar Katz @@ -486,6 +649,8 @@ reports, suggestions, and valuable resources: Martin Kittel Thomas Klausner Tomasz Kłoczko + Brian Knoll + David Korczynski Ivan Korytov Matthew Krupcale Mikkel Kruse @@ -498,6 +663,7 @@ reports, suggestions, and valuable resources: Chris Leick Volker Lendecke Jan iankko Lieskovsky + Erin Liman Todd Lipcon Oliver Loch Chris Long @@ -508,6 +674,7 @@ reports, suggestions, and valuable resources: Todd Lubin Ryan Lynch Glenn Machin + Tristan Madani Roland Mainz Sorin Manolache Robert Marshall @@ -517,6 +684,7 @@ reports, suggestions, and valuable resources: Greg McClement Cameron Meadors Vipul Mehta + Zvika Meiseles Alexey Melnikov Ivan A. Melnikov Franklyn Mendez @@ -524,9 +692,11 @@ reports, suggestions, and valuable resources: Mantas Mikulėnas Markus Moeller Kyle Moffett + Alex Moore Jon Moore Paul Moore Keiichi Mori + David Morash Michael Morony Robert Morris Sam Morris @@ -540,6 +710,8 @@ reports, suggestions, and valuable resources: Michael Osipov Andrej Ota Dmitry Ovsyannikov + Haruki Oyama + Alejandro Pacheco Dmitri Pal Javier Palacios Dilyan Palauzov @@ -567,6 +739,7 @@ reports, suggestions, and valuable resources: Solly Ross Mike Roszkowski Guillaume Rousse + Daniel Sands Joshua Schaeffer Alexander Scheel Jens Schleusener @@ -575,11 +748,14 @@ reports, suggestions, and valuable resources: Eli Schwartz Paul Seyfert Tom Shaw + Ao Shen + Ze Sheng Jim Shi Jerry Shipman Peter Shoults Richard Silverman Cel Skeggs + Tigran Sogomonian Simo Sorce Anthony Sottile Michael Spang @@ -587,14 +763,19 @@ reports, suggestions, and valuable resources: Bjørn Tore Sund Ondřej Surý Joseph Sutton + Moritz Theile Alexey Tikhonov Joe Travaglini + Dmitrijs Trizna Sergei Trofimovich Greg Troxel Fraser Tweedale Tim Uglow Rathor Vipin + Rickey Visinski Denis Vlasenko + Guido Vranken + Sargun Vohra Thomas Wagner Jorgen Wahlsten Stef Walter @@ -606,6 +787,7 @@ reports, suggestions, and valuable resources: Kevin Wasserman Margaret Wasserman Marcus Watts + Frederik Wedel-Heinen Andreas Wiese Simon Wilkinson Nicolas Williams diff --git a/crypto/krb5/src/ccapi/lib/win/Makefile.in b/crypto/krb5/src/ccapi/lib/win/Makefile.in index 0ad9590db825..abec1cb19786 100644 --- a/crypto/krb5/src/ccapi/lib/win/Makefile.in +++ b/crypto/krb5/src/ccapi/lib/win/Makefile.in @@ -67,12 +67,12 @@ LFLAGS = /nologo $(LOPTS) all: Makefile copysrc midl $(OUTPRE)$(CCLIB).dll finish ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_request.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_request.idl ccs_reply.h ccs_reply_c.c ccs_reply_s.c : ccs_reply.idl ccs_reply.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_reply.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_reply.idl copysrc : echo "Copying all sources needed to build $(CCLIB).dll to $(SRCTMP)" diff --git a/crypto/krb5/src/ccapi/server/win/Makefile.in b/crypto/krb5/src/ccapi/server/win/Makefile.in index 1c925a287f8e..dcbbfa83ba0c 100644 --- a/crypto/krb5/src/ccapi/server/win/Makefile.in +++ b/crypto/krb5/src/ccapi/server/win/Makefile.in @@ -72,12 +72,12 @@ LFLAGS = /nologo $(LOPTS) all: Makefile copysrc midl $(OUTPRE)ccapiserver.exe finish ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_request.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_request.idl ccs_reply.h ccs_reply_c.c ccs_reply_s.c : ccs_reply.idl ccs_reply.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_reply.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_reply.idl copysrc : echo "Copying all sources needed to build ccapiserver.exe to $(SRCTMP)" diff --git a/crypto/krb5/src/config/pre.in b/crypto/krb5/src/config/pre.in index 1197c1ffd6bf..2b0ec470627a 100644 --- a/crypto/krb5/src/config/pre.in +++ b/crypto/krb5/src/config/pre.in @@ -413,6 +413,9 @@ TLS_IMPL_LIBS = @TLS_IMPL_LIBS@ # SPAKE preauth back-end libraries SPAKE_OPENSSL_LIBS = @SPAKE_OPENSSL_LIBS@ +# simple audit plugin module dependencies +AUDIT_IMPL_LIBS = @AUDIT_IMPL_LIBS@ + # Whether we have the SASL header file for the LDAP KDB module HAVE_SASL = @HAVE_SASL@ diff --git a/crypto/krb5/src/config/win-pre.in b/crypto/krb5/src/config/win-pre.in index 0bcb280df52e..5361b14dc576 100644 --- a/crypto/krb5/src/config/win-pre.in +++ b/crypto/krb5/src/config/win-pre.in @@ -126,6 +126,13 @@ CCOPTS=-nologo /EHsc /W3 /we4020 /we4024 /we4047 $(PDB_OPTS) $(DLL_FILE_DEF) LOPTS=-nologo -incremental:no -manifest CCLINKOPTION= +MIDL_ENV= +!if "$(CPU)" == "AMD64" +MIDL_ENV=/env x64 +!elseif "$(CPU)" == "ARM64" +MIDL_ENV=/env arm64 +!endif + DEBUGOPT=/guard:cf /Zi #if the compiler is vstudio 8, generate manifest diff --git a/crypto/krb5/src/configure b/crypto/krb5/src/configure index ed823e9244a1..df6ef88f1dfc 100755 --- a/crypto/krb5/src/configure +++ b/crypto/krb5/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.2. +# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.3. # # Report bugs to . # @@ -615,8 +615,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Kerberos 5' PACKAGE_TARNAME='krb5' -PACKAGE_VERSION='1.22.2' -PACKAGE_STRING='Kerberos 5 1.22.2' +PACKAGE_VERSION='1.22.3' +PACKAGE_STRING='Kerberos 5 1.22.3' PACKAGE_BUGREPORT='krb5-bugs@mit.edu' PACKAGE_URL='' @@ -1506,7 +1506,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Kerberos 5 1.22.2 to adapt to many kinds of systems. +\`configure' configures Kerberos 5 1.22.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1577,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Kerberos 5 1.22.2:";; + short | recursive ) echo "Configuration of Kerberos 5 1.22.3:";; esac cat <<\_ACEOF @@ -1739,7 +1739,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Kerberos 5 configure 1.22.2 +Kerberos 5 configure 1.22.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2439,7 +2439,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Kerberos 5 $as_me 1.22.2, which was +It was created by Kerberos 5 $as_me 1.22.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -8159,7 +8159,7 @@ fi -KRB5_VERSION=1.22.2 +KRB5_VERSION=1.22.3 @@ -15366,7 +15366,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Kerberos 5 $as_me 1.22.2, which was +This file was extended by Kerberos 5 $as_me 1.22.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15430,7 +15430,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Kerberos 5 config.status 1.22.2 +Kerberos 5 config.status 1.22.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/crypto/krb5/src/include/gssrpc/xdr.h b/crypto/krb5/src/include/gssrpc/xdr.h index 4e5c29bdc2db..ccbb284c7363 100644 --- a/crypto/krb5/src/include/gssrpc/xdr.h +++ b/crypto/krb5/src/include/gssrpc/xdr.h @@ -84,6 +84,20 @@ enum xdr_op { XDR_FREE=2 }; +/* Maximum byte size for a message wrapped with RPCSEC_GSS. */ +#define GSSRPC_MAX_MESSAGE_SIZE (64U * 1024U * 1024U) + +/* + * Suggested maximum byte size for a single XDR element (xdr_bytes, + * xdr_string), to limit up-front allocation during decoding. This limit + * applies to xdr_wrapstring(). + */ +#define GSSRPC_MAX_ELEMENT_SIZE (64U * 1024U) + +/* Suggested maximum element count for XDR arrays (xdr_array), to limit + * up-front allocation during decoding. */ +#define GSSRPC_MAX_ARRAY_COUNT 8192U + /* * This is the number of bytes per unit of external data. */ diff --git a/crypto/krb5/src/include/k5-int.h b/crypto/krb5/src/include/k5-int.h index cfd2cc9393d9..5b2e9e6a1ec2 100644 --- a/crypto/krb5/src/include/k5-int.h +++ b/crypto/krb5/src/include/k5-int.h @@ -1882,6 +1882,9 @@ krb5_ser_pack_int64(int64_t, krb5_octet **, size_t *); krb5_error_code KRB5_CALLCONV krb5_ser_unpack_int64(int64_t *, krb5_octet **, size_t *); +krb5_error_code +k5_ser_unpack_len(size_t *len_out, krb5_octet **bufp, size_t *remainp); + /* [De]serialize byte string */ krb5_error_code KRB5_CALLCONV krb5_ser_pack_bytes(krb5_octet *, size_t, krb5_octet **, size_t *); diff --git a/crypto/krb5/src/kadmin/ktutil/ktutil_funcs.c b/crypto/krb5/src/kadmin/ktutil/ktutil_funcs.c index e489b5b57afd..401c1586e3e4 100644 --- a/crypto/krb5/src/kadmin/ktutil/ktutil_funcs.c +++ b/crypto/krb5/src/kadmin/ktutil/ktutil_funcs.c @@ -153,7 +153,7 @@ ktutil_add(krb5_context context, krb5_kt_list *list, char *princ_str, char promptstr[1024]; char *princ_full = NULL; uint8_t *keybytes; - size_t keylen; + size_t keylen, len; unsigned int pwsize = BUFSIZ; retval = krb5_parse_name(context, princ_str, &princ); @@ -203,17 +203,17 @@ ktutil_add(krb5_context context, krb5_kt_list *list, char *princ_str, entry->key = key; } else { printf(_("Key for %s (hex): "), princ_full); - fgets(buf, BUFSIZ, stdin); - /* - * We need to get rid of the trailing '\n' from fgets. - * If we have an even number of hex digits (as we should), - * write a '\0' over the '\n'. If for some reason we have - * an odd number of hex digits, force an even number of hex - * digits by writing a '0' into the last position (the string - * will still be null-terminated). - */ - buf[strlen(buf) - 1] = strlen(buf) % 2 ? '\0' : '0'; - if (strlen(buf) == 0) { + if (fgets(buf, sizeof(buf), stdin) == NULL) + buf[0] = '\0'; + /* Strip the trailing newline; pad an odd number of hex digits. */ + len = strcspn(buf, "\n"); + if (len % 2 && len + 1 < sizeof(buf)) { + buf[len] = '0'; + buf[len + 1] = '\0'; + } else { + buf[len] = '\0'; + } + if (*buf == '\0') { fprintf(stderr, _("addent: Error reading key.\n")); retval = 0; goto cleanup; diff --git a/crypto/krb5/src/kadmin/server/misc.c b/crypto/krb5/src/kadmin/server/misc.c index 2d596e27f8b7..acfeb16c0fd0 100644 --- a/crypto/krb5/src/kadmin/server/misc.c +++ b/crypto/krb5/src/kadmin/server/misc.c @@ -20,6 +20,8 @@ schpw_util_wrapper(void *server_handle, { kadm5_ret_t ret; kadm5_server_handle_t handle = server_handle; + kadm5_principal_ent_rec rec; + int lockdown; /* * If no target is explicitly provided, then the target principal @@ -42,18 +44,26 @@ schpw_util_wrapper(void *server_handle, return ret; } - if (auth(handle->context, OP_CPW, client, target, - NULL, NULL, NULL, NULL, 0)) { - ret = kadm5_chpass_principal_util(server_handle, - target, - new_pw, ret_pw, - msg_ret, msg_len); - } else { - ret = KADM5_AUTH_CHANGEPW; + if (!auth(handle->context, OP_CPW, client, target, + NULL, NULL, NULL, NULL, 0)) { strlcpy(msg_ret, "Unauthorized request", msg_len); + return KADM5_AUTH_CHANGEPW; } - return ret; + ret = kadm5_get_principal(handle, target, &rec, KADM5_ATTRIBUTES); + if (ret) { + strlcpy(msg_ret, "Target principal not found", msg_len); + return ret; + } + lockdown = (rec.attributes & KRB5_KDB_LOCKDOWN_KEYS) != 0; + kadm5_free_principal_ent(handle, &rec); + if (lockdown) { + strlcpy(msg_ret, "Principal keys are locked down", msg_len); + return KADM5_PROTECT_KEYS; + } + + return kadm5_chpass_principal_util(server_handle, target, new_pw, ret_pw, + msg_ret, msg_len); } kadm5_ret_t diff --git a/crypto/krb5/src/kadmin/server/schpw.c b/crypto/krb5/src/kadmin/server/schpw.c index 5b73a3d8d2f0..c2c03e76c2b7 100644 --- a/crypto/krb5/src/kadmin/server/schpw.c +++ b/crypto/krb5/src/kadmin/server/schpw.c @@ -248,6 +248,7 @@ process_chpw_request(krb5_context context, void *server_handle, char *realm, } switch (ret) { case KADM5_AUTH_CHANGEPW: + case KADM5_PROTECT_KEYS: numresult = KRB5_KPASSWD_ACCESSDENIED; break; case KADM5_AUTH_INITIAL: @@ -272,6 +273,10 @@ process_chpw_request(krb5_context context, void *server_handle, char *realm, chpwfail: + /* Wipe any decrypted data in clear if present, and reuse it for the error + * message plaintext. */ + zapfree(clear.data, clear.length); + clear = empty_data(); ret = alloc_data(&clear, 2 + strlen(strresult)); if (ret) goto bailout; diff --git a/crypto/krb5/src/kadmin/server/server_stubs.c b/crypto/krb5/src/kadmin/server/server_stubs.c index 7fd980794b12..e36c91322d21 100644 --- a/crypto/krb5/src/kadmin/server/server_stubs.c +++ b/crypto/krb5/src/kadmin/server/server_stubs.c @@ -1261,6 +1261,10 @@ create_policy_2_svc(cpol_arg *arg, generic_ret *ret, struct svc_req *rqstp) goto exit_func; *** 6397 LINES SKIPPED ***