Update for krb5-1.21.3krb5-1.21.3-final

29 files changed, 58 insertions, 31 deletions

diff --git a/README b/README
index 2202c29..6d6f7f1 100644
--- a/README
+++ b/README
@@ -97,6 +97,30 @@ removed.
 Beginning with the krb5-1.18 release, all support for single-DES
 encryption types has been removed.
 
+Major changes in 1.21.3 (2024-06-26)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix vulnerabilities in GSS message token handling [CVE-2024-37370,
+  CVE-2024-37371].
+
+* Fix a potential bad pointer free in krb5_cccol_have_contents().
+
+* Fix a memory leak in the macOS ccache type.
+
+krb5-1.21.2 changes by ticket ID
+--------------------------------
+
+9102    Eliminate sim_client include of getopt.h
+9103    segfault trying to free a garbage pointer
+9104    Work around Doxygen 1.9.7 change
+9107    In PKINIT, check for null PKCS7 enveloped fields
+9109    memory leak on macos
+9115    Fix leak in KDC NDR encoding
+9125    Formatting error in realm_config.rst
+9128    Fix vulnerabilities in GSS message token handling
+
 Major changes in 1.21.2 (2023-08-14)
 ------------------------------------
 
@@ -324,6 +348,7 @@ reports, suggestions, and valuable resources:
     Michael Calmer
     Andrea Campi
     Julien Chaffraix
+    Jacob Champion
     Puran Chand
     Ravi Channavajhala
     Srinivas Cheruku
@@ -454,6 +479,7 @@ reports, suggestions, and valuable resources:
     Mantas Mikulėnas
     Markus Moeller
     Kyle Moffett
+    Jon Moore
     Paul Moore
     Keiichi Mori
     Michael Morony
@@ -506,6 +532,7 @@ reports, suggestions, and valuable resources:
     Richard Silverman
     Cel Skeggs
     Simo Sorce
+    Anthony Sottile
     Michael Spang
     Michael Ströder
     Bjørn Tore Sund
diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index 352514d..9176445 100644
--- a/src/man/k5identity.man
+++ b/src/man/k5identity.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "K5IDENTITY" "5" " " "1.21.2" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 k5identity \- Kerberos V5 client principal selection rules
 .SH DESCRIPTION
diff --git a/src/man/k5login.man b/src/man/k5login.man
index d530a46..6605a7e 100644
--- a/src/man/k5login.man
+++ b/src/man/k5login.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "K5LOGIN" "5" " " "1.21.2" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 k5login \- Kerberos V5 acl file for host access
 .SH DESCRIPTION
diff --git a/src/man/k5srvutil.man b/src/man/k5srvutil.man
index 16299fa..f3590b6 100644
--- a/src/man/k5srvutil.man
+++ b/src/man/k5srvutil.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "K5SRVUTIL" "1" " " "1.21.2" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 k5srvutil \- host key table (keytab) manipulation utility
 .SH SYNOPSIS
diff --git a/src/man/kadm5.acl.man b/src/man/kadm5.acl.man
index e2fe1bb..334db0c 100644
--- a/src/man/kadm5.acl.man
+++ b/src/man/kadm5.acl.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KADM5.ACL" "5" " " "1.21.2" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .SH DESCRIPTION
diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index 3dbd8a3..8413e70 100644
--- a/src/man/kadmin.man
+++ b/src/man/kadmin.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KADMIN" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .SH SYNOPSIS
diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index 3d56d52..32b9213 100644
--- a/src/man/kadmind.man
+++ b/src/man/kadmind.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KADMIND" "8" " " "1.21.2" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kadmind \- KADM5 administration server
 .SH SYNOPSIS
diff --git a/src/man/kdb5_ldap_util.man b/src/man/kdb5_ldap_util.man
index 68eea02..125e59a 100644
--- a/src/man/kdb5_ldap_util.man
+++ b/src/man/kdb5_ldap_util.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KDB5_LDAP_UTIL" "8" " " "1.21.2" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kdb5_ldap_util \- Kerberos configuration utility
 .SH SYNOPSIS
diff --git a/src/man/kdb5_util.man b/src/man/kdb5_util.man
index 1271a45..d43d913 100644
--- a/src/man/kdb5_util.man
+++ b/src/man/kdb5_util.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KDB5_UTIL" "8" " " "1.21.2" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kdb5_util \- Kerberos database maintenance utility
 .SH SYNOPSIS
diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man
index 6be49e6..98a7222 100644
--- a/src/man/kdc.conf.man
+++ b/src/man/kdc.conf.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KDC.CONF" "5" " " "1.21.2" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .sp
diff --git a/src/man/kdestroy.man b/src/man/kdestroy.man
index 6ae2a68..c17b254 100644
--- a/src/man/kdestroy.man
+++ b/src/man/kdestroy.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KDESTROY" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .SH SYNOPSIS
diff --git a/src/man/kerberos.man b/src/man/kerberos.man
index 85d4e80..ec1d84d 100644
--- a/src/man/kerberos.man
+++ b/src/man/kerberos.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KERBEROS" "7" " " "1.21.2" "MIT Kerberos"
+.TH "KERBEROS" "7" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kerberos \- Overview of using Kerberos
 .SH DESCRIPTION
diff --git a/src/man/kinit.man b/src/man/kinit.man
index 9dffc81..32f57c4 100644
--- a/src/man/kinit.man
+++ b/src/man/kinit.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KINIT" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kinit \- obtain and cache Kerberos ticket-granting ticket
 .SH SYNOPSIS
diff --git a/src/man/klist.man b/src/man/klist.man
index 91cfb3c..3061e5c 100644
--- a/src/man/klist.man
+++ b/src/man/klist.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KLIST" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .SH SYNOPSIS
diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index c79eb96..846224b 100644
--- a/src/man/kpasswd.man
+++ b/src/man/kpasswd.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KPASSWD" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .SH SYNOPSIS
diff --git a/src/man/kprop.man b/src/man/kprop.man
index c4037c4..6091173 100644
--- a/src/man/kprop.man
+++ b/src/man/kprop.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KPROP" "8" " " "1.21.2" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kprop \- propagate a Kerberos V5 principal database to a replica server
 .SH SYNOPSIS
diff --git a/src/man/kpropd.man b/src/man/kpropd.man
index 37cb073..2c44d4f 100644
--- a/src/man/kpropd.man
+++ b/src/man/kpropd.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KPROPD" "8" " " "1.21.2" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 replica KDC update server
 .SH SYNOPSIS
diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index d15851f..f7e93f3 100644
--- a/src/man/kproplog.man
+++ b/src/man/kproplog.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KPROPLOG" "8" " " "1.21.2" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kproplog \- display the contents of the Kerberos principal update log
 .SH SYNOPSIS
diff --git a/src/man/krb5-config.man b/src/man/krb5-config.man
index c417b36..021c581 100644
--- a/src/man/krb5-config.man
+++ b/src/man/krb5-config.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KRB5-CONFIG" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 krb5-config \- tool for linking against MIT Kerberos libraries
 .SH SYNOPSIS
diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
index afa86a0..6c0e9af 100644
--- a/src/man/krb5.conf.man
+++ b/src/man/krb5.conf.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KRB5.CONF" "5" " " "1.21.2" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .sp
diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index c71cc18..dc6bc4d 100644
--- a/src/man/krb5kdc.man
+++ b/src/man/krb5kdc.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KRB5KDC" "8" " " "1.21.2" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .SH SYNOPSIS
diff --git a/src/man/ksu.man b/src/man/ksu.man
index 1f7b3d0..bb87113 100644
--- a/src/man/ksu.man
+++ b/src/man/ksu.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KSU" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KSU" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .SH SYNOPSIS
diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index ce729fc..83ae58f 100644
--- a/src/man/kswitch.man
+++ b/src/man/kswitch.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KSWITCH" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .SH SYNOPSIS
diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index bae4d6b..63466cf 100644
--- a/src/man/ktutil.man
+++ b/src/man/ktutil.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KTUTIL" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .SH SYNOPSIS
diff --git a/src/man/kvno.man b/src/man/kvno.man
index 397d15a..9b5cd39 100644
--- a/src/man/kvno.man
+++ b/src/man/kvno.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "KVNO" "1" " " "1.21.2" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 kvno \- print key version numbers of Kerberos principals
 .SH SYNOPSIS
diff --git a/src/man/sclient.man b/src/man/sclient.man
index 5335a5d..0ccd194 100644
--- a/src/man/sclient.man
+++ b/src/man/sclient.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SCLIENT" "1" " " "1.21.2" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .SH SYNOPSIS
diff --git a/src/man/sserver.man b/src/man/sserver.man
index e3876a9..59de163 100644
--- a/src/man/sserver.man
+++ b/src/man/sserver.man
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SSERVER" "8" " " "1.21.2" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.21.3" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .SH SYNOPSIS
diff --git a/src/patchlevel.h b/src/patchlevel.h
index fbbbe37..903ebf9 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,7 +51,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 21
-#define KRB5_PATCHLEVEL 2
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 3
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.21"
+#define KRB5_RELTAG "krb5-1.21.3-final"
diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index 75e9fdb..52a3fb7 100644
--- a/src/po/mit-krb5.pot
+++ b/src/po/mit-krb5.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mit-krb5 1.21.2-postrelease\n"
+"Project-Id-Version: mit-krb5 1.21.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-26 12:58-0400\n"
+"POT-Creation-Date: 2024-06-26 13:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"